[lfs-fr] r1551 - in trunk/lfs: . appendices bootscripts/lfs/init.d chapter01 chapter08

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Lun 16 Jan 16:35:30 PST 2012


Author: jmengual
Date: 2012-01-17 01:35:30 +0100 (Tue, 17 Jan 2012)
New Revision: 1551

Modified:
   trunk/lfs/appendices/scripts.xml
   trunk/lfs/bootscripts/lfs/init.d/mountfs
   trunk/lfs/bootscripts/lfs/init.d/mountvirtfs
   trunk/lfs/bootscripts/lfs/init.d/udev
   trunk/lfs/chapter01/changelog.xml
   trunk/lfs/chapter08/fstab.xml
   trunk/lfs/chapter08/kernel.xml
   trunk/lfs/general.ent
   trunk/lfs/packages.ent
   trunk/lfs/process-scripts.sh
Log:
Plusieurs mises a jour.


Modified: trunk/lfs/appendices/scripts.xml
===================================================================
--- trunk/lfs/appendices/scripts.xml	2012-01-16 20:00:24 UTC (rev 1550)
+++ trunk/lfs/appendices/scripts.xml	2012-01-17 00:35:30 UTC (rev 1551)
@@ -28,6 +28,7 @@
   <!ENTITY udev_retry         SYSTEM "udev_retry.script"> 
   <!ENTITY createfiles        SYSTEM "createfiles.script"> 
   <!ENTITY modules_sys        SYSTEM "modules-sysinit.script"> 
+  <!ENTITY cfg_udev_retry     SYSTEM "config-udev-retry.script"> 
   <!ENTITY rc_sys             SYSTEM "rc-sysinit.script"> 
   <!ENTITY ifup               SYSTEM "ifup.script"> 
   <!ENTITY ifdown             SYSTEM "ifdown.script"> 
@@ -180,6 +181,11 @@
     <screen>&createfiles;</screen> 
   </sect1>
 
+  <sect1 id="config-udev-retry" role="wrap">
+    <title>/etc/sysconfig/udev-retry</title>
+    <screen>&cfg_udev_retry;</screen> 
+  </sect1>
+
   <sect1 id="ifup" role="wrap">
     <title>/sbin/ifup</title>
     <screen>&ifup;</screen> 

Modified: trunk/lfs/bootscripts/lfs/init.d/mountfs
===================================================================
--- trunk/lfs/bootscripts/lfs/init.d/mountfs	2012-01-16 20:00:24 UTC (rev 1550)
+++ trunk/lfs/bootscripts/lfs/init.d/mountfs	2012-01-17 00:35:30 UTC (rev 1551)
@@ -46,6 +46,7 @@
       mount -f /proc || failed=1
       mount -f /sys  || failed=1
       mount -f /run  || failed=1
+      mount -f /dev  || failed=1
       (exit ${failed})
       evaluate_retval
 

Modified: trunk/lfs/bootscripts/lfs/init.d/mountvirtfs
===================================================================
--- trunk/lfs/bootscripts/lfs/init.d/mountvirtfs	2012-01-16 20:00:24 UTC (rev 1550)
+++ trunk/lfs/bootscripts/lfs/init.d/mountvirtfs	2012-01-17 00:35:30 UTC (rev 1551)
@@ -41,14 +41,25 @@
 
       if ! mountpoint /proc >/dev/null; then
          log_info_msg2 " ${INFO}/proc"
-         mount -n /proc || failed=1
+         mount -n -o nosuid,noexec,nodev /proc || failed=1
       fi
 
       if ! mountpoint /sys >/dev/null; then
          log_info_msg2 " ${INFO}/sys" 
-         mount -n /sys || failed=1
+         mount -n -o nosuid,noexec,nodev /sys || failed=1
       fi
 
+      if ! mountpoint /dev >/dev/null; then
+         log_info_msg2 " ${INFO}/dev" 
+         mount -n -o mode=0755,nosuid /dev  || failed=1
+      fi
+
+      ln -s /run/shm /dev/shm
+      
+      # Copy the only static device node that Udev >= 155 doesn't
+      # handle to /dev
+      cp -a /lib/udev/devices/null /dev
+
       (exit ${failed})
       evaluate_retval
       exit $failed

Modified: trunk/lfs/bootscripts/lfs/init.d/udev
===================================================================
--- trunk/lfs/bootscripts/lfs/init.d/udev	2012-01-16 20:00:24 UTC (rev 1550)
+++ trunk/lfs/bootscripts/lfs/init.d/udev	2012-01-17 00:35:30 UTC (rev 1551)
@@ -43,36 +43,10 @@
          /etc/rc.d/init.d/halt stop
       fi
 
-      # Mount a temporary file system over /dev, so that any devices
-      # made or removed during this boot don't affect the next one.
-      # The reason we don't write to mtab is because we don't ever
-      # want /dev to be unavailable (such as by `umount -a').
-      if ! mountpoint /dev > /dev/null; then
-         mount -n -t tmpfs tmpfs /dev -o mode=755
-      fi
-
-      if [ ${?} != 0 ]; then
-         log_failure_msg2
-         msg="FAILURE:\n\nCannot mount a tmpfs "
-         msg="${msg}onto /dev, this system will be halted.\n\n"
-         msg="${msg}After you press Enter, this system "
-         msg="${msg}will be halted and powered off.\n\n"
-         log_failure_msg "$msg"
-         log_info_msg "Press Enter to continue..."
-         wait_for_user
-         /etc/rc.d/init.d/halt stop
-      fi
-
-      ln -s /run/shm /dev/shm
-
       # Udev handles uevents itself, so we don't need to have
       # the kernel call out to any binary in response to them
       echo > /proc/sys/kernel/hotplug
 
-      # Copy the only static device node that Udev >= 155 doesn't
-      # handle to /dev
-      cp -a /lib/udev/devices/null /dev
-
       # Start the udev daemon to continually watch for, and act on,
       # uevents
       /sbin/udevd --daemon

Modified: trunk/lfs/chapter01/changelog.xml
===================================================================
--- trunk/lfs/chapter01/changelog.xml	2012-01-16 20:00:24 UTC (rev 1550)
+++ trunk/lfs/chapter01/changelog.xml	2012-01-17 00:35:30 UTC (rev 1551)
@@ -37,7 +37,21 @@
     </listitem>
 
 -->
+ 
     <listitem>
+      <para>16-01-2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Modification de scripts de démarrage pour utiliser 
+          devtmpfs pour /dev. Déplacement du montage de /dev vers mountvirtfs et
+          garantie que /dev aille dans /etc/mtab.  Modification de fstab et 
+          des sections de configuration du noyau pour répercuter ces
+          changements.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>11-01-2012</para>
       <itemizedlist>
         <listitem>

Modified: trunk/lfs/chapter08/fstab.xml
===================================================================
--- trunk/lfs/chapter08/fstab.xml	2012-01-16 20:00:24 UTC (rev 1550)
+++ trunk/lfs/chapter08/fstab.xml	2012-01-17 00:35:30 UTC (rev 1551)
@@ -26,13 +26,15 @@
 # file system  mount-point  type   options         dump  fsck
 #                                                        order
 
-/dev/<replaceable><xxx></replaceable>     /            <replaceable><fff></replaceable>  defaults        1     1
-/dev/<replaceable><yyy></replaceable>     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
-tmpfs          /run         tmpfs  defaults        0     0
-# End /etc/fstab</literal>
+/dev/<replaceable><xxx></replaceable>     /            <replaceable><fff></replaceable>    defaults            1     1
+/dev/<replaceable><yyy></replaceable>     swap         swap     pri=1               0     0
+proc           /proc        proc     nosuid,noexec,nodev 0     0
+sysfs          /sys         sysfs    nosuid,noexec,nodev 0     0
+devpts         /dev/pts     devpts   gid=4,mode=620      0     0
+tmpfs          /run         tmpfs    defaults            0     0
+devtmpfs       /dev         devtmpfs mode=0755,nosuid    0     0
+
+# Fin de /etc/fstab</literal>
 EOF</userinput></screen>
 
   <para>Remplacez <replaceable><xxx></replaceable>,

Modified: trunk/lfs/chapter08/kernel.xml
===================================================================
--- trunk/lfs/chapter08/kernel.xml	2012-01-16 20:00:24 UTC (rev 1550)
+++ trunk/lfs/chapter08/kernel.xml	2012-01-17 00:35:30 UTC (rev 1551)
@@ -61,6 +61,14 @@
     configuration pour les paquetages en dehors de LFS sur
     <ulink url="&blfs-root;view/svn/longindex.html#kernel-config-index"/> :</para>
 
+    <note><para>Vu les récents changements dans <application>udev</application>, 
+    assurez-vous de sélectionner :</para>
+    
+    <screen role="nodump">Device Drivers  --->
+  Generic Driver Options  --->
+     Maintain a devtmpfs filesystem to mount at /dev</screen></note>
+
+
 <screen role="nodump"><userinput>make LANG=<replaceable><valeur_LANG_du_hote></replaceable> LC_ALL= menuconfig</userinput></screen>
 
     <variablelist>

Modified: trunk/lfs/general.ent
===================================================================
--- trunk/lfs/general.ent	2012-01-16 20:00:24 UTC (rev 1550)
+++ trunk/lfs/general.ent	2012-01-17 00:35:30 UTC (rev 1551)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "SVN-20120111">
-<!ENTITY releasedate "11 janvier 2011">
+<!ENTITY version "SVN-20120116">
+<!ENTITY releasedate "16 janvier 2011">
 <!ENTITY copyrightdate "1999–2012">
 <!ENTITY milestone "7.1">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

Modified: trunk/lfs/packages.ent
===================================================================
--- trunk/lfs/packages.ent	2012-01-16 20:00:24 UTC (rev 1550)
+++ trunk/lfs/packages.ent	2012-01-17 00:35:30 UTC (rev 1551)
@@ -296,7 +296,7 @@
 <!ENTITY less-ch6-du "3.5 Mio">
 <!ENTITY less-ch6-sbu "moins de 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20111128">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20120116">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE Kio">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->

Modified: trunk/lfs/process-scripts.sh
===================================================================
--- trunk/lfs/process-scripts.sh	2012-01-16 20:00:24 UTC (rev 1550)
+++ trunk/lfs/process-scripts.sh	2012-01-17 00:35:30 UTC (rev 1551)
@@ -13,8 +13,9 @@
   #[ $script == 'services'        ] && continue
 
   # Disambiguate duplicate file names
-  [ $s == 'bootscripts/lfs/sysconfig/rc'      ] && script='rc-sysinit'; 
-  [ $s == 'bootscripts/lfs/sysconfig/modules' ] && script='modules-sysinit'; 
+  [ $s == 'bootscripts/lfs/sysconfig/rc'         ] && script='rc-sysinit'; 
+  [ $s == 'bootscripts/lfs/sysconfig/modules'    ] && script='modules-sysinit'; 
+  [ $s == 'bootscripts/lfs/sysconfig/udev_retry' ] && script='config-udev-retry'; 
   
   sed  -e 's/\&/\&amp\;/g' -e 's/</\&lt\;/g'   -e 's/>/\&gt\;/g' \
        -e "s/'/\&apos\;/g" -e 's/"/\&quot\;/g' -e 's/\t/    /g'  \




More information about the lfs-traducfr mailing list