[lfs-fr] [BLFS-EN] r10146

Robot myou72 at orange.fr
Mer 9 Mai 09:30:46 PDT 2012


Révision 10146

fichiers modifiés :
   general.ent

Log :
Delete obsolete fam and heimdal bootscripts. Make service scripts compatible with older versions of init-functions.

Le robot a traité 0 % du commit anglais.

Index: bootscripts/ChangeLog
===================================================================
--- bootscripts/ChangeLog	(revision 10145)
+++ bootscripts/ChangeLog	(revision 10146)
@@ -1,3 +1,7 @@
+2012-05-09 Bruce Dubbs {ken at linuxfromscratch.org}
+   * Make service scripts compatible with older versions of 
+     init-functions.
+
 2012-05-06 Bruce Dubbs {ken at linuxfromscratch.org}
    * Update exim script to be compatible with LFS 7.0+.
 

Index: bootscripts/blfs/init.d/fam
===================================================================
--- bootscripts/blfs/init.d/fam	(revision 10145)
+++ bootscripts/blfs/init.d/fam	(revision 10146)
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/fam
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard at linuxfromscratch.org
-
-#$LastChangedBy$
-#$Date$
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-case "$1" in
-	start)
-		boot_mesg "Starting File Alteration Monitor..."
-		loadproc /usr/sbin/famd -T 0
-		;;
-
-	stop)
-		boot_mesg "Stopping File Alteration Monitor..."
-		killproc /usr/sbin/famd
-		;;
-
-	reload)
-		boot_mesg "Reloading File Alteration Monitor..."
-		reloadproc /usr/sbin/famd
-		;;
-
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-
-	status)
-		statusproc /usr/sbin/famd
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|reload|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/fam

Index: bootscripts/blfs/init.d/heimdal
===================================================================
--- bootscripts/blfs/init.d/heimdal	(revision 10145)
+++ bootscripts/blfs/init.d/heimdal	(revision 10146)
@@ -1,95 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/heimdal
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard at linuxfromscratch.org
-
-#$LastChangedBy$
-#$Date$
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-case "$1" in
-	start)  
-		boot_mesg -n "Starting KDC Server Daemon..."
-		if test -f "/var/run/kdc.pid"
-		then
-			boot_mesg "kdc already running!" ${WARNING}
-			echo_warning
-		else
-			/usr/sbin/kdc &
-			sleep 1
-			if test -f "/var/run/kdc.pid"
-			then
-				echo ""
-				echo_ok
-			else
-				echo ""
-				echo_failure
-			fi
-		fi
-		boot_mesg -n "Starting KDC kpasswdd Daemon..."
-		if test -f "/var/run/kpasswdd.pid"
-		then
-			boot_mesg "kpasswdd already running!" ${WARNING}
-			echo_warning
-		else
-			/usr/sbin/kpasswdd &
-			sleep 1
-			if test -f "/var/run/kpasswdd.pid"
-			then
-				echo ""
-				echo_ok
-			else
-				echo ""
-				echo_failure
-			fi
-		fi
-		boot_mesg -n "Starting KDC kadmind Daemon..."
-		if test -f "/var/run/kadmind.pid"
-		then
-			boot_mesg "kadmind already running!" ${WARNING}
-			echo_warning
-		else
-			/usr/sbin/kadmind &
-			sleep 1
-			if test -f "/var/run/kadmind.pid"
-			then
-				echo ""
-				echo_ok
-			else
-				echo ""
-				echo_failure
-			fi
-		fi
-		;;
-
-	stop)   
-		boot_mesg "Stopping KDC kadmind Daemon..."
-		killproc /usr/sbin/kadmind
-		boot_mesg "Stopping KDC kpasswdd Daemon..."
-		killproc /usr/sbin/kpasswdd
-		boot_mesg "Stopping KDC Server Daemon..."
-		killproc /usr/sbin/kdc
-		;;
-
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-
-	status)
-		statusproc /usr/sbin/kdc
-		statusproc /usr/sbin/kpasswdd
-		statusproc /usr/sbin/kadmind
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/heimdal

Index: bootscripts/blfs/services/bridge
===================================================================
--- bootscripts/blfs/services/bridge	(revision 10145)
+++ bootscripts/blfs/services/bridge	(revision 10146)
@@ -14,6 +14,15 @@
 . /lib/lsb/init-functions
 . ${IFCONFIG}
 
+# Make compatible with older versions of init-functions
+unset is_true
+
+is_true()
+{
+   [ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ] ||  
+   [ "$1" = "y" ] || [ "$1" = "t"   ]
+}
+
 if [ -z "${INTERFACE_COMPONENTS}" ]; then
    log_failure_msg "INTERFACE_COMPONENTS variable missing from ${IFCONFIG}"
    exit 1

Index: bootscripts/blfs/services/dhclient
===================================================================
--- bootscripts/blfs/services/dhclient	(revision 10145)
+++ bootscripts/blfs/services/dhclient	(revision 10146)
@@ -20,6 +20,15 @@
    sed -e :a -e '$q;N;17,$D;ba' /var/state/dhclient.leases
 }
 
+# Make compatible with older versions of init-functions
+unset is_true
+
+is_true()
+{
+   [ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ] ||  
+   [ "$1" = "y" ] || [ "$1" = "t" ]
+}
+
 case "$2" in
    up)
       log_info_msg "\nStarting dhclient on the $1 interface..."
@@ -32,7 +41,7 @@
       fi
 
       # Print the assigned settings if requested
-      if [ is_true "$PRINTIP"  -o is_true "$PRINTALL" ]; then
+      if  is_true "$PRINTIP"  -o  is_true "$PRINTALL"; then
         # Get info from dhclient.leases file
         
         IPADDR=`getipstats | grep "fixed-address" | \

Index: general.ent
===================================================================
--- general.ent	(revision 10145)
+++ general.ent	(revision 10146)
@@ -59,7 +59,7 @@
 {!ENTITY lfs-vim-version              "7.3"}
 {!-- End LFS versions --}
 
-{!ENTITY blfs-bootscripts-version     "20120506"}
+{!ENTITY blfs-bootscripts-version     "20120509"}
 {!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2"}
 
 {!ENTITY blfs-wiki                    "http://wiki.&lfs-domainname;/blfs/wiki"}




More information about the lfs-traducfr mailing list