diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-07-28 20:37:12 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-07-28 20:37:12 +0200 |
| commit | 3ce20c3a7a2e372d155493ff60670c0998c799b4 (patch) | |
| tree | 0967db4623fe0e71c754f0d6da96a2e7489d1d60 | |
| parent | 73bfbac0ebe472378cf03cdd4012ec2a6a21fedd (diff) | |
fix variable name typos in grub menu.lst generation. this will hopefully fix kernel lines
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 125fce3..0f85f96 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -1068,23 +1068,23 @@ generate_grub_menulst() { kernel="kernel $subdir/vmlinuz26 root=${_rootpart} ro" if get_anchestors_mount ';/;' then - if echo "$ANSWERS_DEVICES" | sed -n '1p' | grep -q 'dm_crypt$' && echo "$ANSWERS_DEVICES" | sed -n '2p' | grep -q 'raw$' + if echo "$ANSWER_DEVICES" | sed -n '1p' | grep -q 'dm_crypt$' && echo "$ANSWER_DEVICES" | sed -n '2p' | grep -q 'raw$' then debug 'FS' 'Grub kernel line? Found / on dm_crypt on raw' - raw_device=`echo "$ANSWERS_DEVICES" | sed -n '2p' | cut -d ' ' -f1` + raw_device=`echo "$ANSWER_DEVICES" | sed -n '2p' | cut -d ' ' -f1` kernel="kernel $subdir/vmlinuz26 root=$raw_device ro" - elif echo "$ANSWERS_DEVICES" | sed -n '1p' | grep -q 'lvm-lv$' && echo "$ANSWERS_DEVICES" | sed -n '4p' | grep -q 'dm_crypt$' && echo "$ANSWERS_DEVICES" | sed -n '5p' | grep -q 'raw$' + elif echo "$ANSWER_DEVICES" | sed -n '1p' | grep -q 'lvm-lv$' && echo "$ANSWER_DEVICES" | sed -n '4p' | grep -q 'dm_crypt$' && echo "$ANSWER_DEVICES" | sed -n '5p' | grep -q 'raw$' then debug 'FS' 'Grub kernel line? Found / on lvm on dm_crypt on raw' - lv_device=`echo "$ANSWERS_DEVICES" | sed -n '1p' | cut -d ' ' -f1` - vg_device=`echo "$ANSWERS_DEVICES" | sed -n '2p' | cut -d ' ' -f1` - crypt_device=`echo "$ANSWERS_DEVICES" | sed -n '4p' | cut -d ' ' -f1` + lv_device=`echo "$ANSWER_DEVICES" | sed -n '1p' | cut -d ' ' -f1` + vg_device=`echo "$ANSWER_DEVICES" | sed -n '2p' | cut -d ' ' -f1` + crypt_device=`echo "$ANSWER_DEVICES" | sed -n '4p' | cut -d ' ' -f1` kernel="kernel $subdir/vmlinuz26 root=$lv_device cryptdevice=$crypt_device:`basename $vgdevice` ro" - elif echo "$ANSWERS_DEVICES" | sed -n '1p' | grep -q 'dm_crypt$' && echo "$ANSWERS_DEVICES" | sed -n '2p' | grep -q 'lvm-lv$' && echo "$ANSWERS_DEVICES" | sed -n '5p' | grep -q 'raw$' + elif echo "$ANSWER_DEVICES" | sed -n '1p' | grep -q 'dm_crypt$' && echo "$ANSWER_DEVICES" | sed -n '2p' | grep -q 'lvm-lv$' && echo "$ANSWER_DEVICES" | sed -n '5p' | grep -q 'raw$' then debug 'FS' 'Grub kernel line? Found / on dm_crypt on lvm on raw' - crypt_device=`echo "$ANSWERS_DEVICES" | sed -n '1p' | cut -d ' ' -f1` - lv_device=`echo "$ANSWERS_DEVICES" | sed -n '2p' | cut -d ' ' -f1` + 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" else debug 'FS' 'Grub kernel line? Could not figure this one out' |