X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=2512b953b06be465f3d9fa1165d4d152ecf3388b;hp=7206de9de90faf05b0af5f6ed1ba1910f31d888b;hb=afe4badc6bb220c023434407c3fd8e8ff07b9f61;hpb=561fb863c769214865b8ba5f86e5e1c374bba609 diff --git a/chroot-script b/chroot-script index 7206de9..2512b95 100755 --- a/chroot-script +++ b/chroot-script @@ -17,9 +17,11 @@ if [ -x /usr/bin/aptitude ] ; then APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS" APTUPDATE='aptitude update' + APTUPGRADE='aptitude -y safe-upgrade' 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 @@ -53,31 +55,36 @@ askpass() { # define chroot mirror {{{ chrootmirror() { - [ -n "$KEEP_SRC_LIST" ] && return - [ -z "$COMPONENTS" ] && COMPONENTS='main contrib non-free' + if [ -n "$KEEP_SRC_LIST" ] ; then + echo "KEEP_SRC_LIST has been set, skipping chrootmirror stage." + return + fi + + if [ -z "$COMPONENTS" ] ; then + COMPONENTS='main contrib non-free' + fi + echo "Using repository components $COMPONENTS" if [ -n "$ISO" ] ; then - echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list - [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true - # add security.debian.org: - case "$RELEASE" in - unstable|sid) ;; # no security pool available - *) - echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list - ;; - esac + echo "Adjusting sources.list for ISO (${ISO})." + echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list + echo "Adding mirror entry (${MIRROR}) to sources.list." + [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true else if [ -n "$MIRROR" ] ; then - echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list - # add security.debian.org: - case "$RELEASE" in - unstable|sid) ;; # no security pool available - *) - echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list - ;; - esac + echo "Adjusting sources.list for mirror (${MIRROR})." + echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list fi fi + + # add security.debian.org: + case "$RELEASE" in + unstable|sid) ;; # no security pool available + *) + echo "Adding security.debian.org to sources.list." + echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list + ;; + esac } # }}} @@ -87,7 +94,6 @@ grmlrepos() { # 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 @@ -95,7 +101,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 @@ -109,7 +114,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 @@ -155,6 +160,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 @@ -177,7 +194,7 @@ packages() { if [ "$PACKAGES" = 'yes' ] ; then if ! [ -r /etc/debootstrap/packages ] ; then - echo "Error: /etc/debootstrap/packages not found, exiting." + echo "Error: /etc/debootstrap/packages (inside chroot) not found, exiting." >&2 exit 1 else $APTUPDATE @@ -236,6 +253,11 @@ reconfigure() { # set password of user root {{{ passwords() { + if [ -n "$NOPASSWORD" ] ; then + echo "Skip setting root password as requested." + return 0 + fi + echo "Activating shadow passwords." shadowconfig on @@ -244,7 +266,6 @@ passwords() CHPASSWD_OPTION='-m' fi - if [ -n "$ROOTPASSWORD" ] ; then echo root:"$ROOTPASSWORD" | chpasswd $CHPASSWD_OPTION export ROOTPASSWORD='' @@ -341,7 +362,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 @@ -410,8 +430,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 @@ -498,7 +523,7 @@ 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 ; do if stage $i ; then $i && stage $i done || exit 1 fi