selfstrap: fixes

create symlink awk -> mawk

use dpkg --extract when '--real-apt' is used

1 files changed, 26 insertions, 12 deletions

diff --git a/src/selfstrap b/src/selfstrap
index fc2ae5d..9c43f2d 100755
--- a/src/selfstrap
+++ b/src/selfstrap
@@ -186,6 +186,9 @@ populate_rootfs()
 
     touch "$TARGET"/var/lib/dpkg/status
 
+    [ -d "$TARGET"/usr/bin ] || mkdir -p "$TARGET"/usr/bin
+    [ -e "$TARGET/usr/bin/awk" -o -L "$TARGET/usr/bin/awk" ] || ln -s mawk "$TARGET/usr/bin/awk"
+
     write_lines_once "$TARGET"/var/lib/dpkg/arch "$target_arch"
     write_lines_once "$TARGET"/etc/apt/sources.list \
                      "deb $debian_mirror $target_release main contrib non-free" \
@@ -242,6 +245,15 @@ EOF
         sed 's?^\.??; s?^/$?/.?; s?/$??' > "$TARGET/var/lib/dpkg/info/$PKG.list"
 }
 
+verbosely()
+{
+    if [ "$VERBOSE" ]; then
+        (set -x; "$@")
+    else
+        "$@"
+    fi
+}
+
 dpkg_configure_from_apt_actions()
 {
     while read line; do
@@ -255,14 +267,14 @@ dpkg_configure_from_apt_actions()
                 export DPKG_MAINTSCRIPT_NAME=preinst
                 preinst=/var/lib/dpkg/info/${package}${multiarch}.preinst
                 if [ -x "$TARGET"/"$preinst" ]; then
-                    ${CHROOT_PROG:-chroot} "$TARGET" "$preinst" install
+                    verbosely ${CHROOT_PROG:-chroot} "$TARGET" "$preinst" install
                 fi
                 ;;
             Conf)
                 export DPKG_MAINTSCRIPT_NAME=postinst
                 postinst=/var/lib/dpkg/info/${package}${multiarch}.postinst
                 if [ -x "$TARGET"/"$postinst" ]; then
-                    ${CHROOT_PROG:-chroot} "$TARGET" "$postinst" configure
+                    verbosely ${CHROOT_PROG:-chroot} "$TARGET" "$postinst" configure
                 fi
                 ;;
             Remv) ;;
@@ -302,11 +314,13 @@ dpkg_unpack_from_apt_actions()
         case "$action" in
             Inst)
                 printf 'Unpacking %s\n' "${deb##*/}" >&2
-
-                is_multiarch_same "$package" && multiarch=":$arch" || multiarch=
-                [ "$UNPACK_ONLY" ] && set_status=unpacked || set_status=installed
-                dpkg_unpack "$deb" "$multiarch" "$set_status" || die "dpkg_unpack"
-
+                if [ "$REAL_APT_INSTALL" ]; then
+                    dpkg --extract "$deb" "$TARGET" || die 'dpkg'
+                else
+                    is_multiarch_same "$package" && multiarch=":$arch" || multiarch=
+                    [ "$UNPACK_ONLY" ] && set_status=unpacked || set_status=installed
+                    dpkg_unpack "$deb" "$multiarch" "$set_status" || die "dpkg_unpack"
+                fi
                 ;;
             Conf) ;;
             Remv) ;;
@@ -364,7 +378,7 @@ generate_apt_config
 populate_rootfs
 [ "$SKIP_UPDATE" ] || apt_get update
 
-packages=$(required_packages) && [ "$packages" ] || die 'failed to determine list of required packages'
+required_packages=$(required_packages) && [ "$required_packages" ] || die 'failed to determine list of required packages'
 
 export LC_ALL=C
 export DEBIAN_FRONTEND=noninteractive
@@ -377,15 +391,15 @@ if [ "$REAL_APT_INSTALL" ]; then
     #   2. /etc/passwd and /etc/group so that 'chown' works
 
     # Unpack required packages.  Handles (1)
-    UNPACK_ONLY=y apt_extract $packages
+    # Note: populate_rootfs() already created a necessary symlink /usr/bin/awk -> /usr/bin/mawk
+    apt_extract $required_packages
 
     # This handles (2).
     # An alternative (used by debootstrap) is to configure base-passwd
     install_etc_passwd
 
-    dpkg --root="$TARGET" --configure -a
-    apt_get install -y $EXTRA_PACKAGES
+    apt_get install -y $required_packages $EXTRA_PACKAGES
 else
-    apt_extract $packages
+    apt_extract $required_packages
     apt_extract $EXTRA_PACKAGES
 fi