From: Michael Prokop Date: Mon, 31 Dec 2012 22:53:38 +0000 (+0100) Subject: Merge branch 'mika/wheezy_release' X-Git-Tag: v0.55~3 X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=488643ab1a3e97a77bdb01f1070c8e83c6b346f9;hp=773fe9c1cfeb23eb649bd641c5749e9df5373cb6 Merge branch 'mika/wheezy_release' --- diff --git a/chroot-script b/chroot-script index 7caf4dd..d3535b0 100755 --- a/chroot-script +++ b/chroot-script @@ -18,9 +18,15 @@ # use aptitude only if it's available if [ -x /usr/bin/aptitude ] ; then - APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS" APTUPDATE='aptitude update' - APTUPGRADE='aptitude -y safe-upgrade' + # 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' @@ -91,6 +97,29 @@ 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 @@ -220,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-free firmware-linux" DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES fi } @@ -526,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 upgrade_system 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 diff --git a/grml-debootstrap b/grml-debootstrap index dcd2b7b..6b5fa17 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -20,12 +20,13 @@ DEBCONF='yes' DEBIAN_FRONTEND='noninteractive' DEBOOTSTRAP='debootstrap' EXTRAPACKAGES='yes' +FALLBACK_MIRROR='http://cdn.debian.net/debian' FORCE='' HOSTNAME='grml' INITRD='yes' INSTALL_NOTES='/etc/debootstrap/install_notes' LOCALES='yes' -MIRROR='http://cdn.debian.net/debian' +MIRROR="$FALLBACK_MIRROR" MKFS='mkfs.ext3' PACKAGES='yes' PRE_SCRIPTS='yes' @@ -845,7 +846,7 @@ if [ -n "$ISO" ] ; then file*) # do nothing ;; *) - ISO=file:$1 + ISO=file:$ISO ;; esac fi @@ -853,6 +854,12 @@ 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 @@ -1044,15 +1051,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 @@ -1084,6 +1092,7 @@ preparechroot() { [ -n "$DEBIAN_FRONTEND" ] && echo "DEBIAN_FRONTEND=\"$DEBIAN_FRONTEND\"" >> $CHROOT_VARIABLES [ -n "$DEBOOTSTRAP" ] && echo "DEBOOTSTRAP=\"$DEBOOTSTRAP\"" >> $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