r1710 - profiles/LFS/trunk/config

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sun Feb 6 11:09:32 PST 2005


Author: kpfleming
Date: 2005-02-06 12:09:32 -0700 (Sun, 06 Feb 2005)
New Revision: 1710

Modified:
   profiles/LFS/trunk/config/console.xml
   profiles/LFS/trunk/config/fstab.xml
   profiles/LFS/trunk/config/grub.xml
   profiles/LFS/trunk/config/kernel.xml
   profiles/LFS/trunk/config/keymap-ch6.xml
   profiles/LFS/trunk/config/keymap-ch8.xml
Log:
tidy



Modified: profiles/LFS/trunk/config/console.xml
===================================================================
--- profiles/LFS/trunk/config/console.xml	2005-02-06 19:03:11 UTC (rev 1709)
+++ profiles/LFS/trunk/config/console.xml	2005-02-06 19:09:32 UTC (rev 1710)
@@ -1,59 +1,52 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 
 %general_entities;
 ]>
-
 <alfs>
-
-<!--The console script uses the /etc/sysconfig/console as a configuration file. You need to decide which keymap
+  <!--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
+  <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>
 
-<!--	<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>
-		<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> -->
-
-</stage>
-
+        <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/fstab.xml
===================================================================
--- profiles/LFS/trunk/config/fstab.xml	2005-02-06 19:03:11 UTC (rev 1709)
+++ profiles/LFS/trunk/config/fstab.xml	2005-02-06 19:09:32 UTC (rev 1710)
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 
 %general_entities;
 ]>
-
 <alfs>
-
-<stage name="Creating the /etc/fstab File">
-	<textdump>
-		<file>/etc/fstab</file>
-		<content>
-			=# Begin /etc/fstab
-			=
-			=# filesystem     mount-point     fs-type   options        dump fsck-order
-			=&lfs_partition;  /               &fs_type; defaults       1    1
-			=&swap_partition; swap            swap      pri=1          0    0
-			=proc             /proc           proc      defaults       0    0
-			=sysfs		  /sys		  sysfs     defaults       0    0
-			=devpts           /dev/pts        devpts    gid=4,mode=620 0    0
-			=shm              /dev/shm        tmpfs     defaults       0    0
-			=# End /etc/fstab
-		</content>
-	</textdump>
-</stage>
-
+  <stage name="Creating the /etc/fstab File">
+    <textdump>
+      <file>/etc/fstab</file>
+      <content>
+      =# Begin /etc/fstab
+      =
+      =# filesystem mount-point fs-type options dump fsck-order
+      =&lfs_partition; / &fs_type; defaults 1 1
+      =&swap_partition; swap swap pri=1 0 0
+      =proc /proc proc defaults 0 0
+      =sysfs /sys sysfs defaults 0 0
+      =devpts /dev/pts devpts gid=4,mode=620 0 0
+      =shm /dev/shm tmpfs defaults 0 0
+      =# End /etc/fstab</content>
+    </textdump>
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/config/grub.xml
===================================================================
--- profiles/LFS/trunk/config/grub.xml	2005-02-06 19:03:11 UTC (rev 1709)
+++ profiles/LFS/trunk/config/grub.xml	2005-02-06 19:09:32 UTC (rev 1710)
@@ -1,56 +1,53 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
+  <stage name="Making the LFS System Bootable">
+    <!--
+        The following shell command sets up grub.  The batch param on the first line
+        has to have the space between the dashes removed for this to work.      
 
-<stage name="Making the LFS System Bootable">
-	<!--
-	The following shell command sets up grub.  The batch param on the first line
-	has to have the space between the dashes removed for this to work.	
-
-	/sbin/grub - -batch <<EOF 1>/dev/null 2>/dev/null
-	root (&grub-root;)
-	setup (&grub-install-location;)
-	quit EOF
-	-->
-
-	<!-- Sample grub configuration-->
-	<textdump>
-		<file>/boot/grub/menu.lst</file>
-		<content>
-			=# Default to first menu entry
-			=default 0
-			=
-			=# Allow 30 seconds before booting default
-			=timeout=30
-			=
-			=# Use prettier colors
-			=color green/black light-green/black
-			=
-			=# Default Entry for LFS
-			=title LFS (&LFS-version; kernel &linux-version;)
-			=root (&grub-root;)
-			=kernel /boot/lfskernel-&linux-version; root=&lfs_partition;
-			=
-			=# Redhat Linux
-			=#title Redhat
-			=#root (hd0,2)
-			=#kernel /boot/kernel-2.4.20 root=/dev/hda3
-			=#initrd /boot/initrd-2.4.20
-			=#
-			=# Windows
-			=#title Windows
-			=#rootnoverify (hd0,0)
-			=#chainloader +1
-			=#
-		</content>
-	</textdump>
-</stage>
-
+        /sbin/grub - -batch <<EOF 1>/dev/null 2>/dev/null
+        root (&grub-root;)
+        setup (&grub-install-location;)
+        quit EOF
+        -->
+    <!-- Sample grub configuration-->
+    <textdump>
+      <file>/boot/grub/menu.lst</file>
+      <content>
+	=# Default to first menu entry 
+	=default 0
+	=
+	=# Allow 30 seconds before booting default 
+	=timeout=30 
+	= 
+	=# Use prettier colors 
+	=color green/black light-green/black 
+	= 
+	=# Default Entry for LFS 
+	=title LFS (&LFS-version; kernel &linux-version;) 
+	=root (&grub-root;) 
+	=kernel /boot/lfskernel-&linux-version; root=&lfs_partition; 
+	= 
+	=# Redhat Linux 
+	=#title Redhat 
+	=#root (hd0,2) 
+	=#kernel /boot/kernel-2.4.20 root=/dev/hda3 
+	=#initrd /boot/initrd-2.4.20 
+	=# 
+	=# Windows 
+	=#title Windows 
+	=#rootnoverify (hd0,0) 
+	=#chainloader +1 
+	=#
+      </content>
+    </textdump>
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/config/kernel.xml
===================================================================
--- profiles/LFS/trunk/config/kernel.xml	2005-02-06 19:03:11 UTC (rev 1709)
+++ profiles/LFS/trunk/config/kernel.xml	2005-02-06 19:09:32 UTC (rev 1710)
@@ -1,81 +1,66 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<package name="linux" version="&linux-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&linux-md5;</digest>
-			<archive>&packages_dir;/&linux-package;</archive>
-			<destination>&linux-src-location;</destination>
-		</unpack>
-
-		<ownership user="0" group="0">
-			<option>recursive</option>
-			<name>&linux-src-location;/&linux-directory;</name>
-		</ownership>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&linux-src-location;/&linux-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&linux-security-patch;</param>
-		</patch>
-
-		<make>
-			<param>mrproper</param>
-		</make>
-
-		<copy>
-			<source>&packages_dir;/&kernel-config;</source>
-			<destination>.config</destination>
-		</copy>
-
-		<xi:include href="../config/keymap-ch8.xml" />
-
-		<make>
-			<prefix>yes "" |</prefix>
-			<param>oldconfig</param>
-		</make>
-
-		<make />
-
-		<make>
-			<param>modules_install</param>
-		</make>
-
-		<copy>
-			<source>arch/i386/boot/bzImage</source>
-			<destination>/boot/lfskernel-&linux-version;</destination>
-		</copy>
-
-		<copy>
-			<source>System.map</source>
-			<destination>/boot/System.map-&linux-version;</destination>
-		</copy>
-
-		<copy>
-			<source>.config</source>
-			<destination>/boot/config-lfskernel-&linux-version;</destination>
-		</copy>
-
-		<textdump>
-			<file>/etc/modprobe.conf</file>
-			<content>=alias &network-interface; &network-card-module;</content>
-		</textdump>
-	</stage>
-</package>
-
+  <package name="linux" version="&linux-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&linux-md5;</digest>
+        <archive>&packages_dir;/&linux-package;</archive>
+        <destination>&linux-src-location;</destination>
+      </unpack>
+      <ownership user="0" group="0">
+        <option>recursive</option>
+        <name>&linux-src-location;/&linux-directory;</name>
+      </ownership>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&linux-src-location;/&linux-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&linux-security-patch;</param>
+      </patch>
+      <make>
+        <param>mrproper</param>
+      </make>
+      <copy>
+        <source>&packages_dir;/&kernel-config;</source>
+        <destination>.config</destination>
+      </copy>
+      <xi:include href="../config/keymap-ch8.xml" />
+      <make>
+        <prefix>yes "" |</prefix>
+        <param>oldconfig</param>
+      </make>
+      <make />
+      <make>
+        <param>modules_install</param>
+      </make>
+      <copy>
+        <source>arch/i386/boot/bzImage</source>
+        <destination>/boot/lfskernel-&linux-version;</destination>
+      </copy>
+      <copy>
+        <source>System.map</source>
+        <destination>/boot/System.map-&linux-version;</destination>
+      </copy>
+      <copy>
+        <source>.config</source>
+        <destination>/boot/config-lfskernel-&linux-version;</destination>
+      </copy>
+      <textdump>
+        <file>/etc/modprobe.conf</file>
+        <content>=alias &network-interface; &network-card-module;</content>
+      </textdump>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/config/keymap-ch6.xml
===================================================================
--- profiles/LFS/trunk/config/keymap-ch6.xml	2005-02-06 19:03:11 UTC (rev 1709)
+++ profiles/LFS/trunk/config/keymap-ch6.xml	2005-02-06 19:09:32 UTC (rev 1710)
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 
 %general_entities;
 ]>
-
 <alfs>
-
-<!-- Uncomment the following section if you use a non-US keyboard
+  <!-- Uncomment the following section if you use a non-US keyboard
  and set the keymap entity in the general.ent also contained in this
  directory to the proper keymap file for your keyboard -->
-
-<!--
-	<link>
-		<option>force</option>
-		<target>&keymap;</target>
-		<name>/usr/share/kbd/keymaps/defkeymap.map.gz</name>
-	</link>
+  <!--
+        <link>
+                <option>force</option>
+                <target>&keymap;</target>
+                <name>/usr/share/kbd/keymaps/defkeymap.map.gz</name>
+        </link>
 -->
-
 </alfs>

Modified: profiles/LFS/trunk/config/keymap-ch8.xml
===================================================================
--- profiles/LFS/trunk/config/keymap-ch8.xml	2005-02-06 19:03:11 UTC (rev 1709)
+++ profiles/LFS/trunk/config/keymap-ch8.xml	2005-02-06 19:09:32 UTC (rev 1710)
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" []>
-
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[]>
 <alfs>
-
-<!-- uncomment the following section if you wish to have your default keymap
+  <!-- uncomment the following section if you wish to have your default keymap
 compiled into the kernel -->
-
-<!--
-	<execute command="loadkeys">
-		<param>-m</param>
-		<param>/usr/share/kbd/keymaps/defkeymap.map.gz</param>
-		<param> > drivers/char/defkeymap.c</param>
-	</execute>
+  <!--
+        <execute command="loadkeys">
+                <param>-m</param>
+                <param>/usr/share/kbd/keymaps/defkeymap.map.gz</param>
+                <param> > drivers/char/defkeymap.c</param>
+        </execute>
 -->
-
 </alfs>




More information about the alfs-log mailing list