diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2010-03-24 16:25:19 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2010-03-24 16:25:19 +0100 |
| commit | 0e60088d33ae1fc2552fc904dc3ecb0072dc3c0a (patch) | |
| tree | 7c6d1c180b796d39d4d5383901aafe49a1fd0db7 /src/core/libs/lib-ui-interactive.sh | |
| parent | 9525c62d5f6fc9e23f7571b26d6b1deaec685789 (diff) | |
| parent | b2b3b8592d2cec202af80b19fa81fd948e2c191d (diff) | |
Merge remote branch 'aif-new/label'
Diffstat (limited to 'src/core/libs/lib-ui-interactive.sh')
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 23e8c4e..4be0625 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -185,6 +185,12 @@ interactive_prepare_disks () NEXTITEM= DISK_CONFIG_TYPE= [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && show_warning "Rollback may be needed" "It seems you already went here. You should probably rollback previous changes before reformatting, otherwise stuff will probably fail" + [ -z "$PART_ACCESS" ] && PART_ACCESS=dev + ask_option $PART_ACCESS 'Disk Access Method' 'How do you want your partitions to be accessed?' '' \ + "dev" "directly by /dev/sd??" \ + "label" "by Disk-Label" \ + "uuid" "by Universally Unique Identifier" || return 1 + PART_ACCESS=$ANSWER_OPTION while [ "$DONE" = "0" ] do rollbackstr=" (you don't need to do this)" @@ -1088,11 +1094,21 @@ generate_grub_menulst() { # remove default entries by truncating file at our little tag (#-*) sed -i -e '/#-\*/q' $grubmenu - # attempt to use a UUID if the root device has one - local _uuid="$(getuuid ${_rootpart})" - if [ -n "${_uuid}" ]; then - _rootpart="/dev/disk/by-uuid/${_uuid}" - fi + # find label or uuid of the root partition + case $PART_ACCESS in + label) + local _label="$(getlabel $_rootpart)" + if [ -n "${_label}" ]; then + _rootpart="/dev/disk/by-label/${_label}" + fi + ;; + uuid) + local _uuid="$(getuuid $_rootpart)" + if [ -n "${_uuid}" ]; then + _rootpart="/dev/disk/by-uuid/${_uuid}" + fi + ;; + esac # handle dmraid/mdadm,lvm,dm_crypt etc. replace entries where needed automatically kernel="kernel $subdir/vmlinuz26 root=${_rootpart} ro" |