X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=7a26927b0f75666de7e9bcaa780f6649e4423994;hp=5ca8295500bbffc85d89d8d18b7e613a94a0aba2;hb=a3c10e584dd26528ca76e201ab8a0e6b061db3ac;hpb=3d63d4407d8113260e4c2e2965699c0c6b280d09

diff --git a/chroot-script b/chroot-script
index 5ca8295..7a26927 100755
--- a/chroot-script
+++ b/chroot-script
@@ -323,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
 }
 # }}}
@@ -356,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
@@ -417,6 +416,7 @@ 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
         case "$TARGET" in