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:
3e5f8f2
)
run grub outside chroot as grub seems to be broken in sarge
author
Michael Prokop
<mika@grml.org>
Mon, 6 Nov 2006 11:32:06 +0000
(12:32 +0100)
committer
Michael Prokop
<mika@grml.org>
Mon, 6 Nov 2006 11:32:06 +0000
(12:32 +0100)
chroot-script
patch
|
blob
|
history
grml-debootstrap
patch
|
blob
|
history
diff --git
a/chroot-script
b/chroot-script
index
7fa771b
..
49c73b7
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: Mon Nov 06 1
1:52:24
CET 2006 [mika]
+# Latest change: Mon Nov 06 1
2:31:50
CET 2006 [mika]
################################################################################
set -e # exit on any error
################################################################################
set -e # exit on any error
@@
-160,17
+160,10
@@
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
# 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
-
- if [ -z "$MBR" ] ; then
- echo "Notice: \$MBR not set, will not install grub therefor."
- else
- cp /proc/mounts /etc/mtab
- grub-install "$MBR"
- rm /etc/mtab
- fi
fi
# make sure we don't have any running processes left
fi
# make sure we don't have any running processes left
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
cd96f1a
..
2e1a1dc
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:
Fre Nov 03 21:35:09
CET 2006 [mika]
+# Latest change:
Mon Nov 06 12:31:46
CET 2006 [mika]
################################################################################
# http://www.debian.org/releases/stable/i386/apcs04.html.en
################################################################################
# http://www.debian.org/releases/stable/i386/apcs04.html.en
@@
-128,6
+128,14
@@
einfo "Unmount $MNTPOINT"
umount $MNTPOINT
eend $?
umount $MNTPOINT
eend $?
+if [ -z "$MBR" ] ; then
+ echo "Notice: \$MBR not set, will not install grub therefor."
+else
+ einfo "Installing grub on ${MBR}:"
+ grub-install --root-directory="$MNTPOINT" "(${MBR})"
+ eend $?
+fi
+
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"