X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=b5f1abe3c7e551f0c884db7809c2fac0e7873b88;hp=eaf39f666fcc274941d94c8baf977065202632fe;hb=8e9c9cb1f148d1eac5bcea9f5f325a72d219df86;hpb=46ad17b8897ab5cf132e348406f2bac7e97acbfc diff --git a/chroot-script b/chroot-script index eaf39f6..b5f1abe 100755 --- a/chroot-script +++ b/chroot-script @@ -36,9 +36,11 @@ stage() { echo "$2" > "$STAGES/$1" return 0 elif grep -q done "$STAGES/$1" 2>/dev/null ; then - echo "[*] Notice: stage $1 has been executed already, skipping execution therefore.">&2 + echo " [*] Notice: stage $1 has been executed already, skipping execution therefore.">&2 return 1 fi + echo " Executing stage ${1}" + return 0 } # }}} @@ -429,12 +431,13 @@ finalize() { # execute the functions {{{ for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \ packages extrapackages mkinitrd kernel reconfigure hosts interfaces \ - timezone fstab hostname initrd grub passwords custom_scripts \ - services finalize ; do + timezone fstab hostname initrd grub passwords custom_scripts services ; do if stage $i ; then $i && stage $i done || exit 1 fi done + # always execute the finalize stage: + finalize # }}} # finally exit the chroot {{{