[arch-releng] [PATCH] Change CD to DISC
Jud
jud at judfilm.net
Mon Apr 13 21:27:26 EDT 2009
---
examples/generic-install-on-sda | 4 ++--
src/core/libs/lib-ui-interactive.sh | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/examples/generic-install-on-sda b/examples/generic-install-on-sda
index 9d25776..53d1205 100644
--- a/examples/generic-install-on-sda
+++ b/examples/generic-install-on-sda
@@ -1,6 +1,6 @@
# these variables are optional, here are the defaults (feel free to omit them)
-SOURCE=cd
+SOURCE=disc
FILE_URL=file:///src/core/pkg
SYNC_URL=
@@ -25,4 +25,4 @@ GRUB_DEVICE=/dev/sda
PARTITIONS='/dev/sda 100:ext2:+ 512:swap *:ext4'
BLOCKDATA='/dev/sda1 raw no_label ext2;yes;/boot;target;no_opts;no_label;no_params
/dev/sda2 raw no_label swap;yes;no_mountpoint;target;no_opts;no_label;no_params
-/dev/sda3 raw no_label ext4;yes;/;target;no_opts;no_label;no_params'
\ No newline at end of file
+/dev/sda3 raw no_label ext4;yes;/;target;no_opts;no_label;no_params'
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 9f30aaa..ca79b1b 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -871,22 +871,22 @@ interactive_select_source()
var_SYNC_URL=
ask_option no "Source Selection" "Please select an installation source" required \
- "1" "CD-ROM or OTHER SOURCE" \
+ "1" "DISC or OTHER SOURCE" \
"2" "FTP/HTTP" || return 1
case $ANSWER_OPTION in
- "1") var_PKG_SOURCE_TYPE="cd" ;;
+ "1") var_PKG_SOURCE_TYPE="disc" ;;
"2") var_PKG_SOURCE_TYPE="ftp" ;;
esac
- if [ "$var_PKG_SOURCE_TYPE" = "cd" ]; then
- TITLE="Arch Linux CDROM or OTHER SOURCE Installation"
- notify "Packages included on this disk have been mounted to /src/core/pkg. If you wish to use your own packages from another source, manually mount them there."
+ if [ "$var_PKG_SOURCE_TYPE" = "disc" ]; then
+ TITLE="Arch Linux DISC or OTHER SOURCE Installation"
+ notify "Packages included on this disc have been mounted to /src/core/pkg. If you wish to use your own packages from another source, manually mount them there."
if [ ! -d /src/core/pkg ]; then
notify "Package directory /src/core/pkg is missing!"
return 1
fi
- echo "Using CDROM for package installation" >$LOG
+ echo "Using DISC for package installation" >$LOG
else
TITLE="Arch Linux FTP/HTTP Installation"
notify "If you wish to load your ethernet modules manually, please do so now in an another terminal."
--
1.6.2.2
More information about the arch-releng
mailing list