New commits:
commit 2e2ba3299bc717d47e9691c636cd176212dd1147
Author: root <root@kajit-master.(none)>
Commit: root <root@kajit-master.(none)>
delve removed superphilous echo statements
diff --git a/usr/sbin/delve b/usr/sbin/delve
index 880333a..40ba077 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -164,7 +164,6 @@ function delve_install() {
then
if [[ -z "$CHROOT_CHECK" ]]
then
- echo "Preparing Stage Root" &&
prepare_stage_root &&
invoke_stage_root &&
export CHROOT_CHECK="true"
@@ -176,19 +175,18 @@ function delve_install() {
(
if [[ -z "$CHROOT_CMD" ]]
then
- echo "Actually Running INSTALL"
run_install || return 2
else
- echo "Running delve again" &&
$CHROOT_CMD delve $SPELL INSTALL
fi
) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
+ local rc=$?
if [[ $CHROOT_CMD ]]
then
- echo "Blowing away stage root"
devoke_stage_root
- fi
+ fi &&
+ return $rc
}
function delve_post_build() {
@@ -356,8 +354,6 @@ function main() {
STATES=$(delve_make_continuation start end)
fi
- echo "DEBUG: $STATES"
-
if [[ -z $CHROOT_CHECK ]] && ! is_castfs_installed
then
STAGED_INSTALL=off
@@ -365,7 +361,6 @@ function main() {
local last_rc=0
for STATE in $STATES; do
- message "Running state $STATE"
case $STATE in
start) ;;
PRE_BUILD) delve_pre_build ;;
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index e3bedc7..b22058d 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -70,9 +70,9 @@ function real_devoke_stage_root()
unset CASTFS_DBGLVL
for dir in /dev/pts /dev /proc /sys
do
- umount "${STAGE_DIRECTORY}/MOUNT$dir"
+ umount -l "${STAGE_DIRECTORY}/MOUNT$dir"
done &&
- umount "${STAGE_DIRECTORY}/MOUNT"
+ umount -l "${STAGE_DIRECTORY}/MOUNT"
}