diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-08-01 19:27:46 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-08-01 19:27:46 +0200 |
| commit | ff9a3ed1b996b4315ce97cc4e49db831d860dfc0 (patch) | |
| tree | 6e8814d136d908ac468ab65fee2ce9ad773c156e /src/core/libs/lib-ui-interactive.sh | |
| parent | d9ac3df69b746cfa99aea8b450c8bbaa203e700b (diff) | |
dont give bogus warnings on normal setups + cleanup debugging and warnings
Diffstat (limited to 'src/core/libs/lib-ui-interactive.sh')
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index a9ac092..b8cad71 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -1076,7 +1076,6 @@ generate_grub_menulst() { fi # handle dmraid/mdadm,lvm,dm_crypt etc. replace entries where needed automatically - debug 'FS' 'Grub kernel line? Assuming "/ on raw" or "/ on lvm on raw" as default' kernel="kernel $subdir/vmlinuz26 root=${_rootpart} ro" if get_anchestors_mount ';/;' then @@ -1098,10 +1097,18 @@ generate_grub_menulst() { crypt_device=`echo "$ANSWER_DEVICES" | sed -n '1p' | cut -d ' ' -f1` lv_device=`echo "$ANSWER_DEVICES" | sed -n '2p' | cut -d ' ' -f1` kernel=" kernel $subdir/vmlinuz26 root=$crypt_device cryptdevice=$lv_device:root ro" + elif echo "$ANSWER_DEVICES" | sed -n '1p' | grep -q 'raw$' + then + debug 'FS' 'Grub kernel line? Found / on raw' + elif echo "$ANSWER_DEVICES" | sed -n '1p' | grep -q 'lvm-lv$' && echo "$ANSWER_DEVICES" | sed -n '4p' | grep -q 'raw$' + then + debug 'FS' 'Grub kernel line? Found / on lvm on raw' else debug 'FS' 'Grub kernel line? Could not figure this one out' show_warning "Disk setup detection" "Are you using some really fancy dm_crypt/lvm/softraid setup?\nI could not figure it out, so the kernel line will be the default: you'll probably need to edit it.\nPlease file a bug for this and supply all files from /tmp/aif/" fi + else + show_warning "Disk setup detection" "Could not find out where your / is. Did you setup filesystems/blockdevices? manual/autoprepare? If yes, please file a bug and tell us about this" fi cat >>$grubmenu <<EOF |