projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ommit -i option of cp, send output of umount to /dev/null
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
3eda6af
..
e922b1d
100644
(file)
--- a/
chroot-script
+++ b/
chroot-script
@@
-4,7
+4,7
@@
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Fre Nov 03 14:
02:25
CET 2006 [mika]
+# Latest change: Fre Nov 03 14:
36:06
CET 2006 [mika]
################################################################################
set -e # exit on any error
################################################################################
set -e # exit on any error
@@
-65,11
+65,11
@@
fi
# set up /etc/fstab if file is UNCONFIGURED
if grep -q UNCONFIGURED /etc/fstab ; then
echo "Setting up /etc/fstab"
# set up /etc/fstab if file is UNCONFIGURED
if grep -q UNCONFIGURED /etc/fstab ; then
echo "Setting up /etc/fstab"
-cat >> /etc/fstab << EOF
+cat > /etc/fstab << EOF
+$TARGET / auto defaults,errors=remount-ro 0 1
sysfs /sys sysfs auto 0 0
proc /proc proc defaults 0 0
sysfs /sys sysfs auto 0 0
proc /proc proc defaults 0 0
-$TARGET / auto defaults,errors=remount-ro 0 1
-# /dev/sda2 none swap sw 0 0
+# /dev/sda2 none swap sw 0 0
/dev/cdrom /mnt/cdrom0 iso9660 ro,user,noauto 0 0
EOF
fi
/dev/cdrom /mnt/cdrom0 iso9660 ro,user,noauto 0 0
EOF
fi
@@
-124,7
+124,7
@@
if [ "$BOOTMGR" = 'grub' ] ; then
# copy stage-files to /boot/grub/
[ -d /boot/grub/ ] || mkdir /boot/grub
# copy stage-files to /boot/grub/
[ -d /boot/grub/ ] || mkdir /boot/grub
- cp
-i
/usr/lib/grub/i386-pc/* /boot/grub/
+ cp /usr/lib/grub/i386-pc/* /boot/grub/
# otherwise grub fails with 'Could not find device for /boot/boot: not found or not a block device'
cp /etc/mtab /etc/mtab.old
# otherwise grub fails with 'Could not find device for /boot/boot: not found or not a block device'
cp /etc/mtab /etc/mtab.old
@@
-133,6
+133,8
@@
if [ "$BOOTMGR" = 'grub' ] ; then
# finally install grub
# grub-install $BOOT
update-grub -y
# finally install grub
# grub-install $BOOT
update-grub -y
+ [ -n "$GROOT" ] && sed -i "s/^# groot=(hd.*/groot=(${GROOT})" /boot/grub/menu.lst
+ update-grub -y
# restore mtab again
mv /etc/mtab.old /etc/mtab
# restore mtab again
mv /etc/mtab.old /etc/mtab
@@
-169,10
+171,10
@@
EOF
fi
# unmount all filesystems in chroot, make sure nothing is left...
fi
# unmount all filesystems in chroot, make sure nothing is left...
-umount -a || true
-umount /proc || true
-umount /proc || true
-umount -a || true
+umount -a
1>/dev/null 2>/dev/null
|| true
+umount /proc
1>/dev/null 2>/dev/null
|| true
+umount /proc
1>/dev/null 2>/dev/null
|| true
+umount -a
1>/dev/null 2>/dev/null
|| true
# finally exit the chroot
echo "Finished chroot installation, exiting."
# finally exit the chroot
echo "Finished chroot installation, exiting."