r1754 - in profiles/LFS/trunk: config skeleton/etc skeleton/etc/kbd skeleton/etc/sysconfig

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Feb 12 08:59:39 PST 2005


Author: kpfleming
Date: 2005-02-12 09:59:38 -0700 (Sat, 12 Feb 2005)
New Revision: 1754

Added:
   profiles/LFS/trunk/skeleton/etc/kbd/
   profiles/LFS/trunk/skeleton/etc/kbd/bs-sends-del
   profiles/LFS/trunk/skeleton/etc/sysconfig/
   profiles/LFS/trunk/skeleton/etc/sysconfig/console
Modified:
   profiles/LFS/trunk/config/console.xml
   profiles/LFS/trunk/config/general.ent
Log:
move etc/sysconfig/console and etc/kbd/bs-sends-del to skeleton



Modified: profiles/LFS/trunk/config/console.xml
===================================================================
--- profiles/LFS/trunk/config/console.xml	2005-02-12 13:45:00 UTC (rev 1753)
+++ profiles/LFS/trunk/config/console.xml	2005-02-12 16:59:38 UTC (rev 1754)
@@ -6,47 +6,46 @@
 %general_entities;
 ]>
 <alfs>
-  <!--The console script uses the /etc/sysconfig/console as a configuration file. You need to decide which keymap
-and screen font you will use. The language-specific HOWTO can help you. In the future releases of
-LFS-Bootscripts, there will be a pre-made /etc/sysconfig/console file with known good settings for several
-countries, and you will just have to uncomment the relevant section. If still in doubt, look into /usr/share/kbd
-for valid keymaps and screen fonts. Then read the loadkeys and setfont manual pages and figure out the correct
-arguments for these programs. Once you decided, create the configuration file with the following command -->
   <stage name="Configuring the Linux Console">
-    <!--    <textdump>
-                <file>/etc/sysconfig/console</file>
-                <content>
-                =KEYMAP=&keymap-args;
-                =FONT=&font-args;
-                </content>
-        </textdump>-->
-    <!-- In some keymaps, the Backspace and Delete keys send characters different form ones in the default keymap
-built into the kernel. This confuses some applications, e.g. Emacs displays its help (instead of erasing the
-character before the cursor) when you press Backspace. To check if your keymap is affected (this works only for
-i386 keymaps) -->
-    <!--    <mkdir>
-                <option>parents</option>
-                <name>/etc/kbd</name>
-        </mkdir>
-
-        <textdump>
-                <file>/etc/kbd/bs-sends-del</file>
-                <content>
-                =                keycode 14 =    Delete  Delete          Delete  Delete
-                =        alt     keycode 14 =    Meta_Delete
-                =altgr   alt     keycode 14 =    Meta_Delete
-                =                keycode 111 =   Remove
-                =altgr   control keycode 111 =   Boot
-                =control alt     keycode 111 =   Boot
-                =altgr   control alt keycode 111 = Boot
-                </content>
-        </textdump>
-
-        <textdump mode="append">
-                <file>/etc/sysconfig/console</file>
-                <content>
-                =KEYMAP_CORRECTION="/etc/kbd/bs-sends-del"
-                </content>
-        </textdump> -->
+    <!--
+      The console script uses the /etc/sysconfig/console as a configuration file. You need to decide which keymap
+      and screen font you will use. The language-specific HOWTO can help you. In the future releases of
+      LFS-Bootscripts, there will be a pre-made /etc/sysconfig/console file with known good settings for several
+      countries, and you will just have to uncomment the relevant section. If still in doubt, look into /usr/share/kbd
+      for valid keymaps and screen fonts. Then read the loadkeys and setfont manual pages and figure out the correct
+      arguments for these programs. Once you decided, create the configuration file with the following commands
+    -->
+    <!--
+    <mkdir>
+      <option>parents</option>
+      <name>/etc/sysconfig</name>
+    </mkdir>
+    <copy>
+      <source>&skeleton_dir;/etc/sysconfig/console</source>
+      <destination>/etc/sysconfig</destination>
+    </copy>
+    -->
+    <!--
+      In some keymaps, the Backspace and Delete keys send characters different from ones in the default keymap
+      built into the kernel. This confuses some applications, e.g. Emacs displays its help (instead of erasing the
+      character before the cursor) when you press Backspace. To check if your keymap is affected (this works only for
+      i386 keymaps)
+    -->
+    <!--
+    <mkdir>
+      <option>parents</option>
+      <name>/etc/kbd</name>
+    </mkdir>
+    <copy>
+      <source>&skeleton_dir;/etc/kbd/bs-sends-del</source>
+      <destination>/etc/kbd</destination>
+    </copy>
+    <textdump mode="append">
+      <file>/etc/sysconfig/console</file>
+      <content>
+      =KEYMAP_CORRECTION="/etc/kbd/bs-sends-del"
+      </content>
+    </textdump>
+    -->
   </stage>
 </alfs>

Modified: profiles/LFS/trunk/config/general.ent
===================================================================
--- profiles/LFS/trunk/config/general.ent	2005-02-12 13:45:00 UTC (rev 1753)
+++ profiles/LFS/trunk/config/general.ent	2005-02-12 16:59:38 UTC (rev 1754)
@@ -180,10 +180,6 @@
 
 <!ENTITY TERM "linux">
 
-<!-- argument entities for /etc/sysconfig/console script -->
-<!ENTITY keymap-args "">
-<!ENTITY font-args "">
-
 <!-- locale setting for /etc/profile -->
 <!ENTITY locale-language "en">
 <!ENTITY locale-country "US">

Added: profiles/LFS/trunk/skeleton/etc/kbd/bs-sends-del
===================================================================
--- profiles/LFS/trunk/skeleton/etc/kbd/bs-sends-del	2005-02-12 13:45:00 UTC (rev 1753)
+++ profiles/LFS/trunk/skeleton/etc/kbd/bs-sends-del	2005-02-12 16:59:38 UTC (rev 1754)
@@ -0,0 +1,7 @@
+                keycode 14 =    Delete  Delete          Delete  Delete
+        alt     keycode 14 =    Meta_Delete
+altgr   alt     keycode 14 =    Meta_Delete
+                keycode 111 =   Remove
+altgr   control keycode 111 =   Boot
+control alt     keycode 111 =   Boot
+altgr   control alt keycode 111 = Boot

Added: profiles/LFS/trunk/skeleton/etc/sysconfig/console
===================================================================
--- profiles/LFS/trunk/skeleton/etc/sysconfig/console	2005-02-12 13:45:00 UTC (rev 1753)
+++ profiles/LFS/trunk/skeleton/etc/sysconfig/console	2005-02-12 16:59:38 UTC (rev 1754)
@@ -0,0 +1,2 @@
+KEYMAP=""
+FONT=""




More information about the alfs-log mailing list