X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=3f557479557e0040059eafc562a84bd027339e6d;hp=84086cc1b68649325dd55140ef28d8b0b9f9dd27;hb=91e39fcde40898c7b5f4d5a96e042ab02ea40af3;hpb=ad7c3cfdaa7c6354c951a9dbbad6ada40a1dc082 diff --git a/chroot-script b/chroot-script index 84086cc..3f55747 100755 --- a/chroot-script +++ b/chroot-script @@ -5,6 +5,9 @@ # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. ################################################################################ +# GRML_CHROOT_SCRIPT_MARKER - do not remove this line unless you want to keep +# this script as /bin/chroot-script on your new installed system +################################################################################ . /etc/debootstrap/config || exit 1 . /etc/debootstrap/variables || exit 1 @@ -15,11 +18,19 @@ # use aptitude only if it's available if [ -x /usr/bin/aptitude ] ; then - APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS" APTUPDATE='aptitude update' + # Debian ISOs do not contain signed Release files + if [ -n "$ISO" ] ; then + APTINSTALL="aptitude -y --allow-untrusted --without-recommends install $DPKG_OPTIONS" + APTUPGRADE='aptitude -y --allow-untrusted safe-upgrade' + else + APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS" + APTUPGRADE='aptitude -y safe-upgrade' + fi else APTINSTALL="apt-get --force-yes -y --no-install-recommends install $DPKG_OPTIONS" APTUPDATE='apt-get update' + APTUPGRADE='apt-get --force-yes -y upgrade' fi if [ -z "$STAGES" ] ; then @@ -86,13 +97,35 @@ chrootmirror() { } # }}} +# remove local chroot mirror {{{ +remove_chrootmirror() { + if [ -n "$KEEP_SRC_LIST" ] ; then + echo "KEEP_SRC_LIST has been set, skipping remove_chrootmirror stage." + return + fi + + if [ -n "$ISO" ] ; then + echo "Removing ISO (${ISO}) from sources.list." + TMP_ISO=$(echo "$ISO" |sed 's#/#\\/#g') + sed -i "/deb $TMP_ISO $RELEASE $COMPONENTS/ D" /etc/apt/sources.list + else + if [ -n "$MIRROR" -a -n "$(echo $MIRROR|grep file:)" ] ; then + echo "Removing local mirror (${MIRROR}) from sources.list." + TMP_MIRROR=$(echo "$MIRROR" |sed 's#/#\\/#g') + sed -i "/deb $TMP_MIRROR $RELEASE $COMPONENTS/ D" /etc/apt/sources.list + echo "Adding fallback mirror entry (${FALLBACK_MIRROR}) to sources.list instead." + echo "deb $FALLBACK_MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list + fi + fi +} +# }}} + # set up grml repository {{{ grmlrepos() { if [ -n "$GRMLREPOS" ] ; then # user might have provided their own apt sources.list if ! grep -q grml /etc/apt/sources.list.d/grml.list 2>/dev/null ; then cat >> /etc/apt/sources.list.d/grml.list << EOF - # grml: stable repository: deb http://deb.grml.org/ grml-stable main deb-src http://deb.grml.org/ grml-stable main @@ -100,7 +133,6 @@ grmlrepos() { # grml: testing/development repository: deb http://deb.grml.org/ grml-testing main deb-src http://deb.grml.org/ grml-testing main - EOF fi @@ -114,7 +146,7 @@ EOF # why it's necessary, sometimes we get an error even though it works [mika] fi - # make sure we install packages from grml's pool only if not available + # make sure we install packages from Grml's pool only if not available # from Debian! if ! grep -q grml /etc/apt/preferences 2>/dev/null ; then cat >> /etc/apt/preferences << EOF @@ -160,6 +192,18 @@ EOF } # }}} +# make sure we have an up2date system {{{ +upgrade_system() { + if [ "$UPGRADE_SYSTEM" = "yes" ] ; then + echo "Running update + upgrade" + $APTUPDATE + $APTUPGRADE + else + echo "Not running update + upgrade as \$UPDATE_AND_UPGRADE is not set to 'yes'." + fi +} + +# }}} # remove now useless apt cache {{{ remove_apt_cache() { if [ "$RM_APTCACHE" = 'yes' ] ; then @@ -205,21 +249,47 @@ extrapackages() { } # }}} -# install kernel packages {{{ -kernel() { +# check if the specified Debian package exists +package_exists() { + output=$(apt-cache show "$1" 2>/dev/null) + [ -n "$output" ] + return $? +} + + +# determine the kernel version postfix +get_kernel_version() { # do not override $KERNEL if set via config file - if [ -z "$KERNEL" ] ; then - if [ "$ARCH" = 'i386' ] ; then - KERNEL='2.6-686' - elif [ "$ARCH" = 'amd64' ] ; then - KERNEL='2.6-amd64' - fi + if [ -n "$KERNEL" ] ; then + echo "$KERNEL" + return 0 fi - if [ -n "$KERNEL" ] ; then - $APTUPDATE + case $ARCH in + i386) KARCH=i686 ;; + amd64) KARCH=amd64 ;; + *) + echo "Only i386 and amd64 are currently supported" >&2 + return 1 + esac + + for KPREFIX in "" "2.6-" ; do # iterate through the kernel prefixes, + # currently "" and "2.6-" + if package_exists linux-image-${KPREFIX}${KARCH} ; then + echo ${KPREFIX}${KARCH} + return 0 + fi + + done +} + +# install kernel packages {{{ +kernel() { + $APTUPDATE + KVER=$(get_kernel_version) + if [ -n "$KVER" ] ; then # note: install busybox to be able to debug initramfs - KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox firmware-linux" + KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux" DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES fi } @@ -350,7 +420,6 @@ fi cat >> /etc/fstab << EOF proc /proc proc defaults 0 0 -/sys /sys sysfs noauto,rw,nosuid,nodev,noexec 0 0 /dev/cdrom /mnt/cdrom0 iso9660 ro,user,noauto 0 0 # some other examples: # /dev/sda2 none swap sw,pri=0 0 0 @@ -419,8 +488,13 @@ initrd() { grub_install() { if [ -z "$GRUB" ] ; then - echo "Notice: \$GRUB not defined, will not install grub therefore." - return 0 + echo "Notice: \$GRUB not defined, will not install grub inside chroot at this stage." + return 0 + fi + + if ! dpkg --list grub-pc 2>/dev/null | grep -q '^ii' ; then + echo "Notice: grub option set but no grub-pc package, installing it therefore." + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL grub-pc fi if ! [ -x "$(which grub-install)" ] ; then @@ -507,7 +581,8 @@ trap signal_handler HUP INT QUIT TERM for i in chrootmirror grmlrepos kernelimg_conf \ kernel packages extrapackages reconfigure hosts interfaces \ timezone fstab hostname initrd grub_install passwords \ - custom_scripts remove_apt_cache services ; do + custom_scripts upgrade_system remove_apt_cache services \ + remove_chrootmirror; do if stage $i ; then $i && stage $i done || exit 1 fi