Author: alexander
Date: 2005-06-06 22:06:11 -0600 (Mon, 06 Jun 2005)
New Revision: 219
Added:
trunk/packages/lfs-bootscripts/langconf
Modified:
trunk/packages/lfs-bootscripts/Makefile
trunk/packages/lfs-bootscripts/clkconf
Log:
Fixed bashism. Allowed the user to select one-component timezones such
as "Japan". Added dialog-based console configurator.
Modified: trunk/packages/lfs-bootscripts/Makefile
===================================================================
--- trunk/packages/lfs-bootscripts/Makefile 2005-06-06 04:39:45 UTC (rev
218)
+++ trunk/packages/lfs-bootscripts/Makefile 2005-06-07 04:06:11 UTC (rev
219)
@@ -31,6 +31,8 @@
ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs && \
install -m 755 ../clkconf /etc/rc.d/init.d/ && \
ln -sf ../init.d/clkconf /etc/rc.d/rcsysinit.d/S59clkconf && \
+ install -m 755 ../langconf /etc/rc.d/init.d/ && \
+ ln -sf ../init.d/langconf /etc/rc.d/rcsysinit.d/S69langconf && \
install -m 755 ../console /etc/rc.d/init.d/ && \
rm -f /etc/rc.d/*/*mountsqfs /etc/rc.d/*/*startup ; fi
Modified: trunk/packages/lfs-bootscripts/clkconf
===================================================================
--- trunk/packages/lfs-bootscripts/clkconf 2005-06-06 04:39:45 UTC (rev
218)
+++ trunk/packages/lfs-bootscripts/clkconf 2005-06-07 04:06:11 UTC (rev
219)
@@ -1,7 +1,8 @@
#!/bin/sh
# Get a well-defined sorting order
-export LC_ALL=C
+LC_ALL=C
+export LC_ALL
if [ ! -z "$TZ" ] ; then
# Assume that the system clock is already configured,
@@ -10,9 +11,9 @@
fi
DLG_COMMAND="dialog --title \"Configure system clock\" \
- --default-item \"Etc/GMT\" --timeout 20 \
+ --default-item \"GMT\" --timeout 20 \
--menu \"Select your timezone from the list below\" 0 0 0 \
- `find /usr/share/zoneinfo/posix -type f -mindepth 2 | \
+ `find /usr/share/zoneinfo/posix -type f | \
sed -e 's,/usr/share/zoneinfo/posix/,,' -e 's,$, "",' | sort`"
TZ_SELECTED=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
@@ -21,8 +22,9 @@
exit 0
fi
+echo "TZ=$TZ_SELECTED" >>/etc/environment
echo "TZ=$TZ_SELECTED ; export TZ" >>/etc/sysconfig/rc
-echo "TZ=$TZ_SELECTED" >>/etc/environment
+echo "TZ=$TZ_SELECTED ; export TZ" >>/etc/profile
dialog --yes-label "Localtime" --no-label "GMT" \
--title 'Configure system clock' \
Added: trunk/packages/lfs-bootscripts/langconf
===================================================================
--- trunk/packages/lfs-bootscripts/langconf 2005-06-06 04:39:45 UTC (rev
218)
+++ trunk/packages/lfs-bootscripts/langconf 2005-06-07 04:06:11 UTC (rev
219)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Get a well-defined sort order
+LC_ALL=C
+export LC_ALL
+
+if [ ! -z "$LANG" ] ; then
+ # Assume that the locale is already configured, and the
+ # keymap is satisfactory
+ exit 0
+fi
+
+LOCALES=`cat /boot/isolinux/locales*.msg | grep _ | \
+ sed 's, ,\n,g' | grep -v '^$' | sort`
+
+ARGS="C Default "
+for L in $LOCALES ; do
+ ARGS="$ARGS $L \"`LC_ALL=$L locale language`\" "
+done
+
+DLG_COMMAND="dialog --title \"Locale configuration\" --default-item C \
+ --timeout 20 --menu \"Select your locale from the list below\" 0 0 0 \
+ $ARGS"
+
+LANG_SELECTED=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
+
+if [ $? -ne 0 ] ; then
+ exit 0
+fi
+
+echo "LANG=$LANG_SELECTED" >>/etc/environment
+echo "LANG=$LANG_SELECTED ; export LANG" >>/etc/sysconfig/rc
+echo "LANG=$LANG_SELECTED ; export LANG" >>/etc/profile
+
+KEYMAPS=`cat /boot/isolinux/keymaps.msg | grep -v ':' | grep -v '\[' | sort`
+ARGS="Default \"\" "
+for K in $KEYMAPS ; do
+ ARGS="$ARGS $K \"\" "
+done
+DLG_COMMAND="dialog --title \"Keyboard configuration\" --default-item Default \
+ --menu \"Select your keyboard layout from the list below\" 0 0 0 \
+ $ARGS"
+KEYMAP_SELECTED=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
+
+if [ $? -ne 0 ] ; then
+ exit 0
+fi
+
+if [ "$KEYMAP_SELECTED" = "Default" ] ; then
+ exit 0
+fi
+
+echo "KEYMAP=$KEYMAP_SELECTED" >>/etc/sysconfig/console
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
