diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-07-27 22:03:33 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-07-27 22:03:33 +0200 |
| commit | c5d36989eea5a8ef82b1de194cb71f869555fe8b (patch) | |
| tree | 63c3fa2a5db9f13ad5b7a7a338ea0a38c271a7cd /src/core | |
| parent | 1d167075bcae974d98024e6457d3a6e881114976 (diff) | |
patches, fixes and cleanup for new grub code
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index f765d59..3743ca7 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -990,14 +990,15 @@ interactive_grub() { if [ "$GRUB_OK" == "1" ]; then notify "GRUB was successfully installed." else - notify "GRUB was NOT successfully installed." + show_warning "Grub installation failure" "GRUB was NOT successfully installed." return 1 fi return 0 fi } -interactive_grub_menulst() { +generate_grub_menulst() { + local grubmenu="$var_TARGET_DIR/boot/grub/menu.lst" get_device_with_mount '/' || return 1 local _rootpart=$ANSWER_DEVICE local _uuid="$(getuuid ${_rootpart})" @@ -1107,7 +1108,11 @@ initrd $subdir/kernel26-fallback.img #makeactive #chainloader +1 EOF +} +interactive_grub_menulst () { + local grubmenu="$var_TARGET_DIR/boot/grub/menu.lst" + generate_grub_menulst helptext= grep -q '^/dev/mapper' $TMP_FSTAB && helptext=" /dev/mapper/ users: Pay attention to the kernel line!" notify "Before installing GRUB, you must review the configuration file. You will now be put into the editor. After you save your changes and exit the editor, you can install GRUB.$helptext" |