diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2010-04-06 21:39:28 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2010-04-06 21:39:28 +0200 |
| commit | d263e3af448e948508ceafde15ac72a7f88df59a (patch) | |
| tree | bb9d49b2028404ee0a3e848953d40ec9a3e2d96a | |
| parent | cd42c091213e11d5ec480ef8c7f03c94a12d7cc9 (diff) | |
only ask label/uuid/dev when doing interactive FS setup, not needed for autoprepare. as autoprepare has uuid hardwired
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 245c651..4ad87ee 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -185,12 +185,6 @@ 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 'Partition Access Method' 'How do you want your partitions to be accessed in grubs menu.lst and /etc/fstab?' '' \ - "dev" "directly by /dev/* (most intuitive but devicefile names can change on kernel updates)" \ - "label" "by Disk-Label (Will use the filesystem labels where you give them, and fall back on 'dev' otherwise)" \ - "uuid" "by Universally Unique Identifier (You don't need to do anything, but doesn't look pretty)" || return 1 - PART_ACCESS=$ANSWER_OPTION while [ "$DONE" = "0" ] do rollbackstr=" (you don't need to do this)" @@ -607,6 +601,12 @@ interactive_filesystems() { fi [ "$renew_blockdevices" = 1 ] && findpartitions 0 'no_fs' ' raw no_label' > $TMP_BLOCKDEVICES + [ -z "$PART_ACCESS" ] && PART_ACCESS=dev + ask_option $PART_ACCESS 'Partition Access Method' 'How do you want your partitions to be accessed in grubs menu.lst and /etc/fstab?' '' \ + "dev" "directly by /dev/* (most intuitive but devicefile names can change on kernel updates)" \ + "label" "by Disk-Label (Will use the filesystem labels where you give them, and fall back on 'dev' otherwise)" \ + "uuid" "by Universally Unique Identifier (You don't need to do anything, but doesn't look pretty)" || return 1 + PART_ACCESS=$ANSWER_OPTION ALLOK=0 while [ "$ALLOK" = 0 ] do |