X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=chroot-script;h=7726ecd5f478307942bd25d3b9ade5b28238924d;hb=4812ce411ed1a55de53c4c611d616d9b5149b9b4;hp=95f3ef666a9884ab06fa6df6aab1be97127b7c4a;hpb=53ed3b4e9a30baacaba084299f6dd5d05e1272d2;p=grml-debootstrap.git

diff --git a/chroot-script b/chroot-script
index 95f3ef6..7726ecd 100755
--- a/chroot-script
+++ b/chroot-script
@@ -17,8 +17,10 @@ set -o pipefail
 trap "error_handler" ERR
 # }}}
 
+bash -n /etc/debootstrap/config
 # shellcheck source=config
 . /etc/debootstrap/config    || exit 1
+bash -n /etc/debootstrap/variables
 # shellcheck source=tests/shellcheck-stub-debootstrap-variables
 . /etc/debootstrap/variables || exit 1
 
@@ -803,8 +805,9 @@ trap signal_handler HUP INT QUIT TERM
      initrd grub_install passwords \
      custom_scripts upgrade_system remove_apt_cache services \
      remove_chrootmirror; do
-     if stage $i ; then
-       $i && stage $i 'done' || exit 1
+     if stage "$i" ; then
+       "$i"
+       stage "$i" 'done'
      fi
   done
   # always execute the finalize stage: