diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2010-03-06 11:13:03 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2010-03-06 11:13:03 +0100 |
| commit | 0c50ce59776db74a792ebc6ee04cef1119b55f54 (patch) | |
| tree | 443eeff4cfb31049723f1e81ca096583f7d08634 | |
| parent | a3d214f7bd2f00d588209febfcbbcf3572119be9 (diff) | |
put /etc/crypttab in list of to-edit config files. fixes FS#17973 - /etc/crypttab should be included into section "6 Configure System"
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index dcb6046..8ccb481 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -53,6 +53,7 @@ prefill_configs () { sed -i '/^HOOKS/ s/keymap/usbinput keymap/' ${var_TARGET_DIR}/etc/mkinitcpio.conf fi fi + # TODO: we should probably update /etc/crypttab if the user has non-/ encrypted disks. } interactive_configure_system() @@ -71,7 +72,8 @@ interactive_configure_system() [ -n "$FILE" ] && DEFAULT="$FILE" helptext="\nNote that if you want to change any file not listed here (unlikely) you can go to another tty and update ${var_TARGET_DIR}/etc/<filename> yourself" grep -q '^/dev/mapper' $TMP_FSTAB && helptext="$helptext\n/dev/mapper/ users: Pay attention to HOOKS in mkinitcpio.conf" - ask_option $DEFAULT "Configuration" "$helptext" required \ + grep -q dm_crypt $TMP_BLOCKDEVICES && crypt="/etc/crypttab Encryption_settings_for_non-root_encrypted_disks" # this simple grep will give some false positives. but oh well. + ask_option $DEFAULT "Configuration" "$helptext" required $crypt \ "/etc/rc.conf" "System Config" \ "/etc/fstab" "Filesystem Mountpoints" \ "/etc/mkinitcpio.conf" "Initramfs Config" \ |