X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=7a26927b0f75666de7e9bcaa780f6649e4423994;hp=e5ea8a36d1eefd4af1f0ea62804bf0128a55918f;hb=a3c10e584dd26528ca76e201ab8a0e6b061db3ac;hpb=6fd5cf97f5debb0b0d931612d6bad9f325d30129 diff --git a/chroot-script b/chroot-script index e5ea8a3..7a26927 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 @@ -47,12 +47,14 @@ stage() { # 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 } @@ -194,7 +196,8 @@ kernel() { if [ "$RELEASE" = 'sarge' ] ; then KERNELPACKAGES="kernel-image-$KERNEL kernel-headers-$KERNEL" else - KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL" + # note: install busybox to be able to debug initramfs + KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox" fi DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES fi @@ -219,8 +222,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' @@ -238,7 +247,7 @@ passwords() a='1' b='2' else - echo root:"$a" | chpasswd -m + echo root:"$a" | chpasswd $CHPASSWD_OPTION unset a unset b fi @@ -249,13 +258,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 - fi - - if [ -n "$HOSTNAME" ] ; then - sed -i "s/grml/$HOSTNAME/g" /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 } # }}} @@ -302,11 +323,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 } # }}} @@ -335,8 +357,6 @@ hostname() { if [ -r /etc/postfix/main.cf ] ; then # adjust hostname related options: sed -i "s/grml/$HOSTNAME/g" /etc/postfix/main.cf - sed -i "s/^myhostname = .*/myhostname = $HOSTNAME/" /etc/postfix/main.cf - sed -i "s/^mydestination = .*/mydestination = localdomain, localhost, localhost.localdomain, $HOSTNAME/" /etc/postfix/main.cf # listen on loopback interface only: sed -i "s/^inet_interfaces = .*/inet_interfaces = loopback-only/" /etc/postfix/main.cf @@ -349,7 +369,12 @@ 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 @@ -391,13 +416,23 @@ grub() { 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 + case "$TARGET" in + # do NOT use uuid with SW-RAID + /dev/md*) + sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|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 + ;; + esac + # not sure why savedefault does not work for me; any ideas? sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst $UPDATEGRUB -y @@ -441,7 +476,7 @@ finalize() { # execute the functions {{{ for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \ - packages extrapackages mkinitrd kernel reconfigure hosts interfaces \ + kernel packages extrapackages mkinitrd reconfigure hosts interfaces \ timezone fstab hostname initrd grub passwords custom_scripts services ; do if stage $i ; then $i && stage $i done || exit 1