debxo-sugar: update packages for squeeze

[xodist] / mkchroot.sh

diff --git a/mkchroot.sh b/mkchroot.sh
index 7867a8ac582adca82b7bc9ec7024fce9d6f24b13..341ee2c15522194d3c332c7a9bc7ded40aa1d201 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
@@ -82,8 +86,6 @@ if [ "$UID" != "0" ]; then
        exit 1
 fi
 
-start_logging $ROOT_DIR
-
 # load config-specific values
 . ./configs/${CONFIG_TYPE}/variables
 . ./configs/${CONFIG_TYPE}/hooks
@@ -136,12 +138,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)
 
@@ -159,13 +167,14 @@ package_configure_hook "${ROOT_DIR}"
 rm -rf ${ROOT_DIR}/home/*;     # i have no idea what's adding this crap...
 (chroot ${ROOT_DIR} useradd -s /bin/bash --create-home ${DEFUSER})
 (chroot ${ROOT_DIR} passwd -d ${DEFUSER})
-(chroot ${ROOT_DIR} adduser ${DEFUSER} cdrom)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} audio)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} video)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} plugdev)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} netdev)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} powerdev)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} floppy)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} cdrom || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} audio || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} video || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} plugdev || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} netdev || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} powerdev || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} floppy || true)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} fuse || true)
 echo "${DEFUSER} ALL=(ALL) NOPASSWD: ALL" >> ${ROOT_DIR}/etc/sudoers
 
 # override sources.list with shipping version
@@ -180,3 +189,5 @@ umount ${ROOT_DIR}/dev/pts
 
 # custom cleanup stuff
 cleanup_chroot_hook "${ROOT_DIR}"
+
+exit 0