X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=a711641bf58f81568848aaa4963c2c063fb1331b;hp=eaf39f666fcc274941d94c8baf977065202632fe;hb=d27799d91e7f4bda64cd520917d6a2d2b496e0c5;hpb=4040ae3e3763818f6002af85aec8e9ed7c905c56 diff --git a/chroot-script b/chroot-script index eaf39f6..a711641 100755 --- a/chroot-script +++ b/chroot-script @@ -17,10 +17,10 @@ set -e # exit on any error # use aptitude only if it's available if [ -x /usr/bin/aptitude ] ; then - APTINSTALL='aptitude -y --without-recommends install ' + APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS" APTUPDATE='aptitude update' else - APTINSTALL='apt-get --force-yes -y install' + APTINSTALL="apt-get --force-yes -y install $DPKG_OPTIONS" APTUPDATE='apt-get update' fi @@ -36,21 +36,25 @@ stage() { echo "$2" > "$STAGES/$1" return 0 elif grep -q done "$STAGES/$1" 2>/dev/null ; then - echo "[*] Notice: stage $1 has been executed already, skipping execution therefore.">&2 + echo " [*] Notice: stage $1 has been executed already, skipping execution therefore.">&2 return 1 fi + echo " Executing stage ${1}" + return 0 } # }}} # define chroot mirror {{{ chrootmirror() { [ -n "$KEEP_SRC_LIST" ] && return + [ -z "$COMPONENTS" ] && COMPONENTS='main contrib non-free' + if [ -n "$ISO" ] ; then - echo "deb $ISO $RELEASE main contrib" > /etc/apt/sources.list - [ -n "$CHROOTMIRROR" ] && echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" >> /etc/apt/sources.list + echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list + [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || /bin/true else - if [ -n "$CHROOTMIRROR" ] ; then - echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list + if [ -n "$MIRROR" ] ; then + echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list fi fi } @@ -168,14 +172,6 @@ extrapackages() { } # }}} -# sarge specific stuff: mkinitrd {{{ -mkinitrd() { - if [ "$RELEASE" = 'sarge' ] ; then - sed -i "s#ROOT=probe#ROOT=$TARGET#" /etc/mkinitrd/mkinitrd.conf - fi -} -# }}} - # install kernel packages {{{ kernel() { # do not override $KERNEL if set via config file @@ -189,12 +185,9 @@ kernel() { if [ -n "$KERNEL" ] ; then $APTUPDATE - if [ "$RELEASE" = 'sarge' ] ; then - KERNELPACKAGES="kernel-image-$KERNEL kernel-headers-$KERNEL" - else - KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL" - fi - DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES + # note: install busybox to be able to debug initramfs + KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox" + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES fi } # }}} @@ -217,8 +210,14 @@ passwords() echo "Activating shadow passwords." shadowconfig on + CHPASSWD_OPTION= + if chpasswd --help 2>&1 | grep -q -- '-m,' ; then + CHPASSWD_OPTION='-m' + fi + + if [ -n "$ROOTPASSWORD" ] ; then - echo root:"$ROOTPASSWORD" | chpasswd -m + echo root:"$ROOTPASSWORD" | chpasswd $CHPASSWD_OPTION export ROOTPASSWORD='' else a='1' @@ -236,7 +235,7 @@ passwords() a='1' b='2' else - echo root:"$a" | chpasswd -m + echo root:"$a" | chpasswd $CHPASSWD_OPTION unset a unset b fi @@ -247,9 +246,25 @@ passwords() # set up /etc/hosts {{{ hosts() { - if ! [ -f /etc/hosts ] ; then - echo "Setting up /etc/hosts" - echo "127.0.0.1 localhost $HOSTNAME" > /etc/hosts + if [ -f /etc/hosts ] ; then + sed -i "s#127.0.0.1 .*#127.0.0.1 localhost $HOSTNAME#" /etc/hosts + [ -n "$HOSTNAME" ] && sed -i "s/grml/$HOSTNAME/g" /etc/hosts + else + cat > /etc/hosts << EOF +127.0.0.1 localhost $HOSTNAME + +#127.0.0.1 localhost +#127.0.1.1 $HOSTNAME.example.org $HOSTNAME + +# The following lines are desirable for IPv6 capable hosts +#::1 ip6-localhost ip6-loopback $HOSTNAME +::1 ip6-localhost ip6-loopback +fe00::0 ip6-localnet +ff00::0 ip6-mcastprefix +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters +ff02::3 ip6-allhosts +EOF fi } # }}} @@ -296,11 +311,12 @@ 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 0 0 +# /dev/sda2 none swap sw,pri=0 0 0 # /dev/hda1 /Grml ext3 dev,suid,user,noauto 0 2 # //1.2.3.4/pub /smb/pub smbfs defaults,user,noauto,uid=grml,gid=grml 0 0 # linux:/pub /beer nfs defaults 0 0 # tmpfs /tmp tmpfs size=300M 0 0 +# /dev/sda5 none swap sw 0 0 EOF } # }}} @@ -327,7 +343,12 @@ hostname() { # adjust postfix configuration if [ -r /etc/postfix/main.cf ] ; then + # adjust hostname related options: sed -i "s/grml/$HOSTNAME/g" /etc/postfix/main.cf + + # listen on loopback interface only: + sed -i "s/^inet_interfaces = .*/inet_interfaces = loopback-only/" /etc/postfix/main.cf + grep -q inet_interfaces /etc/postfix/main.cf || echo 'inet_interfaces = loopback-only' >> /etc/postfix/main.cf fi fi } @@ -336,40 +357,28 @@ hostname() { # generate initrd/initramfs {{{ initrd() { # assume the first available kernel as our main kernel - KERNELIMG=$(ls -1 /boot/vmlinuz-* | head -1) + KERNELIMG=$(ls -1 /boot/vmlinuz-* 2>/dev/null | head -1) + if [ -z "$KERNELIMG" ] ; then + echo 'No kernel image found, skipping initrd stuff.'>&2 + return + fi + KERNELVER=${KERNELIMG#/boot/vmlinuz-} # generate initrd if [ -n "$INITRD" ] ; then - if [ "$RELEASE" = 'sarge' ] ; then - echo "Release sarge detected, will not create an initrd." - else - echo "Generating initrd." - update-initramfs -c -t -k $KERNELVER - if [ -f "/boot/initrd.img-$KERNELVER" ] ; then - GRUBINITRD="initrd /boot/initrd.img-$KERNELVER" - LILOINITRD=" initrd=/boot/initrd.img-$KERNELVER" - fi - fi + echo "Generating initrd." + update-initramfs -c -t -k $KERNELVER fi } # }}} # grub configuration/installation {{{ -grub() { - if [ -z "$GROOT" ] ; then - echo "Warning: \$GROOT is not defined, will not adjust grub configuration therefore." +grub_config() { + if [ -z "$GRUB" ] ; then + echo "Warning: \$GRUB is not defined, will not adjust grub configuration therefore." else - echo "Adjusting grub configuration for use on ${GROOT}." - - # copy stage-files to /boot/grub/ - [ -d /boot/grub/ ] || mkdir /boot/grub - # i386 specific: - [ -d /usr/lib/grub/i386-pc ] && cp /usr/lib/grub/i386-pc/* /boot/grub/ - # amd64 specific: - [ -d /usr/lib/grub/x86_64-pc ] && cp /usr/lib/grub/x86_64-pc/* /boot/grub/ - # sarge ships grub files in another directory - [ "$RELEASE" = 'sarge' ] && cp /lib/grub/i386-pc/* /boot/grub/ + echo "Adjusting grub configuration for use on ${GRUB}." # finally install grub if [ -x /usr/sbin/update-grub ] ; then @@ -377,18 +386,9 @@ grub() { else UPDATEGRUB='/sbin/update-grub' fi - $UPDATEGRUB -y - if [ -f /boot/grub/menu.lst ] ; then - sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst - if [ -n "$TARGET_UUID" ] ; then - sed -i "s|^# kopt=root=.*|# kopt=root=UUID=${TARGET_UUID} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst - else - sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst - fi - # not sure why savedefault does not work for me; any ideas? - sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst - $UPDATEGRUB -y - fi + + # grub2: + $UPDATEGRUB fi } # }}} @@ -428,13 +428,15 @@ finalize() { # execute the functions {{{ for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \ - packages extrapackages mkinitrd kernel reconfigure hosts interfaces \ - timezone fstab hostname initrd grub passwords custom_scripts \ - services finalize ; do + kernel packages extrapackages reconfigure hosts interfaces \ + timezone fstab hostname initrd grub_config passwords custom_scripts \ + services ; do if stage $i ; then $i && stage $i done || exit 1 fi done + # always execute the finalize stage: + finalize # }}} # finally exit the chroot {{{