r2034 - branches/minimal/packages/livecd-bootscripts

[jhuntwork]

Author: jhuntwork
Date: 2007-08-21 09:40:05 -0600 (Tue, 21 Aug 2007)
New Revision: 2034

Modified:
   branches/minimal/packages/livecd-bootscripts/langconf
Log:
Remove XKEYMAP from language configuration script for minimal CDs

Modified: branches/minimal/packages/livecd-bootscripts/langconf
===================================================================
--- branches/minimal/packages/livecd-bootscripts/langconf       2007-08-19 
10:43:28 UTC (rev 2033)
+++ branches/minimal/packages/livecd-bootscripts/langconf       2007-08-21 
15:40:05 UTC (rev 2034)
@@ -29,7 +29,7 @@
 }
 
 guess_selection() {
-       while read F_DESCRIPTION F_LANG F_KEYMAP F_LEGACYCHARSET F_XKEYMAP 
F_CODEPAGE
+       while read F_DESCRIPTION F_LANG F_KEYMAP F_LEGACYCHARSET F_CODEPAGE
        do
                if [ -z "$F_DESCRIPTION" ] || [ "$F_DESCRIPTION" = "#" ]
                then
@@ -38,13 +38,11 @@
                F_KEYMAP="${F_KEYMAP//\"/}"
                F_KEYMAP="${F_KEYMAP//+/ }"
                F_LEGACYCHARSET="${F_LEGACYCHARSET//\"/}"
-               F_XKEYMAP="${F_XKEYMAP//\"/}"
                same_locale "$F_LANG" "$LANG" && SELECTED="$F_DESCRIPTION" && 
return 0
        done <$DATABASE
        F_LANG="$LANG"
        F_KEYMAP=defkeymap
        F_LEGACYCHARSET=""
-       F_XKEYMAP="us"
        F_CODEPAGE="cp437"
        return 1
 }
@@ -113,8 +111,7 @@
        \"Console keymap:\" 2 1 \"$F_KEYMAP\" 2 30 40 0 \
        \"  autoconverted from charset:\" 3 1 \"$F_LEGACYCHARSET\" 3 30 40 0 \
        \"Console font:\" 4 1 \"$F_FONT\" 4 30 40 0 \
-       \"X keymap:\" 5 1 \"$F_XKEYMAP\" 5 30 40 0 \
-       \"DOS charset:\" 6 1 \"$F_CODEPAGE\" 6 30 40 0"
+       \"DOS charset:\" 5 1 \"$F_CODEPAGE\" 5 30 40 0"
        SELECTION=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
        STATUS=$?
        [ "$STATUS" != 0 ] && exit 1
@@ -123,8 +120,7 @@
                -e '2s,^,F_KEYMAP=",' \
                -e '3s,^,F_LEGACYCHARSET=",' \
                -e '4s,^,F_FONT=",' \
-               -e '5s,^,F_XKEYMAP=",' \
-               -e '6s,^,F_CODEPAGE=",' | sed -e 's,$,",'`"
+               -e '5s,^,F_CODEPAGE=",' | sed -e 's,$,",'`"
        return 0
 }
 
@@ -137,11 +133,9 @@
                -e '2s,^,F_LANG=",' \
                -e '3s,^,F_KEYMAP=",' \
                -e '4s,^,F_LEGACYCHARSET=",' \
-               -e '5s,^,F_XKEYMAP=",' \
-               -e '6s,^,F_CODEPAGE=",' | sed -e 's,$,",'`"
+               -e '5s,^,F_CODEPAGE=",' | sed -e 's,$,",'`"
        [ -z "$F_KEYMAP" ] && F_KEYMAP=defkeymap
        guess_font
-       [ -z "$F_XKEYMAP" ] && F_XKEYMAP=us
        confirm
 }
 
@@ -151,11 +145,9 @@
        guess_font
        # Accept overrides to our guesses if given on the command line
        [ -z "$F_KEYMAP" ] && F_KEYMAP=defkeymap
-       [ -z "$F_XKEYMAP" ] && F_XKEYMAP=us
        [ -n "$KEYMAP" ] && F_KEYMAP=${KEYMAP//+/ }
        [ -n "$FONT" ] && F_FONT=${FONT//+/ }
        [ -n "$LEGACY_CHARSET" ] && F_LEGACYCHARSET=$LEGACY_CHARSET
-       [ -n "$XKEYMAP" ] && F_XKEYMAP=$XKEYMAP
        [ -n "$CODEPAGE" ] && CODEPAGE=cp437
 }
 
@@ -188,7 +180,6 @@
        echo "FONT=\"$F_FONT\"" >>/etc/sysconfig/console
 fi
 
-sed -i "s/\"us\"/\"$F_XKEYMAP\"/" /etc/X11/xorg.conf
 sed -i -e "s/cp437/$F_CODEPAGE/" -e "s/ISO-8859-1/$CHARMAP/" 
/etc/samba/smb.conf
 
 if [ "$F_ERROR" = "3" ]

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page