summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2008-11-12 13:58:17 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2008-11-12 13:58:17 +0100
commitd054647345bb2a3b460456e5a7821d4b9f89a5e7 (patch)
treede86b73c565b776c2d797b9d6ff3cb0364534f4b
parentbd5697d003d03e6a9149bd1ac81fc21ba1328052 (diff)
probably fix for bogus grub entries + more clarity for get_grub_map
-rw-r--r--TODO1
-rw-r--r--src/core/libs/lib-blockdevices-filesystems.sh2
-rw-r--r--src/core/libs/lib-ui-interactive.sh2
3 files changed, 3 insertions, 2 deletions
diff --git a/TODO b/TODO
index 7d18d3f..3717801 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,7 @@ See also the FIXME's and TODO's in the code.
PRE-ALPHA PHASE: get the framework reasonably working + interactive procedure ftp/cdrom working.
* core/interactive bug: grub menu.lst bad entries not cleaned ( after '#-*' tag). check if get_grub_map is the key..
+-> fixed i think
ALPHA PHASE: get some people to test and suggest ideas, while fixing bugs and refactoring
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh
index 24bef6a..d17a769 100644
--- a/src/core/libs/lib-blockdevices-filesystems.sh
+++ b/src/core/libs/lib-blockdevices-filesystems.sh
@@ -155,7 +155,7 @@ findpartitions() {
# taken from setup
get_grub_map() {
rm $TMP_DEV_MAP #TODO: this doesn't exist? is this a problem? ASKDEV
- #TODO: what's the use of this? does it generate the menu.lst? man grub says it will put it in /boot/grub/menu.lst, I think our 'boot' is mounted on /mnt/boot ? check that out. is it grub who sets up the marker?
+ infofy "Generating GRUB device map...\nThis could take a while.\n\n Please be patient."
$var_TARGET_DIR/sbin/grub --no-floppy --device-map $TMP_DEV_MAP >/tmp/grub.log 2>&1 <<EOF
quit
EOF
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 9b50bd1..f7f2f18 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -548,7 +548,7 @@ interactive_install_grub() {
grubdev="(hd0,0)"
fi
# remove default entries by truncating file at our little tag (#-*)
- sed -i -e '/#-\*/q'
+ sed -i -e '/#-\*/q' $grubmenu
cat >>$grubmenu <<EOF
# (0) Arch Linux