X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=7495e80604cdf27d01b8c968f4df9625a2733607;hp=8f545cf4eb6e01c3890e4e8d898cab61f42a1e2d;hb=7540b11c2352b5895e11b957a3200e8a12209c26;hpb=17576f28917f7708e17d5add6497eb0efbbd4b59

diff --git a/chroot-script b/chroot-script
index 8f545cf..7495e80 100755
--- a/chroot-script
+++ b/chroot-script
@@ -196,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
@@ -221,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'
@@ -240,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
@@ -316,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
 }
 # }}}
@@ -349,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
@@ -410,6 +416,8 @@ grub() {
         UPDATEGRUB='/sbin/update-grub'
      fi
      $UPDATEGRUB -y
+
+     # grub1:
      if [ -f /boot/grub/menu.lst ] ; then
         sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst
         case "$TARGET" in
@@ -430,6 +438,62 @@ grub() {
         sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
         $UPDATEGRUB -y
      fi
+
+     # grub2:
+     if [ -f /etc/default/grub ] ; then
+        # create a copy of the original:
+        cp /etc/default/grub /etc/default/grub.orig
+
+        case "$TARGET" in
+             # do NOT use uuid with SW-RAID
+             /dev/md*)
+               GRUB_CMDLINE="root=${TARGET} ro ${BOOT_APPEND}"
+               ;;
+             *)
+               if [ -n "$TARGET_UUID" ] ; then
+                 GRUB_CMDLINE="root=UUID=${TARGET_UUID} ro ${BOOT_APPEND}"
+               else
+                 GRUB_CMDLINE="root=${TARGET} ro ${BOOT_APPEND}"
+               fi
+               ;;
+        esac
+
+        cat > /etc/default/grub << EOF
+# Note: this file has been generated by chroot-script of grml-debootstrap.
+# This configuration file is a workaround being necessary as the device.map
+# generated by the live system might not correspond with your harddisk
+# installation.
+#
+# Please restore the original Debian configuration executing the following
+# commands when running your harddisk installation:
+#
+#   grub-mkdevicemap
+#   mv /etc/default/grub.orig /etc/default/grub
+#   update-grub
+#
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR=Debian
+# GRUB_DISABLE_LINUX_UUID=true
+GRUB_CMDLINE_LINUX="$GRUB_CMDLINE"
+EOF
+
+        [ -n "$INSTALL_NOTES" ] && echo "
+
+The grub2 configuration has been adjusted so you should
+be able to boot into your Debian installation now.
+After rebooting into your Debian installation please execute:
+
+  grub-mkdevicemap
+  mv /etc/default/grub.orig /etc/default/grub
+  update-grub
+
+to finalise configuration. This instructions are available
+in the header of /etc/default/grub as well.
+" >> $INSTALL_NOTES
+
+        $UPDATEGRUB
+     fi
   fi
 }
 # }}}