projects
/
grml-debootstrap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9002844
)
move grub code to a place before umount code; fix sed command in chroot-script
author
Michael Prokop
<mika@grml.org>
Mon, 6 Nov 2006 11:51:58 +0000
(12:51 +0100)
committer
Michael Prokop
<mika@grml.org>
Mon, 6 Nov 2006 11:51:58 +0000
(12:51 +0100)
chroot-script
patch
|
blob
|
history
grml-debootstrap
patch
|
blob
|
history
diff --git
a/chroot-script
b/chroot-script
index
49c73b7
..
c4d809a
100644
(file)
--- a/
chroot-script
+++ b/
chroot-script
@@
-160,7
+160,7
@@
if [ -n "$GROOT" ] ; then
# finally install grub
update-grub -y
sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst
# finally install grub
update-grub -y
sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst
- sed -i "s
/^# kopt=root=.*/# kopt=root=${TARGET} ro/
g" /boot/grub/menu.lst
+ sed -i "s
|^# kopt=root=.*|# kopt=root=${TARGET} ro|
g" /boot/grub/menu.lst
# not sure why savedefault does not work for me; any ideas?
sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
update-grub -y
# not sure why savedefault does not work for me; any ideas?
sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
update-grub -y
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
2e1a1dc
..
d964257
100644
(file)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-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: Mon Nov 06 12:
31:46
CET 2006 [mika]
+# Latest change: Mon Nov 06 12:
51:22
CET 2006 [mika]
################################################################################
# http://www.debian.org/releases/stable/i386/apcs04.html.en
################################################################################
# http://www.debian.org/releases/stable/i386/apcs04.html.en
@@
-124,10
+124,6
@@
eend $?
# rm -rf $MNTPOINT/etc/debootstrap/
# eend $?
# rm -rf $MNTPOINT/etc/debootstrap/
# eend $?
-einfo "Unmount $MNTPOINT"
-umount $MNTPOINT
-eend $?
-
if [ -z "$MBR" ] ; then
echo "Notice: \$MBR not set, will not install grub therefor."
else
if [ -z "$MBR" ] ; then
echo "Notice: \$MBR not set, will not install grub therefor."
else
@@
-136,6
+132,10
@@
else
eend $?
fi
eend $?
fi
+einfo "Unmount $MNTPOINT"
+umount $MNTPOINT
+eend $?
+
if [ "$FSCK" = 'yes' ] ; then
[ -n "$FSCKTOOL" ] || FSCKTOOL="fsck.${MKFS#mkfs.}"
einfo "Checking filesystem on $TARGET using $FSCKTOOL"
if [ "$FSCK" = 'yes' ] ; then
[ -n "$FSCKTOOL" ] || FSCKTOOL="fsck.${MKFS#mkfs.}"
einfo "Checking filesystem on $TARGET using $FSCKTOOL"