summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2009-03-08 17:09:15 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2009-03-08 17:09:15 +0100
commitc8d426c97e9183425b9553340226da8133c9ede5 (patch)
tree9315d5d9ff19bc69d925fc51e0a8a2df0c330a7e
parent383a16d3358ab0b06a63960bf49bad22c558b128 (diff)
added notice and pacman.confto interactive_configure_system. See FS#11416
-rw-r--r--src/core/libs/lib-ui-interactive.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 5442e1b..42a2fd5 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -26,8 +26,8 @@ interactive_configure_system()
while true; do
DEFAULT=no
[ -n "$FILE" ] && DEFAULT="$FILE"
- helptext=
- grep -q '^/dev/mapper' $TMP_FSTAB && helptext="Don't forget to add the appropriate modules for your /dev/mapper devices to mkinitcpio.conf" #TODO: we can improve this a bit
+ helptext="Note 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\nDon't forget to add the appropriate modules for your /dev/mapper devices to mkinitcpio.conf" #TODO: we can improve this a bit
ask_option $DEFAULT "Configuration" "$helptext" required \
"/etc/rc.conf" "System Config" \
"/etc/fstab" "Filesystem Mountpoints" \
@@ -38,6 +38,7 @@ interactive_configure_system()
"/etc/hosts.deny" "Denied Network Services" \
"/etc/hosts.allow" "Allowed Network Services" \
"/etc/locale.gen" "Glibc Locales" \
+ "/etc/pacman.conf" "Pacman.conf" \
"$var_MIRRORLIST" "Pacman Mirror List" \
"Root-Password" "Set the root password" \
"Done" "Return to Main Menu" || return 1