fixed few minor issues

This commit is contained in:
2023-05-05 19:50:16 +02:00
parent 23d36cc8af
commit 7542fba94e
3 changed files with 8 additions and 7 deletions

View File

@@ -32,7 +32,9 @@ chroot_bootstrap()
cp -av $bootstrap_items $tmpdir cp -av $bootstrap_items $tmpdir
prnt I "Changing root and starting a fork of init.sh..." prnt I "Changing root and starting a fork of init.sh..."
chroot $CHROOT_PATH /bin/bash -c 'CHROOT_DONE=true; $tmpdir/init.sh $@' # on the following line, true allows to correctly exit in case of error since
# errors are managed by the chrooted environment
chroot $CHROOT_PATH /bin/bash -c 'CHROOT_DONE=true; $tmpdir/init.sh $@' || true
# If stage file still exists we copy it to be able to resume later # If stage file still exists we copy it to be able to resume later
if [[ -e $tmpdir/$(basename $STAGE_FILE) ]]; then if [[ -e $tmpdir/$(basename $STAGE_FILE) ]]; then

View File

@@ -140,7 +140,7 @@ read_commandline()
syntax_error syntax_error
fi fi
unset want_conffile want_logfile want_module unset want_conffile want_logfile want_module want_chroot
} }
export -f read_commandline export -f read_commandline
@@ -165,8 +165,8 @@ process_commandline_and_vars()
prnt E "Resuming doesn't make sense with --check-only." prnt E "Resuming doesn't make sense with --check-only."
die 1 --force die 1 --force
fi fi
if [[ $MANUAL_MODULE_LIST ]]; then if [[ -n $MANUAL_MODULE_LIST ]]; then
prnt E "Recovery mode can't work with a manual module list." prnt E "Resume mode can't work with a manual module list."
die 1 --force die 1 --force
fi fi
fi fi

View File

@@ -148,8 +148,7 @@ export -f separator
dsleep() dsleep()
{ {
i=$1 i=$1
while test $i -gt 0 while test $i -gt 0; do
do
if [[ -n $2 ]]; then if [[ -n $2 ]]; then
echo -n "$2" echo -n "$2"
else else