* scripts/ubuntu/*.fakechroot: Merge into the corresponding main scripts

  as variants.

r48493

6 files changed, 84 insertions, 539 deletions

diff --git a/scripts/ubuntu/edgy b/scripts/ubuntu/edgy
index 7f656b6..53e82ec 100644
--- a/scripts/ubuntu/edgy
+++ b/scripts/ubuntu/edgy
@@ -9,7 +9,11 @@ esac
 mirror_style release
 download_style apt
 finddebs_style from-indices
-variants - buildd
+variants - buildd fakechroot
+
+if doing_variant fakechroot; then
+    test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
+fi
 
 work_out_debs () {
     LIBC6=libc6
@@ -33,6 +37,8 @@ work_out_debs () {
       add sparc base "lib64gcc1"
       add sparc base "libc6-dev-sparc64"
       add sparc base "libc6-sparc64"
+    elif doing_variant fakechroot; then
+      base="apt"
     fi
 }
 
@@ -49,7 +55,11 @@ first_stage_install () {
         chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
+    if doing_variant fakechroot; then
+        setup_devices_fakechroot
+    else
+        setup_devices
+    fi
 
     x_feign_install () {
         local pkg="$1"
@@ -82,8 +92,12 @@ second_stage_install () {
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
-    setup_proc
-    in_target /sbin/ldconfig
+    if doing_variant fakechroot; then
+	setup_proc_fakechroot
+    else
+	setup_proc
+	in_target /sbin/ldconfig
+    fi
 
     DEBIAN_FRONTEND=noninteractive
     DEBCONF_NONINTERACTIVE_SEEN=true
@@ -105,6 +119,10 @@ second_stage_install () {
         ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
     fi
 
+    if doing_variant fakechroot; then 
+	install_fakechroot_tools
+    fi
+
     p; progress $baseprog $bases INSTCORE "Installing core packages" #4
     x_core_install $LIBC6
 
@@ -132,6 +150,11 @@ second_stage_install () {
 
     info CONFREQ "Configuring required packages..."
 
+    if doing_variant fakechroot; then
+	# fix initscripts postinst (no mounting possible, and wrong if condition)
+	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' $TARGET/var/lib/dpkg/info/initscripts.postinst
+    fi
+
     mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
     echo \
 "#!/bin/sh
diff --git a/scripts/ubuntu/edgy.fakechroot b/scripts/ubuntu/edgy.fakechroot
deleted file mode 100644
index 56845e2..0000000
--- a/scripts/ubuntu/edgy.fakechroot
+++ /dev/null
@@ -1,178 +0,0 @@
-test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
-
-case $ARCH in
-  amd64|i386|powerpc|sparc)
-    default_mirror http://archive.ubuntu.com/ubuntu
-    ;;
-  *)
-    default_mirror http://ports.ubuntu.com/ubuntu-ports
-    ;;
-esac
-mirror_style release
-download_style apt
-finddebs_style from-indices
-variants - buildd fakechroot
-
-work_out_debs () {
-    LIBC6=libc6
-    if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi
-
-    required="$(get_debs Priority: required)"
-
-    if doing_variant -; then 
-      #required="$required $(get_debs Priority: important)"
-      #  ^^ should be getting debconf here somehow maybe
-      base="$(get_debs Priority: important)"
-    elif doing_variant buildd; then
-      # TODO: add Build-Essential: yes extraoverrides
-      #base="$(get_debs Build-Essential: yes)"
-
-      add () { if [ "$ARCH" = "$1" ]; then eval "$2=\"\$$2 $3\""; fi; }
-
-      base="apt binutils cpio cpp cpp-4.1 dpkg-dev g++ g++-4.1 gcc gcc-4.1 ${LIBC6}-dev libdb4.4 libgdbm3 libstdc++6 libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules"
-
-      add ia64 base "libunwind7-dev"
-      add sparc base "lib64gcc1"
-      add sparc base "libc6-dev-sparc64"
-      add sparc base "libc6-sparc64"
-    elif doing_variant fakechroot; then
-        base="apt"
-    fi
-}
-
-first_stage_install () {
-    extract $required
-
-    mkdir -p "$TARGET/var/lib/dpkg"
-    : >"$TARGET/var/lib/dpkg/status"
-    : >"$TARGET/var/lib/dpkg/available"
-
-    setup_etc
-    if [ ! -e "$TARGET/etc/fstab" ]; then
-        echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
-        chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
-    fi
-
-    setup_devices_fakechroot
-
-    x_feign_install () {
-        local pkg="$1"
-        local deb="$(debfor $pkg)"
-        local ver="$(
-            ar -p "$TARGET/$deb" control.tar.gz | zcat |
-                tar -O -xf - control ./control 2>/dev/null |
-                sed -ne 's/^Version: *//Ip' | head -n 1
-        )"
-
-        mkdir -p "$TARGET/var/lib/dpkg/info"
-
-        echo \
-"Package: $pkg
-Version: $ver
-Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
-
-        touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
-    }
-
-    x_feign_install dpkg
-}
-
-second_stage_install () {
-    x_core_install () {
-	smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
-    }
-
-    p () {
-	baseprog="$(($baseprog + ${1:-1}))"
-    }
-
-    setup_proc_fakechroot
-
-    DEBIAN_FRONTEND=noninteractive
-    DEBCONF_NONINTERACTIVE_SEEN=true
-    export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
-
-    baseprog=0
-    bases=7
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #1
-    info INSTCORE "Installing core packages..."
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
-    x_core_install base-files base-passwd
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #3
-    x_core_install dpkg
-
-    if [ ! -e "$TARGET/etc/localtime" ]; then
-        ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
-    fi
-
-    install_fakechroot_tools
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #4
-    x_core_install $LIBC6
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #5
-    x_core_install perl-base
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
-    x_core_install mawk
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #7
-    if doing_variant -; then
-      x_core_install debconf
-    fi
-
-    baseprog=0
-    bases=$(set -- $required; echo $#)
-
-    info UNPACKREQ "Unpacking required packages..."
-
-    smallyes '' | 
-      (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
-      dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
-
-    info CONFREQ "Configuring required packages..."
-
-    # fix initscripts postinst (no mounting possible, and wrong if condition)
-    sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' $TARGET/var/lib/dpkg/info/initscripts.postinst
-
-    mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
-    echo \
-"#!/bin/sh
-echo
-echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
-    chmod 755 "$TARGET/sbin/start-stop-daemon"
-
-    setup_dselect_method apt
-
-    smallyes '' | 
-      (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
-      dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
-
-    baseprog=0
-    bases="$(set -- $base; echo $#)"
-
-    info UNPACKBASE "Unpacking the base system..."
-
-    smallyes '' | 
-      (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
-      dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
-
-    info CONFBASE "Configuring the base system..."
-
-    smallyes '' |
-      (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
-      dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
-
-    mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
-
-    progress $bases $bases CONFBASE "Configuring base system"
-    info BASESUCCESS "Base system installed successfully."
-}
diff --git a/scripts/ubuntu/feisty b/scripts/ubuntu/feisty
index 7f656b6..894a5e3 100644
--- a/scripts/ubuntu/feisty
+++ b/scripts/ubuntu/feisty
@@ -9,7 +9,11 @@ esac
 mirror_style release
 download_style apt
 finddebs_style from-indices
-variants - buildd
+variants - buildd fakechroot
+
+if doing_variant fakechroot; then
+    test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
+fi
 
 work_out_debs () {
     LIBC6=libc6
@@ -33,6 +37,8 @@ work_out_debs () {
       add sparc base "lib64gcc1"
       add sparc base "libc6-dev-sparc64"
       add sparc base "libc6-sparc64"
+    elif doing_variant fakechroot; then
+      base="apt"
     fi
 }
 
@@ -49,7 +55,11 @@ first_stage_install () {
         chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
+    if doing_variant fakechroot; then
+        setup_devices_fakechroot
+    else
+        setup_devices
+    fi
 
     x_feign_install () {
         local pkg="$1"
@@ -82,8 +92,12 @@ second_stage_install () {
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
-    setup_proc
-    in_target /sbin/ldconfig
+    if doing_variant fakechroot; then
+	setup_proc_fakechroot
+    else
+	setup_proc
+	in_target /sbin/ldconfig
+    fi
 
     DEBIAN_FRONTEND=noninteractive
     DEBCONF_NONINTERACTIVE_SEEN=true
@@ -105,6 +119,10 @@ second_stage_install () {
         ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
     fi
 
+    if doing_variant fakechroot; then 
+	install_fakechroot_tools
+    fi
+
     p; progress $baseprog $bases INSTCORE "Installing core packages" #4
     x_core_install $LIBC6
 
@@ -132,6 +150,14 @@ second_stage_install () {
 
     info CONFREQ "Configuring required packages..."
 
+    if doing_variant fakechroot; then
+	# fix initscripts postinst (no mounting possible, and wrong if condition)
+	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' $TARGET/var/lib/dpkg/info/initscripts.postinst
+
+	# kill libdevmapper postinst; it tries to create /dev/mapper/
+	rm $TARGET/var/lib/dpkg/info/libdevmapper1*.postinst
+    fi
+
     mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
     echo \
 "#!/bin/sh
diff --git a/scripts/ubuntu/feisty.fakechroot b/scripts/ubuntu/feisty.fakechroot
deleted file mode 100644
index b830a9c..0000000
--- a/scripts/ubuntu/feisty.fakechroot
+++ /dev/null
@@ -1,181 +0,0 @@
-test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
-
-case $ARCH in
-  amd64|i386|powerpc|sparc)
-    default_mirror http://archive.ubuntu.com/ubuntu
-    ;;
-  *)
-    default_mirror http://ports.ubuntu.com/ubuntu-ports
-    ;;
-esac
-mirror_style release
-download_style apt
-finddebs_style from-indices
-variants - buildd fakechroot
-
-work_out_debs () {
-    LIBC6=libc6
-    if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi
-
-    required="$(get_debs Priority: required)"
-
-    if doing_variant -; then 
-      #required="$required $(get_debs Priority: important)"
-      #  ^^ should be getting debconf here somehow maybe
-      base="$(get_debs Priority: important)"
-    elif doing_variant buildd; then
-      # TODO: add Build-Essential: yes extraoverrides
-      #base="$(get_debs Build-Essential: yes)"
-
-      add () { if [ "$ARCH" = "$1" ]; then eval "$2=\"\$$2 $3\""; fi; }
-
-      base="apt binutils cpio cpp cpp-4.1 dpkg-dev g++ g++-4.1 gcc gcc-4.1 ${LIBC6}-dev libdb4.4 libgdbm3 libstdc++6 libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules"
-
-      add ia64 base "libunwind7-dev"
-      add sparc base "lib64gcc1"
-      add sparc base "libc6-dev-sparc64"
-      add sparc base "libc6-sparc64"
-    elif doing_variant fakechroot; then
-        base="apt"
-    fi
-}
-
-first_stage_install () {
-    extract $required
-
-    mkdir -p "$TARGET/var/lib/dpkg"
-    : >"$TARGET/var/lib/dpkg/status"
-    : >"$TARGET/var/lib/dpkg/available"
-
-    setup_etc
-    if [ ! -e "$TARGET/etc/fstab" ]; then
-        echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
-        chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
-    fi
-
-    setup_devices_fakechroot
-
-    x_feign_install () {
-        local pkg="$1"
-        local deb="$(debfor $pkg)"
-        local ver="$(
-            ar -p "$TARGET/$deb" control.tar.gz | zcat |
-                tar -O -xf - control ./control 2>/dev/null |
-                sed -ne 's/^Version: *//Ip' | head -n 1
-        )"
-
-        mkdir -p "$TARGET/var/lib/dpkg/info"
-
-        echo \
-"Package: $pkg
-Version: $ver
-Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
-
-        touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
-    }
-
-    x_feign_install dpkg
-}
-
-second_stage_install () {
-    x_core_install () {
-	smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
-    }
-
-    p () {
-	baseprog="$(($baseprog + ${1:-1}))"
-    }
-
-    setup_proc_fakechroot
-
-    DEBIAN_FRONTEND=noninteractive
-    DEBCONF_NONINTERACTIVE_SEEN=true
-    export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
-
-    baseprog=0
-    bases=7
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #1
-    info INSTCORE "Installing core packages..."
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
-    x_core_install base-files base-passwd
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #3
-    x_core_install dpkg
-
-    if [ ! -e "$TARGET/etc/localtime" ]; then
-        ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
-    fi
-
-    install_fakechroot_tools
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #4
-    x_core_install $LIBC6
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #5
-    x_core_install perl-base
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
-    x_core_install mawk
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #7
-    if doing_variant -; then
-      x_core_install debconf
-    fi
-
-    baseprog=0
-    bases=$(set -- $required; echo $#)
-
-    info UNPACKREQ "Unpacking required packages..."
-
-    smallyes '' | 
-      (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
-      dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
-
-    info CONFREQ "Configuring required packages..."
-
-    # fix initscripts postinst (no mounting possible, and wrong if condition)
-    sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' $TARGET/var/lib/dpkg/info/initscripts.postinst
-
-    # kill libdevmapper postinst; it tries to create /dev/mapper/
-    rm $TARGET/var/lib/dpkg/info/libdevmapper1*.postinst
-
-    mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
-    echo \
-"#!/bin/sh
-echo
-echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
-    chmod 755 "$TARGET/sbin/start-stop-daemon"
-
-    setup_dselect_method apt
-
-    smallyes '' | 
-      (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
-      dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
-
-    baseprog=0
-    bases="$(set -- $base; echo $#)"
-
-    info UNPACKBASE "Unpacking the base system..."
-
-    smallyes '' | 
-      (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
-      dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
-
-    info CONFBASE "Configuring the base system..."
-
-    smallyes '' |
-      (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
-      dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
-
-    mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
-
-    progress $bases $bases CONFBASE "Configuring base system"
-    info BASESUCCESS "Base system installed successfully."
-}
diff --git a/scripts/ubuntu/gutsy b/scripts/ubuntu/gutsy
index 271c14d..c934440 100644
--- a/scripts/ubuntu/gutsy
+++ b/scripts/ubuntu/gutsy
@@ -9,7 +9,11 @@ esac
 mirror_style release
 download_style apt
 finddebs_style from-indices
-variants - buildd
+variants - buildd fakechroot
+
+if doing_variant fakechroot; then
+    test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
+fi
 
 work_out_debs () {
     LIBC6=libc6
@@ -23,6 +27,8 @@ work_out_debs () {
       base="$(get_debs Priority: important)"
     elif doing_variant buildd; then
       base="$(get_debs Build-Essential: yes)"
+    elif doing_variant fakechroot; then
+      base="apt"
     fi
 }
 
@@ -39,7 +45,11 @@ first_stage_install () {
         chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
+    if doing_variant fakechroot; then
+        setup_devices_fakechroot
+    else
+        setup_devices
+    fi
 
     x_feign_install () {
         local pkg="$1"
@@ -72,8 +82,12 @@ second_stage_install () {
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
-    setup_proc
-    in_target /sbin/ldconfig
+    if doing_variant fakechroot; then
+	setup_proc_fakechroot
+    else
+	setup_proc
+	in_target /sbin/ldconfig
+    fi
 
     DEBIAN_FRONTEND=noninteractive
     DEBCONF_NONINTERACTIVE_SEEN=true
@@ -95,6 +109,10 @@ second_stage_install () {
         ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime"
     fi
 
+    if doing_variant fakechroot; then 
+	install_fakechroot_tools
+    fi
+
     p; progress $baseprog $bases INSTCORE "Installing core packages" #4
     x_core_install $LIBC6
 
@@ -122,6 +140,11 @@ second_stage_install () {
 
     info CONFREQ "Configuring required packages..."
 
+    if doing_variant fakechroot; then
+	# fix initscripts postinst (no mounting possible, and wrong if condition)
+	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' $TARGET/var/lib/dpkg/info/initscripts.postinst
+    fi
+
     mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
     echo \
 "#!/bin/sh
diff --git a/scripts/ubuntu/gutsy.fakechroot b/scripts/ubuntu/gutsy.fakechroot
deleted file mode 100644
index ae0e5a2..0000000
--- a/scripts/ubuntu/gutsy.fakechroot
+++ /dev/null
@@ -1,168 +0,0 @@
-test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
-
-case $ARCH in
-  amd64|i386|sparc)
-    default_mirror http://archive.ubuntu.com/ubuntu
-    ;;
-  *)
-    default_mirror http://ports.ubuntu.com/ubuntu-ports
-    ;;
-esac
-mirror_style release
-download_style apt
-finddebs_style from-indices
-variants - buildd fakechroot
-
-work_out_debs () {
-    LIBC6=libc6
-    if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi
-
-    required="$(get_debs Priority: required)"
-
-    if doing_variant -; then 
-      #required="$required $(get_debs Priority: important)"
-      #  ^^ should be getting debconf here somehow maybe
-      base="$(get_debs Priority: important)"
-    elif doing_variant buildd; then
-      base="$(get_debs Build-Essential: yes)"
-    elif doing_variant fakechroot; then
-        base="apt"
-    fi
-}
-
-first_stage_install () {
-    extract $required
-
-    mkdir -p "$TARGET/var/lib/dpkg"
-    : >"$TARGET/var/lib/dpkg/status"
-    : >"$TARGET/var/lib/dpkg/available"
-
-    setup_etc
-    if [ ! -e "$TARGET/etc/fstab" ]; then
-        echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
-        chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
-    fi
-
-    setup_devices_fakechroot
-
-    x_feign_install () {
-        local pkg="$1"
-        local deb="$(debfor $pkg)"
-        local ver="$(
-            ar -p "$TARGET/$deb" control.tar.gz | zcat |
-                tar -O -xf - control ./control 2>/dev/null |
-                sed -ne 's/^Version: *//Ip' | head -n 1
-        )"
-
-        mkdir -p "$TARGET/var/lib/dpkg/info"
-
-        echo \
-"Package: $pkg
-Version: $ver
-Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
-
-        touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
-    }
-
-    x_feign_install dpkg
-}
-
-second_stage_install () {
-    x_core_install () {
-	smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
-    }
-
-    p () {
-	baseprog="$(($baseprog + ${1:-1}))"
-    }
-
-    setup_proc_fakechroot
-
-    DEBIAN_FRONTEND=noninteractive
-    DEBCONF_NONINTERACTIVE_SEEN=true
-    export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
-
-    baseprog=0
-    bases=7
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #1
-    info INSTCORE "Installing core packages..."
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk $TARGET/usr/bin/awk
-    x_core_install base-files base-passwd
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #3
-    x_core_install dpkg
-
-    if [ ! -e "$TARGET/etc/localtime" ]; then
-        ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime"
-    fi
-
-    install_fakechroot_tools
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #4
-    x_core_install $LIBC6
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #5
-    x_core_install perl-base
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm $TARGET/usr/bin/awk
-    x_core_install mawk
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #7
-    if doing_variant -; then
-      x_core_install debconf
-    fi
-
-    baseprog=0
-    bases=$(set -- $required; echo $#)
-
-    info UNPACKREQ "Unpacking required packages..."
-
-    smallyes '' | 
-      (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
-      dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
-
-    info CONFREQ "Configuring required packages..."
-
-    # fix initscripts postinst (no mounting possible, and wrong if condition)
-    sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' $TARGET/var/lib/dpkg/info/initscripts.postinst
-
-    mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
-    echo \
-"#!/bin/sh
-echo
-echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
-    chmod 755 "$TARGET/sbin/start-stop-daemon"
-
-    setup_dselect_method apt
-
-    smallyes '' | 
-      (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
-      dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
-
-    baseprog=0
-    bases="$(set -- $base; echo $#)"
-
-    info UNPACKBASE "Unpacking the base system..."
-
-    smallyes '' | 
-      (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
-      dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
-
-    info CONFBASE "Configuring the base system..."
-
-    smallyes '' |
-      (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
-      dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
-
-    mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
-
-    progress $bases $bases CONFBASE "Configuring base system"
-    info BASESUCCESS "Base system installed successfully."
-}