r1737 - in profiles/LFS/trunk: chapter06 skeleton/etc

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Wed Feb 9 08:08:01 PST 2005


Author: kpfleming
Date: 2005-02-09 09:08:00 -0700 (Wed, 09 Feb 2005)
New Revision: 1737

Added:
   profiles/LFS/trunk/skeleton/etc/ld.so.conf
   profiles/LFS/trunk/skeleton/etc/nsswitch.conf
Modified:
   profiles/LFS/trunk/chapter06/glibc.xml
Log:
move nsswitch.conf and ld.so.conf to skeleton



Modified: profiles/LFS/trunk/chapter06/glibc.xml
===================================================================
--- profiles/LFS/trunk/chapter06/glibc.xml	2005-02-09 16:04:57 UTC (rev 1736)
+++ profiles/LFS/trunk/chapter06/glibc.xml	2005-02-09 16:08:00 UTC (rev 1737)
@@ -72,43 +72,11 @@
       </make>
     </stage>
     <stage name="Configuring">
-      <textdump>
-        <file>/etc/nsswitch.conf</file>
-        <content>
-	=# Begin /etc/nsswitch.conf
-	=
-	=passwd: files
-	=group: files
-	=shadow: files
-	=
-	=hosts: files dns
-	=networks: files
-	=
-	=protocols: files
-	=services: files
-	=ethers: files
-	=rpc: files
-	=
-	=# End /etc/nsswitch.conf
-	</content>
-      </textdump>
-      <remove>/etc/localtime</remove>
       <copy>
-        <option>force</option>
-        <source>&localtime;</source>
-        <destination>/etc/localtime</destination>
+        <source>&skeleton_dir;/etc/nsswitch.conf</source>
+        <source>&skeleton_dir;/etc/ld.so.conf</source>
+        <destination>/etc</destination>
       </copy>
-      <textdump>
-        <file>/etc/ld.so.conf</file>
-        <content>
-	=# Begin /etc/ld.so.conf 
-	=
-	=/usr/local/lib
-	=/opt/lib
-	=
-	=# End /etc/ld.so.conf
-	</content>
-      </textdump>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&glibc-directory;</remove>

Added: profiles/LFS/trunk/skeleton/etc/ld.so.conf
===================================================================
--- profiles/LFS/trunk/skeleton/etc/ld.so.conf	2005-02-09 16:04:57 UTC (rev 1736)
+++ profiles/LFS/trunk/skeleton/etc/ld.so.conf	2005-02-09 16:08:00 UTC (rev 1737)
@@ -0,0 +1,6 @@
+# Begin /etc/ld.so.conf 
+
+/usr/local/lib
+/opt/lib
+
+# End /etc/ld.so.conf

Added: profiles/LFS/trunk/skeleton/etc/nsswitch.conf
===================================================================
--- profiles/LFS/trunk/skeleton/etc/nsswitch.conf	2005-02-09 16:04:57 UTC (rev 1736)
+++ profiles/LFS/trunk/skeleton/etc/nsswitch.conf	2005-02-09 16:08:00 UTC (rev 1737)
@@ -0,0 +1,15 @@
+# Begin /etc/nsswitch.conf
+
+passwd: files
+group: files
+shadow: files
+
+hosts: files dns
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+# End /etc/nsswitch.conf




More information about the alfs-log mailing list