X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=a5c7ca62736d596281c3f944f601957c97fb4a8e;hp=1a71c16a30af5e0919206e2fd2f20c93bf4e2b53;hb=75be5c331f84328f189d3ae622e2b35de1ce23f8;hpb=8cf8a43d623a501cc82bba1df4d0aeb704b0bcdf diff --git a/grml-debootstrap b/grml-debootstrap index 1a71c16..a5c7ca6 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -5,39 +5,43 @@ # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2+ ################################################################################ -# http://www.debian.org/releases/stable/i386/index.html.en # variables {{{ PN="$(basename $0)" -VERSION="$(dpkg --list $PN 2>/dev/null| awk '/^i/ {print $3}')" +VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")" VERSION="${VERSION:-unknown}" MNTPOINT="/mnt/debootstrap.$$" # defaults -CHROOT_SCRIPTS='yes' -CONFFILES='/etc/debootstrap' -DEBCONF='yes' -DEBIAN_FRONTEND='noninteractive' -DEBOOTSTRAP='debootstrap' -EXTRAPACKAGES='yes' -FORCE='' -HOSTNAME='grml' -INITRD='yes' -INSTALL_NOTES='/etc/debootstrap/install_notes' -LOCALES='yes' -MIRROR='http://cdn.debian.net/debian' -MKFS='mkfs.ext3' -PACKAGES='yes' -PRE_SCRIPTS='yes' -RECONFIGURE='console-data' -RELEASE='squeeze' -RM_APTCACHE='yes' -SCRIPTS='yes' -SECURE='yes' -TIMEZONE='Europe/Vienna' -TUNE2FS='tune2fs -c0 -i0' -UPGRADE_SYSTEM='yes' -VMSIZE="2G" +[ -n "$CHROOT_SCRIPTS" ] || CHROOT_SCRIPTS='yes' +[ -n "$CONFFILES" ] || CONFFILES='/etc/debootstrap' +[ -n "$DEBCONF" ] || DEBCONF='yes' +[ -n "$DEBIAN_FRONTEND" ] || DEBIAN_FRONTEND='noninteractive' +[ -n "$DEBOOTSTRAP" ] || DEBOOTSTRAP='debootstrap' +[ -n "$DEFAULT_LOCALES" ] || DEFAULT_LOCALES='en_US.UTF-8' +[ -n "$DEFAULT_LANGUAGE" ] || DEFAULT_LANGUAGE='en_US:en' +[ -n "$EXTRAPACKAGES" ] || EXTRAPACKAGES='yes' +[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://http.debian.net/debian' +[ -n "$FORCE" ] || FORCE='' +[ -n "$HOSTNAME" ] || HOSTNAME='grml' +[ -n "$INITRD" ] || INITRD='yes' +[ -n "$INSTALL_NOTES" ] || INSTALL_NOTES='/etc/debootstrap/install_notes' +[ -n "$LOCALES" ] || LOCALES='yes' +[ -n "$MIRROR" ] || MIRROR="$FALLBACK_MIRROR" +[ -n "$MKFS" ] || MKFS='mkfs.ext4' +[ -n "$MKFS_OPTS" ] || MKFS_OPTS='' +[ -n "$PACKAGES" ] || PACKAGES='yes' +[ -n "$PRE_SCRIPTS" ] || PRE_SCRIPTS='yes' +[ -n "$RECONFIGURE" ] || RECONFIGURE='console-data' +[ -n "$RELEASE" ] || RELEASE='jessie' +[ -n "$RM_APTCACHE" ] || RM_APTCACHE='yes' +[ -n "$SCRIPTS" ] || SCRIPTS='yes' +[ -n "$SECURE" ] || SECURE='yes' +[ -n "$TIMEZONE" ] || TIMEZONE='Europe/Vienna' +[ -n "$TUNE2FS" ] || TUNE2FS='tune2fs -c0 -i0' +[ -n "$UPGRADE_SYSTEM" ] || UPGRADE_SYSTEM='yes' +[ -n "$VMSIZE" ] || VMSIZE="2G" +[ -n "$FIXED_DISK_IDENTIFIERS" ] || FIXED_DISK_IDENTIFIERS="no" # inside the chroot system locales might not be available, so use minimum: export LANG=C @@ -59,7 +63,7 @@ Bootstrap options: -m, --mirror Mirror which should be used for apt-get/aptitude. -i, --iso Mountpoint where a Debian ISO is mounted to, for use instead of fetching packages from a mirror. - -r, --release Release of new Debian system (default: squeeze). + -r, --release Release of new Debian system (default: jessie). -t, --target Target partition (/dev/...) or directory where the system should be installed to. -p, --mntpoint Mountpoint used for mounting the target system, @@ -75,9 +79,11 @@ Bootstrap options: Options for Virtual Machine deployment: - --vmfile Set up a Virtual Machine instead of installing to - a partition or directory, to be combined with --target, - like: --vmfile --target /mnt/sda1/qemu.img + --vm Set up a Virtual Machine, instead of plainly installing + to a partition or directory, to be combined with --target, + like: --vm --target /dev/mapper/your-vm-disk + --vmfile Like --vm, but install into a file (raw format). + Example: --vmfile --target /mnt/sda1/qemu.img --vmsize Use specified size for size of VM file (default: 2G). Syntax as supported by qemu-img, like: --vmsize 3G @@ -91,8 +97,15 @@ Configuration options: instead of using /etc/debootstrap/packages. --nopackages Skip installation of packages defined in /etc/debootstrap/packages + --nokernel Skip installation of default kernel images. + --nointerfaces Do not copy /etc/network/interfaces from host system + to target system. + (This option is automatically enabled when using --vmfile.) + --defaultinterfaces Install a default /etc/network/interfaces file (enabling + DHCP for eth0) instead of taking over config from host system. --debconf Pre-seed packages using specified pre-seed db file. --grmlrepos Enable Grml's Debian repository (deb.grml.org). + --backportrepos Enable Debian's backports repository (backports.debian.org). --keep_src_list Do not overwrite user provided apt sources.list. --hostname Hostname of Debian system. --nopassword Do not prompt for the root password. @@ -105,6 +118,7 @@ Configuration options: Other options: -v, --verbose Increase verbosity. + --debug Execute in very verbose way. -h, --help Print this usage information and exit. -V, --version Show summary of options and exit. @@ -305,7 +319,8 @@ fi [ "$_opt_iso" ] && ISO=$_opt_iso [ "$_opt_release" ] && RELEASE=$_opt_release [ "$_opt_target" ] && TARGET=$_opt_target -[ "$_opt_vmfile" ] && VIRTUAL=1 +[ "$_opt_vm" ] && VIRTUAL=1 +[ "$_opt_vmfile" ] && VMFILE=1 && VIRTUAL=1 [ "$_opt_vmsize" ] && VMSIZE=$_opt_vmsize [ "$_opt_mntpoint" ] && MNTPOINT=$_opt_mntpoint [ "$_opt_debopt" ] && DEBOOTSTRAP_OPT=$_opt_debopt @@ -320,15 +335,24 @@ fi [ "$_opt_chroot_scripts_set" ] && CHROOT_SCRIPTS='yes' [ "$_opt_keep_src_list" ] && KEEP_SRC_LIST='yes' [ "$_opt_grmlrepos" ] && GRMLREPOS='yes' +[ "$_opt_backportrepos" ] && BACKPORTREPOS='yes' [ "$_opt_hostname" ] && HOSTNAME=$_opt_hostname [ "$_opt_password" ] && ROOTPASSWORD=$_opt_password [ "$_opt_nopassword" ] && NOPASSWORD='yes' +[ "$_opt_defaultinterfaces" ] && DEFAULTINTERFACES="true" +[ "$_opt_nointerfaces" ] && NOINTERFACES="true" +[ "$_opt_nokernel" ] && NOKERNEL="true" [ "$_opt_bootappend" ] && BOOT_APPEND=$_opt_bootappend [ "$_opt_grub" ] && GRUB=$_opt_grub [ "$_opt_arch" ] && ARCH=$_opt_arch [ "$_opt_insecure" ] && echo "Warning: --insecure is deprecated, continuing anyway." [ "$_opt_force" ] && FORCE=$_opt_force [ "$_opt_verbose" ] && VERBOSE="-v" +[ "$_opt_debug" ] && DEBUG="true" + +if [ "$DEBUG" = "true" ] ; then + set -x +fi [ "$_opt_help" ] && { usage ; eend 0 @@ -446,7 +470,7 @@ prompt_for_bootmanager() fi for device in cciss/c0d0 sda hda; do - if [ /dev/$device != ${MBRDISK} ]; then + if [ "/dev/$device" != "${MBRDISK}" ]; then grep -q $device /proc/partitions && \ ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS:$device:install bootmanager grub into MBR of /dev/$device" fi @@ -467,12 +491,7 @@ prompt_for_bootmanager() mbr) # /dev/md0: has to be installed in MBR of /dev/md0 and not in /dev/md: if echo "$TARGET" | grep -q "/dev/md" ; then - # using sw-raid: - if [ -n "$SELECTED_PARTITIONS" ] ; then - GRUB=$(echo ${SELECTED_PARTITIONS} | awk '{print $1}') # use first disk only - else - GRUB="$TARGET" - fi + GRUB="$TARGET" else GRUB="$MBRDISK" fi @@ -493,13 +512,14 @@ prompt_for_bootmanager() # ask for Debian release {{{ prompt_for_release() { - [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='squeeze' + [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='jessie' RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \ "Please enter the Debian release you would like to use for installation:" \ - 0 50 4 \ - lenny Debian/old-stable \ - squeeze Debian/stable \ - wheezy Debian/testing \ + 0 50 5 \ + lenny Debian/5.0 \ + squeeze Debian/6.0 \ + wheezy Debian/7.0 \ + jessie Debian/8.0 \ sid Debian/unstable)" [ $? -eq 0 ] || bailout } @@ -556,7 +576,7 @@ prompt_for_mirror() [ $? -eq 0 ] || bailout if [ "$CHOOSE_MIRROR" = 'net' ] ; then - [ -n "$MIRROR" ] || MIRROR='http://cdn.debian.net/debian' + [ -n "$MIRROR" ] || MIRROR='http://http.debian.net/debian' MIRROR="$(dialog --stdout --title "${PN}" --inputbox \ "Please enter Debian mirror you would like to use for installing packages." \ 0 0 $MIRROR)" @@ -689,11 +709,13 @@ elif [ -n "$INTERACTIVE" ] ; then [ -n "$RELEASE" ] && INFOTEXT="$INFOTEXT Using release: $RELEASE" [ -n "$HOSTNAME" ] && INFOTEXT="$INFOTEXT - Using hostname $HOSTNAME" + Using hostname: $HOSTNAME" [ -n "$MIRROR" ] && INFOTEXT="$INFOTEXT Using mirror: $MIRROR" [ -n "$ISO" ] && INFOTEXT="$INFOTEXT Using ISO: $ISO" + [ -n "$ARCH" ] && INFOTEXT="$INFOTEXT + Using arch: $ARCH" INFOTEXT="$INFOTEXT @@ -718,12 +740,21 @@ else # if not running automatic installation display configuration and prompt fo fi [ -n "$RELEASE" ] && echo " Using release: $RELEASE" - [ -n "$MIRROR" ] && echo " Using mirror: $MIRROR" [ -n "$HOSTNAME" ] && echo " Using hostname: $HOSTNAME" + [ -n "$MIRROR" ] && echo " Using mirror: $MIRROR" [ -n "$ISO" ] && echo " Using ISO: $ISO" + [ -n "$ARCH" ] && echo " Using arch: $ARCH" if [ -n "$VIRTUAL" ] ; then echo " Deploying as Virtual Machine." - [ -n "$VMSIZE" ] && echo " Using Virtual Disk file with size of ${VMSIZE}." + if [ -n "$VMSIZE" -a -n "$VMFILE" ]; then + echo " Using Virtual Disk file with size of ${VMSIZE}." + fi + fi + + if [ ! -t 0 -a -z "$ROOTPASSWORD" -a -z "$NOPASSWORD" ] ; then + echo + echo " You do not have a TTY allocated, your password will be shown in" + echo " plaintext on the terminal! If you are using SSH, try its -t option!" fi echo @@ -774,6 +805,27 @@ if [ -z "$TARGET" -o -n "$INTERACTIVE" ] ; then fi # }}} +# architecture setup {{{ +if [ -n "$ARCH" ] ; then + ARCHCMD="--arch $ARCH" + ARCHINFO=" (${ARCH})" +else + ARCH="$(dpkg --print-architecture)" + ARCHCMD="--arch $ARCH" + ARCHINFO=" (${ARCH})" +fi +# }}} + +# It is not possible to build amd64 on i686. {{{ +CURRENT_ARCH="$(uname -m)" +if [ "$CURRENT_ARCH" != "x86_64" ] ; then + if [ "$ARCH" = "amd64" ] ; then + eerror "It is not possible to build amd64 on $CURRENT_ARCH." ; eend 1 + bailout 1 + fi +fi +# }}} + checkconfiguration # finally make sure at least $TARGET is set [the partition for the new system] {{{ @@ -811,7 +863,6 @@ set_target_directory(){ MKFS='' TUNE2FS='' FSCK='' - GRUB='' # make sure we normalise the path to an absolute directory name so something like: # mkdir -p foo/a bar/a; (cd foo; grml-debootstrap -t a)&; (cd bar; grml-debootstrap -t a)&; wait # works @@ -825,24 +876,13 @@ else fi # }}} -# architecture setup {{{ -if [ -n "$ARCH" ] ; then - ARCHCMD="--arch $ARCH" - ARCHINFO=" (${ARCH})" -else - ARCH="$(dpkg --print-architecture)" - ARCHCMD="--arch $ARCH" - ARCHINFO=" (${ARCH})" -fi -# }}} - # make sure we have the right syntax when using an iso image {{{ if [ -n "$ISO" ] ; then case $ISO in file*) # do nothing ;; *) - ISO=file:$1 + ISO=file:$ISO ;; esac fi @@ -850,37 +890,67 @@ ISODIR=${ISO##file:} ISODIR=${ISODIR%%/} # }}} +# Debian ISOs do not contain signed Release files {{{ +if [ -n "$ISO" ] ; then + DEBOOTSTRAP_OPT="$DEBOOTSTRAP_OPT --no-check-gpg" +fi +# }}} + # create filesystem {{{ mkfs() { if [ -n "$DIRECTORY" ] ; then einfo "Running grml-debootstrap on a directory, skipping mkfs stage." - else - if grep -q "$TARGET" /proc/mounts ; then - eerror "$TARGET already mounted, exiting to avoid possible damage. (Manually unmount $TARGET)" ; eend 1 - bailout 1 - fi + return 0 + fi - if [ -n "$MKFS" ] ; then - einfo "Running $MKFS on $TARGET" - $MKFS $TARGET ; RC=$? + if grep -q "$TARGET" /proc/mounts ; then + eerror "$TARGET already mounted, exiting to avoid possible damage. (Manually unmount $TARGET)" ; eend 1 + bailout 1 + fi - # make sure /dev/disk/by-uuid/... is up2date, otherwise grub - # will fail to detect the uuid in the chroot - if echo "$TARGET" | grep -q "/dev/md" ; then - blockdev --rereadpt "${TARGET}" - elif ! [ -n "$VIRTUAL" ] ; then - blockdev --rereadpt "${TARGET%%[0-9]*}" - fi - # give the system 2 seconds, otherwise we might run into - # race conditions :-/ - sleep 2 + # mkfs.ext* might prompt with "/dev/sdX# contains a ext* file system + # created on ... Proceed anyway? (y,n)" which we want to skip in force mode + if [ -n "$MKFS" ] && [ -n "$FORCE" ] ; then + case "$MKFS" in + mkfs.ext*) + einfo "Enabling force option (-F) for mkfs.ext* tool as requested via --force switch." + MKFS_OPTS="$MKFS_OPTS -F" + eend 0 + ;; + esac + fi - eval $(blkid -o udev $TARGET 2>/dev/null) - [ -n "$ID_FS_UUID" ] && TARGET_UUID="$ID_FS_UUID" || TARGET_UUID="" + if [ -n "$MKFS" ] ; then + einfo "Running $MKFS $MKFS_OPTS on $TARGET" + $MKFS $MKFS_OPTS $TARGET ; RC=$? - eend $RC + if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then + if ! echo "$MKFS" | grep -q "mkfs.ext" ; then + eerror "Not changing disk uuid for $TARGET because $MKFS doesn't seem to match for ext{2,3,4} file system" + eend 1 + bailout 1 + else + einfo "Changing disk uuid for $TARGET to fixed (non-random) value using tune2fs" + tune2fs "$TARGET" -U 26ada0c0-1165-4098-884d-aafd2220c2c6 + eend $? + fi fi + # make sure /dev/disk/by-uuid/... is up2date, otherwise grub + # will fail to detect the uuid in the chroot + if echo "$TARGET" | grep -q "/dev/md" ; then + blockdev --rereadpt "${TARGET}" + elif ! [ -n "$VIRTUAL" ] ; then + blockdev --rereadpt "${TARGET%%[0-9]*}" + fi + # give the system 2 seconds, otherwise we might run into + # race conditions :-/ + sleep 2 + + eval $(blkid -o udev $TARGET 2>/dev/null) + [ -n "$ID_FS_UUID" ] && TARGET_UUID="$ID_FS_UUID" || TARGET_UUID="" + + eend $RC fi } # }}} @@ -924,25 +994,40 @@ mount_target() { # prepare VM image for usage with debootstrap {{{ prepare_vm() { if [ -z "$VIRTUAL" ] ; then - return 0 # be quite by intention + return 0 # be quiet by intention fi - if [ -b "$TARGET" ] ; then + if [ -b "$TARGET" -a -n "$VMFILE" ] ; then eerror "Error: specified virtual disk target ($TARGET) is an existing block device." eend 1 bailout 1 fi + if [ ! -b "$TARGET" -a -z "$VMFILE" ] ; then + eerror "Error: specified virtual disk target ($TARGET) does not exist yet." + eend 1 + bailout 1 + fi ORIG_TARGET="$TARGET" # store for later reuse - qemu-img create -f raw "${TARGET}" "${VMSIZE}" + if [ -n "$VMFILE" ]; then + qemu-img create -f raw "${TARGET}" "${VMSIZE}" + fi echo 4 66 | /usr/share/grml-debootstrap/bootgrub.mksh -A | dd of="$TARGET" conv=notrunc dd if=/dev/zero bs=1 conv=notrunc count=64 seek=446 of="$TARGET" - parted -s "${TARGET}" 'mkpart primary ext3 2M -1' + if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then + einfo "Adjusting disk signature to a fixed (non-random) value" + MBRTMPFILE=$(mktemp) + dd if="${TARGET}" of="${MBRTMPFILE}" bs=512 count=1 + echo -en "\x41\x41\x41\x41\x41" | dd of="${MBRTMPFILE}" conv=notrunc seek=440 bs=1 + dd if="${MBRTMPFILE}" of="${TARGET}" conv=notrunc + eend $? + fi + parted -s "${TARGET}" 'mkpart primary ext4 2M -1' # if dm-mod isn't available then kpartx will fail with # "Is device-mapper driver missing from kernel? [...]" - if ! kpartx -av $TARGET >/dev/null 2>&1 ; then + if ! kpartx -av $TARGET >/dev/null 2>&1 || ! grep -q device-mapper /proc/misc >/dev/null 2>&1 ; then einfo "Device-mapper not ready yet, trying to load dm-mod module." modprobe dm-mod ; eend $? fi @@ -1008,6 +1093,9 @@ finalize_vm() { rm -f "${MNTPOINT}/tmp/core.img" einfo "Updating grub configuration file." + if [ -n "$BOOT_APPEND" ] ; then + sed -i "/GRUB_CMDLINE_LINUX_DEFAULT/ s#\"\$# ${BOOT_APPEND}\"#" "${MNTPOINT}"/etc/default/grub + fi chroot "${MNTPOINT}" update-grub umount "${MNTPOINT}"/proc @@ -1038,15 +1126,16 @@ debootstrap_system() { eend 1 ; exit 1 fi - einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}${ISO}" - if [ -n "$MIRROR" ] ; then - einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR" - $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR - RC=$? - else + if [ -n "$ISO" ] ; then + einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${ISO}" einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO" $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO RC=$? + else + einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}" + einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR" + $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR + RC=$? fi if [ $RC -ne 0 ] ; then @@ -1072,12 +1161,16 @@ preparechroot() { chmod 600 $CHROOT_VARIABLES # make sure nobody except root can read it echo "# Configuration of ${PN}" > $CHROOT_VARIABLES [ -n "$ARCH" ] && echo "ARCH=\"$ARCH\"" >> $CHROOT_VARIABLES + [ -n "$BACKPORTREPOS" ] && echo "BACKPORTREPOS=\"$BACKPORTREPOS\"" >> $CHROOT_VARIABLES [ -n "$CHROOT_SCRIPTS" ] && echo "CHROOT_SCRIPTS=\"$CHROOT_SCRIPTS\"" >> $CHROOT_VARIABLES [ -n "$CONFFILES" ] && echo "CONFFILES=\"$CONFFILES\"" >> $CHROOT_VARIABLES [ -n "$DEBCONF" ] && echo "DEBCONF=\"$DEBCONF\"" >> $CHROOT_VARIABLES [ -n "$DEBIAN_FRONTEND" ] && echo "DEBIAN_FRONTEND=\"$DEBIAN_FRONTEND\"" >> $CHROOT_VARIABLES [ -n "$DEBOOTSTRAP" ] && echo "DEBOOTSTRAP=\"$DEBOOTSTRAP\"" >> $CHROOT_VARIABLES + [ -n "$DEFAULT_LOCALES" ] && echo "DEFAULT_LOCALES=\"$DEFAULT_LOCALES\"" >> $CHROOT_VARIABLES + [ -n "$DEFAULT_LANGUAGE" ] && echo "DEFAULT_LANGUAGE=\"$DEFAULT_LANGUAGE\"" >> $CHROOT_VARIABLES [ -n "$EXTRAPACKAGES" ] && echo "EXTRAPACKAGES=\"$EXTRAPACKAGES\"" >> $CHROOT_VARIABLES + [ -n "$FALLBACK_MIRROR" ] && echo "FALLBACK_MIRROR=\"$FALLBACK_MIRROR\"" >> $CHROOT_VARIABLES [ -n "$FORCE" ] && echo "FORCE=\"$FORCE\"" >> $CHROOT_VARIABLES [ -n "$GRMLREPOS" ] && echo "GRMLREPOS=\"$GRMLREPOS\"" >> $CHROOT_VARIABLES [ -n "$GRUB" ] && echo "GRUB=\"$GRUB\"" >> $CHROOT_VARIABLES @@ -1091,6 +1184,7 @@ preparechroot() { [ -n "$MIRROR" ] && echo "MIRROR=\"$MIRROR\"" >> $CHROOT_VARIABLES [ -n "$MKFS" ] && echo "MKFS=\"$MKFS\"" >> $CHROOT_VARIABLES [ -n "$NOPASSWORD" ] && echo "NOPASSWORD=\"true\"" >> $CHROOT_VARIABLES + [ -n "$NOKERNEL" ] && echo "NOKERNEL=\"true\"" >> $CHROOT_VARIABLES [ -n "$PACKAGES" ] && echo "PACKAGES=\"$PACKAGES\"" >> $CHROOT_VARIABLES [ -n "$PRE_SCRIPTS" ] && echo "PRE_SCRIPTS=\"$PRE_SCRIPTS\"" >> $CHROOT_VARIABLES [ -n "$RECONFIGURE" ] && echo "RECONFIGURE=\"$RECONFIGURE\"" >> $CHROOT_VARIABLES @@ -1167,10 +1261,38 @@ preparechroot() { [ -d $CONFFILES/usr ] && cp $VERBOSE -a -L $CONFFILES/usr/* $MNTPOINT/usr/ [ -d $CONFFILES/var ] && cp $VERBOSE -a -L $CONFFILES/var/* $MNTPOINT/var/ - # copy local network setup to chroot - if [ -r /etc/network/interfaces -a ! -r "${MNTPOINT}"/etc/network/interfaces ] ; then - [ -d $MNTPOINT/etc/network ] || mkdir $MNTPOINT/etc/network - cp $VERBOSE /etc/network/interfaces $MNTPOINT/etc/network/interfaces + # network setup + DEFAULT_INTERFACES="# /etc/network/interfaces - generated by grml-debootstrap + +# Include files from /etc/network/interfaces.d when using +# ifupdown v0.7.44 or newer: +#source-directory /etc/network/interfaces.d + +auto lo +iface lo inet loopback + +allow-hotplug eth0 +iface eth0 inet dhcp +" + + if [ -n "$NOINTERFACES" ] ; then + einfo "Not installing /etc/network/interfaces as requested via --nointerfaces option" ; eend 0 + elif [ -n "$DEFAULT_INTERFACES" ] ; then + einfo "Installing default /etc/network/interfaces as requested via --defaultinterfaces options." + echo "$DEFAULT_INTERFACES" > "${MNTPOINT}/etc/network/interfaces" + eend $? + elif [ -n "$VIRTUAL" ] ; then + einfo "Setting up Virtual Machine, installing default /etc/network/interfaces" + echo "$DEFAULT_INTERFACES" > "${MNTPOINT}/etc/network/interfaces" + eend $? + elif [ -r /etc/network/interfaces ] ; then + einfo "Copying /etc/network/interfaces from host to target system" + cp $VERBOSE /etc/network/interfaces "${MNTPOINT}/etc/network/interfaces" + eend $? + else + ewarn "Couldn't read /etc/network/interfaces, installing default /etc/network/interfaces" + echo "$DEFAULT_INTERFACES" > "${MNTPOINT}/etc/network/interfaces" + eend $? fi # install config file providing some example entries @@ -1226,7 +1348,11 @@ chrootscript() { else einfo "Executing chroot-script now" mount --bind /dev "$MNTPOINT"/dev - chroot "$MNTPOINT" /bin/chroot-script ; RC=$? + if [ "$DEBUG" = "true" ] ; then + chroot "$MNTPOINT" /bin/sh -x /bin/chroot-script ; RC=$? + else + chroot "$MNTPOINT" /bin/chroot-script ; RC=$? + fi umount "$MNTPOINT"/dev eend $RC fi