Author: bdubbs Date: 2012-03-28 12:47:03 -0600 (Wed, 28 Mar 2012) New Revision: 9792
Removed: trunk/bootscripts/blfs/init.d/lisa Modified: trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml trunk/bootscripts/Makefile trunk/bootscripts/blfs/init.d/nfs-server Log: Clean up Makefile for bootscripts. Add other minor bootscrpt cleanups. Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2012-03-28 00:04:48 UTC (rev 9791) +++ trunk/BOOK/general.ent 2012-03-28 18:47:03 UTC (rev 9792) @@ -3,13 +3,13 @@ $Date$ --> -<!ENTITY day "27"> <!-- Always 2 digits --> +<!ENTITY day "28"> <!-- Always 2 digits --> <!ENTITY month "03"> <!-- Always 2 digits --> <!ENTITY year "2012"> <!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyholder "The BLFS Development Team"> <!ENTITY version "&year;-&month;-&day;"> -<!ENTITY releasedate "March 27th, &year;"> +<!ENTITY releasedate "March 28th, &year;"> <!-- <!ENTITY releasedate "November &day;st, &year;"> --> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] --> @@ -59,7 +59,7 @@ <!ENTITY lfs-vim-version "7.3"> <!-- End LFS versions --> -<!ENTITY blfs-bootscripts-version "20120326"> +<!ENTITY blfs-bootscripts-version "20120328"> <!ENTITY blfs-bootscripts-download "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2"> <!ENTITY blfs-wiki "http://wiki.&lfs-domainname;/blfs/wiki";> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2012-03-28 00:04:48 UTC (rev 9791) +++ trunk/BOOK/introduction/welcome/changelog.xml 2012-03-28 18:47:03 UTC (rev 9792) @@ -43,9 +43,19 @@ --> <listitem> + <para>March 28th, 2012</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Clean up Makefile for bootscripts. + Add other minor bootscrpt cleanups.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>March 27th, 2012</para> <itemizedlist> - <listitem> + <listitem> <para>[rthomsen] - Added OpenJPEG 1.5.0. Fixes <ulink url="&blfs-ticket-root;3126">#3126</ulink>.</para> </listitem> Modified: trunk/bootscripts/Makefile =================================================================== --- trunk/bootscripts/Makefile 2012-03-28 00:04:48 UTC (rev 9791) +++ trunk/bootscripts/Makefile 2012-03-28 18:47:03 UTC (rev 9792) @@ -190,16 +190,6 @@ ln -sf ../init.d/kerberos ${EXTDIR}/rc.d/rc5.d/S28kerberos ln -sf ../init.d/kerberos ${EXTDIR}/rc.d/rc6.d/K42kerberos -install-lisa: create-dirs - install -m ${MODE} blfs/init.d/lisa ${EXTDIR}/rc.d/init.d/ - ln -sf ../init.d/lisa ${EXTDIR}/rc.d/rc0.d/K35lisa - ln -sf ../init.d/lisa ${EXTDIR}/rc.d/rc1.d/K35lisa - ln -sf ../init.d/lisa ${EXTDIR}/rc.d/rc2.d/K35lisa - ln -sf ../init.d/lisa ${EXTDIR}/rc.d/rc3.d/S30lisa - ln -sf ../init.d/lisa ${EXTDIR}/rc.d/rc4.d/S30lisa - ln -sf ../init.d/lisa ${EXTDIR}/rc.d/rc5.d/S30lisa - ln -sf ../init.d/lisa ${EXTDIR}/rc.d/rc6.d/K35lisa - install-lprng: create-dirs install -m ${MODE} blfs/init.d/lprng ${EXTDIR}/rc.d/init.d/ ln -sf ../init.d/lprng ${EXTDIR}/rc.d/rc0.d/K00lprng @@ -270,16 +260,6 @@ ln -sf ../init.d/openldap ${EXTDIR}/rc.d/rc5.d/S25openldap ln -sf ../init.d/openldap ${EXTDIR}/rc.d/rc6.d/K46openldap -install-portmap: create-dirs - install -m ${MODE} blfs/init.d/portmap ${EXTDIR}/rc.d/init.d/ - ln -sf ../init.d/portmap ${EXTDIR}/rc.d/rc0.d/K49portmap - ln -sf ../init.d/portmap ${EXTDIR}/rc.d/rc1.d/K49portmap - ln -sf ../init.d/portmap ${EXTDIR}/rc.d/rc2.d/K49portmap - ln -sf ../init.d/portmap ${EXTDIR}/rc.d/rc3.d/S22portmap - ln -sf ../init.d/portmap ${EXTDIR}/rc.d/rc4.d/S22portmap - ln -sf ../init.d/portmap ${EXTDIR}/rc.d/rc5.d/S22portmap - ln -sf ../init.d/portmap ${EXTDIR}/rc.d/rc6.d/K49portmap - install-postfix: create-dirs install -m ${MODE} blfs/init.d/postfix ${EXTDIR}/rc.d/init.d/ ln -sf ../init.d/postfix ${EXTDIR}/rc.d/rc0.d/K25postfix @@ -444,16 +424,6 @@ ln -sf ../init.d/vsftpd ${EXTDIR}/rc.d/rc5.d/S32vsftpd ln -sf ../init.d/vsftpd ${EXTDIR}/rc.d/rc6.d/K28vsftpd -install-winbind: create-dirs - install -m ${MODE} blfs/init.d/winbind ${EXTDIR}/rc.d/init.d/ - ln -sf ../init.d/winbind ${EXTDIR}/rc.d/rc0.d/K49winbind - ln -sf ../init.d/winbind ${EXTDIR}/rc.d/rc1.d/K49winbind - ln -sf ../init.d/winbind ${EXTDIR}/rc.d/rc2.d/K49winbind - ln -sf ../init.d/winbind ${EXTDIR}/rc.d/rc3.d/S50winbind - ln -sf ../init.d/winbind ${EXTDIR}/rc.d/rc4.d/S50winbind - ln -sf ../init.d/winbind ${EXTDIR}/rc.d/rc5.d/S50winbind - ln -sf ../init.d/winbind ${EXTDIR}/rc.d/rc6.d/K49winbind - uninstall-alsa: rm -f ${EXTDIR}/rc.d/init.d/alsa rm -f ${EXTDIR}/rc.d/rc0.d/K35alsa @@ -590,16 +560,6 @@ rm -f ${EXTDIR}/rc.d/rc5.d/S28kerberos rm -f ${EXTDIR}/rc.d/rc6.d/K42kerberos -uninstall-lisa: - rm -f ${EXTDIR}/rc.d/init.d/lisa - rm -f ${EXTDIR}/rc.d/rc0.d/K35lisa - rm -f ${EXTDIR}/rc.d/rc1.d/K35lisa - rm -f ${EXTDIR}/rc.d/rc2.d/K35lisa - rm -f ${EXTDIR}/rc.d/rc3.d/S30lisa - rm -f ${EXTDIR}/rc.d/rc4.d/S30lisa - rm -f ${EXTDIR}/rc.d/rc5.d/S30lisa - rm -f ${EXTDIR}/rc.d/rc6.d/K35lisa - uninstall-lprng: rm -f ${EXTDIR}/rc.d/init.d/lprng rm -f ${EXTDIR}/rc.d/rc0.d/K00lprng @@ -670,16 +630,6 @@ rm -f ${EXTDIR}/rc.d/rc5.d/S25openldap rm -f ${EXTDIR}/rc.d/rc6.d/K46openldap -uninstall-portmap: - rm -f ${EXTDIR}/rc.d/init.d/portmap - rm -f ${EXTDIR}/rc.d/rc0.d/K49portmap - rm -f ${EXTDIR}/rc.d/rc1.d/K49portmap - rm -f ${EXTDIR}/rc.d/rc2.d/K49portmap - rm -f ${EXTDIR}/rc.d/rc3.d/S22portmap - rm -f ${EXTDIR}/rc.d/rc4.d/S22portmap - rm -f ${EXTDIR}/rc.d/rc5.d/S22portmap - rm -f ${EXTDIR}/rc.d/rc6.d/K49portmap - uninstall-postfix: rm -f ${EXTDIR}/rc.d/init.d/postfix rm -f ${EXTDIR}/rc.d/rc0.d/K25postfix @@ -804,16 +754,6 @@ rm -f ${EXTDIR}/rc.d/rc5.d/S32vsftpd rm -f ${EXTDIR}/rc.d/rc6.d/K28vsftpd -uninstall-winbind: - rm -f ${EXTDIR}/rc.d/init.d/winbind - rm -f ${EXTDIR}/rc.d/rc0.d/K49winbind - rm -f ${EXTDIR}/rc.d/rc1.d/K49winbind - rm -f ${EXTDIR}/rc.d/rc2.d/K49winbind - rm -f ${EXTDIR}/rc.d/rc3.d/S50winbind - rm -f ${EXTDIR}/rc.d/rc4.d/S50winbind - rm -f ${EXTDIR}/rc.d/rc5.d/S50winbind - rm -f ${EXTDIR}/rc.d/rc6.d/K49winbind - .PHONY: all create-dirs create-service-dir \ install-service-dhclient \ install-service-dhcpcd \ @@ -833,7 +773,6 @@ install-heimdal \ install-iptables \ install-kerberos \ - install-lisa \ install-lprng \ install-mysql \ install-netfs \ @@ -841,7 +780,6 @@ install-nfs-server \ install-ntp \ install-openldap1 \ - install-portmap \ install-postfix \ install-postgresql \ install-proftpd \ @@ -856,7 +794,6 @@ install-sysstat \ install-vsftpd \ install-virtuoso \ - install-winbind \ uninstall-alsa \ uninstall-avahi \ uninstall-httpd \ @@ -871,7 +808,6 @@ uninstall-heimdal \ uninstall-iptables \ uninstall-kerberos \ - uninstall-lisa \ uninstall-lprng \ uninstall-mysql \ uninstall-netfs \ @@ -879,7 +815,6 @@ uninstall-nfs-server \ uninstall-ntp \ uninstall-openldap1 \ - uninstall-portmap \ uninstall-postfix \ uninstall-postgresql \ uninstall-proftpd \ @@ -894,4 +829,3 @@ uninstall-sysstat \ uninstall-virtuoso \ uninstall-vsftpd \ - uninstall-winbind \ Deleted: trunk/bootscripts/blfs/init.d/lisa =================================================================== --- trunk/bootscripts/blfs/init.d/lisa 2012-03-28 00:04:48 UTC (rev 9791) +++ trunk/bootscripts/blfs/init.d/lisa 2012-03-28 18:47:03 UTC (rev 9792) @@ -1,63 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin lisa -# -# Description : -# -# Author : Bruce Dubbs - [email protected] -# -# Version : LFS 7.0 -# -######################################################################## - -### BEGIN INIT INFO -# Provides: lisa -# Required-Start: network -# Should-Start: -# Required-Stop: sendsignals -# Should-Stop: -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Starts lisa daemon. -# Description: Starts Trinity lisa daemon. -# X-LFS-Provided-By: LFS -### END INIT INFO - -TRINITY_PREFIX=/opt/trinity -. /lib/lsb/init-functions - -#$LastChangedBy$ -#$Date$ - -export PATH=$PATH:$TRINITY_PREFIX/bin - -case "$1" in - start) - log_info_msg "Starting LISA Daemon..." - start_daemon $TRINITY_PREFIX/bin/lisa - evaluate_retval - ;; - - stop) - log_info_msg "Stopping LISA Daemon..." - killproc $TRINITY_PREFIX/bin/lisa - evaluate_retval - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc $TRINITY_PREFIX/bin/lisa - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac - -# End /etc/init.d/lisa Modified: trunk/bootscripts/blfs/init.d/nfs-server =================================================================== --- trunk/bootscripts/blfs/init.d/nfs-server 2012-03-28 00:04:48 UTC (rev 9791) +++ trunk/bootscripts/blfs/init.d/nfs-server 2012-03-28 18:47:03 UTC (rev 9792) @@ -52,7 +52,7 @@ fi # NFSD support only in 2.6 kernel - /bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null + /bin/uname -r | /bin/grep "^2.6" 2>&1 > /dev/null if [ $? = 0 ]; then log_info_msg "Mounting nfsd virtual filesystem..." /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
