2 files changed, 32 insertions, 16 deletions

diff --git a/fsmgr.hs b/fsmgr.hs
index f6569b6..2ee7c7c 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -141,10 +141,10 @@ buildRoot config@DiskImageConfig{..} finalOut = do
       mountpoint = finalOut <.> "mnt"
   cmd_ "sh -c" ["if mountpoint -q \"$0\"; then umount \"$0\"; fi", mountpoint]
 
-  let (abortion :: IO ()) = ignoreErrors' $ do
-        cmd_ "umount" [mountpoint]
-        cmd_ "rmdir" [mountpoint]
-        cmd_ "rm -f" [out]
+  let (abortion :: IO ()) = do
+        ignoreErrors' $ cmd_ (EchoStderr False) "umount" [mountpoint]
+        ignoreErrors' $ cmd_ (EchoStderr False) "rmdir" [mountpoint]
+        ignoreErrors' $ cmd_ (EchoStderr False) "rm -f" [out]
 
   handle' abortion $ buildInitialImage config mountpoint out
 
diff --git a/selfstrap b/selfstrap
index 75907fc..ff8408b 100755
--- a/selfstrap
+++ b/selfstrap
@@ -125,7 +125,21 @@ apt_()
     # Avoid deleting lists on the calling system.
     set  -- "$@" -o  APT::Get::List-Cleanup=false
 
-    eatmydata -- apt-"${apt_cmd}" "$@"
+    set -- apt-"${apt_cmd}" "$@"
+    if command -v eatmydata >/dev/null
+    then
+        set -- eatmydata -- "$@"
+    fi
+    (
+        set -x
+        "$@"
+    )
+    r=$?
+    if [ "$r" != 0 ]
+    then
+        echo "Error: apt-${apt_cmd} returned $r" >&2
+        return $r
+    fi
 }
 apt_get() { apt_ get "$@"; }
 apt_cache() { apt_ cache "$@"; }
@@ -164,9 +178,9 @@ prepare_chroot()
     [ "$TARGET" ] || die 'no $TARGET'
     [ -d "$TARGET"/proc ] || mkdir "$TARGET"/proc
     [ -d "$TARGET"/sys  ] || mkdir "$TARGET"/sys
-    mount -t proc proc "$TARGET"/proc
-    mount -t sysfs sysfs "$TARGET"/sys
-    mount --bind /dev "$TARGET"/dev
+    mountpoint -q "$TARGET"/proc || mount -t proc proc "$TARGET"/proc
+    mountpoint -q "$TARGET"/sys  || mount -t sysfs sysfs "$TARGET"/sys
+    mountpoint -q "$TARGET"/dev  || mount -t tmpfs tmpfs "$TARGET"/dev
 }
 
 cleanup_chroot()
@@ -224,7 +238,7 @@ write_sources_list()
                    "deb  ${debian_mirror}           ${target_release}-backports  main  contrib  non-free"  \
                    "deb  ${debian_security_mirror}  ${target_release}$_updates   main  contrib  non-free"
         fi
-        if apt policy | grep -q ' sid/'
+        if apt-cache policy 2>/dev/null | grep -q ' sid/'
         then
             printf '%s\n' \
                     "deb  ${debian_mirror}           sid                         main  contrib  non-free"
@@ -271,7 +285,7 @@ parse_apt_simul_line()
 
 dpkg_unpack()
 {
-    [ "$TARGET" -a -d "$TARGET" ] || die 'no $TARGET'
+    [ "$TARGET" -a "$TARGET" != '/' -a -d "$TARGET" ] || die 'no $TARGET'
     local deb="$1" multiarch="$2" SET_STATUS="$3" command PKG
     PKG=${deb##*/}
     PKG=${PKG%%_*}
@@ -337,9 +351,9 @@ dpkg_configure_from_apt_actions()
                 preinst=/var/lib/dpkg/info/${package}${multiarch}.preinst
                 if [ -x "$TARGET"/"$preinst" ]; then
                     extract_tmp_ci "$deb"
-                    prepare_chroot "$TARGET"
+                    # prepare_chroot "$TARGET"
                     verbosely ${CHROOT_PROG:-chroot} "$TARGET" "$preinst" install
-                    cleanup_chroot "$TARGET"
+                    # cleanup_chroot "$TARGET"
                     remove_tmp_ci
                 fi
                 ;;
@@ -348,9 +362,9 @@ dpkg_configure_from_apt_actions()
                 postinst=/var/lib/dpkg/info/${package}${multiarch}.postinst
                 if [ -x "$TARGET"/"$postinst" ]; then
                     extract_tmp_ci "$deb"
-                    prepare_chroot "$TARGET"
+                    # prepare_chroot "$TARGET"
                     verbosely ${CHROOT_PROG:-chroot} "$TARGET" "$postinst" configure
-                    cleanup_chroot "$TARGET"
+                    # cleanup_chroot "$TARGET"
                     remove_tmp_ci
                 fi
                 ;;
@@ -483,16 +497,18 @@ if [ "$REAL_APT_INSTALL" ]; then
     #   1. binaries used by dpkg 'inst' scripts.
     #   2. /etc/passwd and /etc/group so that 'chown' works
 
+    prepare_chroot "$TARGET"
+    trap 'cleanup_chroot "$TARGET"' EXIT
+
     # Unpack required packages.  Handles (1)
     # Note: populate_rootfs() already created a necessary symlink /usr/bin/awk -> /usr/bin/mawk
     apt_extract $required_packages eatmydata
+    # apt_get install -y $required_packages eatmydata
 
     # This handles (2).
     # An alternative (used by debootstrap) is to configure base-passwd
     install_etc_passwd
 
-    prepare_chroot "$TARGET"
-    trap 'cleanup_chroot "$TARGET"' EXIT
     apt_get install -y $required_packages $EXTRA_PACKAGES
 else
     apt_extract $required_packages