mkchroot: remove pipe if it still exists..

[xodist] / mkchroot.sh

diff --git a/mkchroot.sh b/mkchroot.sh
index 7867a8ac582adca82b7bc9ec7024fce9d6f24b13..509bbdd4de23456468d0d921e19d53346176dbed 100755 (executable)
--- a/mkchroot.sh
+++ b/mkchroot.sh
@@ -32,6 +32,7 @@ usage()
        echo "" 1>&2
        echo "Options:" 1>&2
        echo "  --config-type <config>    directory name in configs/ to use" 1>&2
+       echo "  --help                    display this help screen" 1>&2
        echo "  --local-apt-mirror <srcs> sources.list for local mirror" 1>&2
        echo "" 1>&2
        exit 1
@@ -52,6 +53,9 @@ do
                LOCAL_APT_MIRROR="$2"
                shift
                ;;
+       --help|-h)
+               usage
+               ;;
        *)
                if [ "$#" != "1" ]; then
                        echo "Unknown option $1" 1>&2
@@ -136,12 +140,18 @@ EOF
 # set the default locale
 echo "${IMG_LOCALE}" >${ROOT_DIR}/etc/locale.gen
 
+# add support for installation onto a block device
+mkdir -p ${ROOT_DIR}/etc/initramfs-tools/scripts/local-bottom
+cp installer ${ROOT_DIR}/etc/initramfs-tools/scripts/local-bottom/
+
+# make sure dpkg doesn't attempt to prompt for input
+export DEBIAN_FRONTEND=noninteractive
+export DEBCONF_PRIORITY=critical
+
 # run any customizations necessary pre-package install
 customize_chroot_hook "$ROOT_DIR"
 
 # initialize apt
-export DEBIAN_FRONTEND=noninteractive
-export DEBCONF_PRIORITY=critical
 printf "${LOCAL_APT_MIRROR}\n" >${ROOT_DIR}/etc/apt/sources.list
 (chroot ${ROOT_DIR} aptitude update)