[lfs-fr] r1419 - in trunk/lfs: . bootscripts bootscripts/lfs/init.d bootscripts/lfs/lib/services chapter01 prologue

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Ven 23 Sep 11:58:04 PDT 2011


Author: jmengual
Date: 2011-09-23 20:58:03 +0200 (Fri, 23 Sep 2011)
New Revision: 1419

Modified:
   trunk/lfs/bootscripts/Makefile
   trunk/lfs/bootscripts/lfs/init.d/console
   trunk/lfs/bootscripts/lfs/lib/services/init-functions
   trunk/lfs/chapter01/changelog.xml
   trunk/lfs/general.ent
   trunk/lfs/packages.ent
   trunk/lfs/prologue/why.xml
Log:
Divers ajustements.



Modified: trunk/lfs/bootscripts/Makefile
===================================================================
--- trunk/lfs/bootscripts/Makefile	2011-09-19 16:22:31 UTC (rev 1418)
+++ trunk/lfs/bootscripts/Makefile	2011-09-23 18:58:03 UTC (rev 1419)
@@ -1,7 +1,7 @@
-ETCDIR=/etc
-EXTDIR=${DESTDIR}${ETCDIR}
+EXTDIR=${DESTDIR}/etc
 LIBDIR=${DESTDIR}/lib/services
-MAN8=/usr/share/man/man8
+MAN8=${DESTDIR}/usr/share/man/man8
+SBIN=${DESTDIR}/sbin
 MODE=754
 DIRMODE=755
 CONFMODE=644
@@ -47,29 +47,29 @@
 	install -m ${MODE} lfs/init.d/template      ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/udev          ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/udev_retry    ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/sbin/ifup            /sbin
-	install -m ${MODE} lfs/sbin/ifdown          /sbin
+	install -m ${MODE} lfs/sbin/ifup            ${SBIN}
+	install -m ${MODE} lfs/sbin/ifdown          ${SBIN}
 	install -m ${MODE} lfs/sbin/ifup.8          ${MAN8}
 	ln -sf ifup.8                               ${MAN8}/ifdown.8
 	install -m ${MODE} lfs/lib/services/ipv4-static-route  ${LIBDIR}
 	install -m ${MODE} lfs/lib/services/ipv4-static        ${LIBDIR}
 	install -m ${CONFMODE} lfs/lib/services/init-functions ${LIBDIR}
 	if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then \
-     install -m ${CONFMODE} lfs/sysconfig/createfiles ${EXTDIR}/sysconfig/ ;\
-   fi
+          install -m ${CONFMODE} lfs/sysconfig/createfiles ${EXTDIR}/sysconfig/ ;\
+        fi
 	if [ ! -f ${EXTDIR}/sysconfig/modules     ]; then \
-     install -m ${CONFMODE} lfs/sysconfig/modules     ${EXTDIR}/sysconfig/ ;\
-   fi
+          install -m ${CONFMODE} lfs/sysconfig/modules     ${EXTDIR}/sysconfig/ ;\
+        fi
 	if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then \
-     install -m ${CONFMODE} lfs/sysconfig/rc          ${EXTDIR}/sysconfig/ ;\
-   fi
+          install -m ${CONFMODE} lfs/sysconfig/rc          ${EXTDIR}/sysconfig/ ;\
+        fi
 	if [ ! -f ${EXTDIR}/sysconfig/rc.site     ]; then \
-     install -m ${CONFMODE} lfs/sysconfig/rc.site     ${EXTDIR}/sysconfig/ ;\
-   fi
+          install -m ${CONFMODE} lfs/sysconfig/rc.site     ${EXTDIR}/sysconfig/ ;\
+        fi
 
-links: files rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6
+links: rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6
 
-rcS:
+rcS: files
 	ln -sf ../init.d/mountvirtfs ${EXTDIR}/rc.d/rcS.d/S00mountvirtfs
 	ln -sf ../init.d/consolelog  ${EXTDIR}/rc.d/rcS.d/S02consolelog
 	ln -sf ../init.d/modules     ${EXTDIR}/rc.d/rcS.d/S05modules
@@ -83,7 +83,7 @@
 	ln -sf ../init.d/console     ${EXTDIR}/rc.d/rcS.d/S70console
 	ln -sf ../init.d/sysctl      ${EXTDIR}/rc.d/rcS.d/S90sysctl
 
-rc0:
+rc0: files
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc0.d/K80network
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc0.d/K90sysklogd
 	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
@@ -92,27 +92,27 @@
 	ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rc0.d/S90localnet
 	ln -sf ../init.d/halt        ${EXTDIR}/rc.d/rc0.d/S99halt
 
-rc1:
+rc1: files
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc1.d/K80network
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc1.d/K90sysklogd
 
-rc2:
+rc2: files
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc2.d/K80network
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc2.d/K90sysklogd
 
-rc3:
+rc3: files
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc3.d/S10sysklogd
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc3.d/S20network
 
-rc4:
+rc4: files
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc4.d/S10sysklogd
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc4.d/S20network
 
-rc5:
+rc5: files
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc5.d/S10sysklogd
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc5.d/S20network
 
-rc6:
+rc6: files
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc6.d/K80network
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc6.d/K90sysklogd
 	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
@@ -121,5 +121,10 @@
 	ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rc6.d/S90localnet
 	ln -sf ../init.d/reboot      ${EXTDIR}/rc.d/rc6.d/S99reboot
 
-.PHONY: all create-dirs install files links rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6
+uninstall:
+	rm -rf ${DESTDIR}/lib/services ${DESTDIR}/lib/lsb ${EXTDIR}/rc.d ${EXTDIR}/init.d \
+               ${SBIN}/ifup ${SBIN}/ifdown ${MAN8}/ifup.8 ${MAN8}/ifdown.8 \
+               ${EXTDIR}/sysconfig/rc 
 
+.PHONY: all create-dirs install files links rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6 uninstall
+

Modified: trunk/lfs/bootscripts/lfs/init.d/console
===================================================================
--- trunk/lfs/bootscripts/lfs/init.d/console	2011-09-19 16:22:31 UTC (rev 1418)
+++ trunk/lfs/bootscripts/lfs/init.d/console	2011-09-23 18:58:03 UTC (rev 1419)
@@ -39,8 +39,8 @@
 
 # See if we need to do anything
 if [ -z "${KEYMAP}"         ] && [ -z "${KEYMAP_CORRECTIONS}" ] &&
-   [ -z "${FONT}"           ] && [ is_true "${UNICODE}"       ] &&
-   [ -z "${LEGACY_CHARSET}" ]; then 
+   [ -z "${FONT}"           ] && [ -z "${LEGACY_CHARSET}"     ] &&     
+    is_true "${UNICODE}"; then 
    exit 0
 fi
 
@@ -80,7 +80,7 @@
       done
 
       # Set the font (if not already set above) and the keymap
-      [ "${use_fb}" == "1" || [ -z "${FONT}" ] || setfont $FONT || failed=1
+      [ "${use_fb}" == "1" ] || [ -z "${FONT}" ] || setfont $FONT || failed=1
 
       [ -z "${KEYMAP}" ] ||
          loadkeys ${KEYMAP} >/dev/null 2>&1 ||

Modified: trunk/lfs/bootscripts/lfs/lib/services/init-functions
===================================================================
--- trunk/lfs/bootscripts/lfs/lib/services/init-functions	2011-09-19 16:22:31 UTC (rev 1418)
+++ trunk/lfs/bootscripts/lfs/lib/services/init-functions	2011-09-23 18:58:03 UTC (rev 1419)
@@ -18,9 +18,6 @@
 #
 ########################################################################
 
-# Set any needed environment variables e.g. HEADLESS
-[ -r /etc/sysconfig/rc.site ]  && . /etc/sysconfig/rc.site
-
 ## Environmental setup
 # Setup default values for environment
 umask 022
@@ -66,8 +63,9 @@
 BOOTLOG=/run/var/bootlog
 KILLDELAY=3
 
+# Set any user specified environment variables e.g. HEADLESS
+[ -r /etc/sysconfig/rc.site ]  && . /etc/sysconfig/rc.site
 
-
 ################################################################################
 # start_daemon()                                                               #
 # Usage: start_daemon [-f] [-n nicelevel] [-p pidfile] pathname [args...]      #

Modified: trunk/lfs/chapter01/changelog.xml
===================================================================
--- trunk/lfs/chapter01/changelog.xml	2011-09-19 16:22:31 UTC (rev 1418)
+++ trunk/lfs/chapter01/changelog.xml	2011-09-23 18:58:03 UTC (rev 1419)
@@ -38,6 +38,35 @@
 
 -->
     <listitem>
+      <para>23-09-2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Permission que des variables de rc.site prennent
+          le dessus sur celles par défaut.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>22-09-2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Mise à jour du script console de
+          lfs-bootscripts.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>21-09-2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Mise à jour du Makefile de lfs-bootscripts.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>18-09-2011</para>
       <itemizedlist>
         <listitem>

Modified: trunk/lfs/general.ent
===================================================================
--- trunk/lfs/general.ent	2011-09-19 16:22:31 UTC (rev 1418)
+++ trunk/lfs/general.ent	2011-09-23 18:58:03 UTC (rev 1419)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "SVN-20110918">
-<!ENTITY releasedate "18 septembre 2011">
+<!ENTITY version "SVN-20110923">
+<!ENTITY releasedate "23 septembre 2011">
 <!ENTITY copyrightdate "1999–2011">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

Modified: trunk/lfs/packages.ent
===================================================================
--- trunk/lfs/packages.ent	2011-09-19 16:22:31 UTC (rev 1418)
+++ trunk/lfs/packages.ent	2011-09-23 18:58:03 UTC (rev 1419)
@@ -297,7 +297,7 @@
 <!ENTITY less-ch6-du "3.5 Mio">
 <!ENTITY less-ch6-sbu "moins de 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20110918">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20110923">                 <!-- 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/prologue/why.xml
===================================================================
--- trunk/lfs/prologue/why.xml	2011-09-19 16:22:31 UTC (rev 1418)
+++ trunk/lfs/prologue/why.xml	2011-09-23 18:58:03 UTC (rev 1419)
@@ -480,7 +480,7 @@
 
         <para>Ce paquet contient des programmes de compression et de
         décompression de fichiers. Il offre la compression la plus haute 
-        disponible et ce qui est utile pour la décompression des paquets XZ ou
+        disponible et il est utile pour la décompression des paquets XZ ou
         du format LZMA.</para>
       </listitem>
 




More information about the lfs-traducfr mailing list