Author: bdubbs Date: 2011-12-05 19:37:16 -0700 (Mon, 05 Dec 2011) New Revision: 9067
Removed: trunk/bootscripts/blfs/init.d/portmap trunk/bootscripts/blfs/sysconfig/network-devices/services/dhclient trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd Modified: trunk/bootscripts/ChangeLog trunk/bootscripts/LICENSE trunk/bootscripts/blfs/init.d/fcron trunk/bootscripts/blfs/init.d/lprng trunk/bootscripts/blfs/init.d/random trunk/bootscripts/blfs/init.d/svn trunk/bootscripts/blfs/init.d/vsftpd trunk/bootscripts/blfs/services/dhclient trunk/bootscripts/blfs/sysconfig/autofs.conf Log: Bootscript cleanups. No functionality changes. Modified: trunk/bootscripts/ChangeLog =================================================================== --- trunk/bootscripts/ChangeLog 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/ChangeLog 2011-12-06 02:37:16 UTC (rev 9067) @@ -1,251 +1,256 @@ +2011-12-05 Bruce Dubbs <[email protected]> + * Updated most scripts to be combatible with LFS 7.0. + See http://wiki.linuxfromscratch.org/blfs/browser/trunk/bootscripts + for specific changes. + 2010-08-25 Bruce Dubbs <[email protected]> - * Modified the ntp startup script to only run - nppd -gx + * Modified the ntp startup script to only run + nppd -gx 2009-03-02 Randy McMurchy <[email protected]> - * Modified the D-BUS boot script "stop" section so that the PID - file is removed when the daemon is stopped. + * Modified the D-BUS boot script "stop" section so that the PID + file is removed when the daemon is stopped. 2008-08-12 Thomas Trepl <[email protected]> - * Fix a mistyped variable name in Samba init script which - causes the reload action to fail. + * Fix a mistyped variable name in Samba init script which + causes the reload action to fail. 2008-03-25 Randy McMurchy <[email protected]> - * Updated the Stunnel init script to reflect that upstream has - moved the stunnel binary from /usr/sbin to /usr/bin. + * Updated the Stunnel init script to reflect that upstream has + moved the stunnel binary from /usr/sbin to /usr/bin. 2008-03-15 Alexander E. Patrakov <[email protected]> - * Imported the new pppoe service script from the LiveCD repository. + * Imported the new pppoe service script from the LiveCD repository. 2008-03-12 Dan Nicholson <[email protected]> - * Revert usage of pid files from a few commits ago except for - samba, which needs to know the correct process to kill. See - LFS ticket #2160 and add back these changes when that can be - depended on. + * Revert usage of pid files from a few commits ago except for + samba, which needs to know the correct process to kill. See + LFS ticket #2160 and add back these changes when that can be + depended on. 2008-03-06 Bruce Dubbs <[email protected]> - * Fixed calls in autofs to echo_failure. + * Fixed calls in autofs to echo_failure. 2007-12-21 Dan Nicholson <[email protected]> - * Removed the reload target from the dhcp script since dhcpd - does not support reloading with SIGHUP. + * Removed the reload target from the dhcp script since dhcpd + does not support reloading with SIGHUP. 2007-10-21 Dan Nicholson <[email protected]> - * Changed the gdm, gpm, haldaemon and ntp scripts to reference - their pid files in /var/run for all operations. + * Changed the gdm, gpm, haldaemon and ntp scripts to reference + their pid files in /var/run for all operations. 2007-10-21 Dan Nicholson <[email protected]> - * Fixed the samba and sshd scripts to reference the pid files in - /var/run. This ensures that the correct processes are killed and - queried. Also changed the dbus script to use the pid file in the - status target, too. + * Fixed the samba and sshd scripts to reference the pid files in + /var/run. This ensures that the correct processes are killed and + queried. Also changed the dbus script to use the pid file in the + status target, too. 2007-08-22 DJ Lucas <[email protected]> - * Updated the dhcpcd service script to comply with dhcpcd-3.0.19+. + * Updated the dhcpcd service script to comply with dhcpcd-3.0.19+. 2007-07-09 Dan Nicholson <[email protected]> - * Updated the D-Bus bootscript to call dbus-uuidgen on start and - use the system pid file. + * Updated the D-Bus bootscript to call dbus-uuidgen on start and + use the system pid file. 2007-07-08 Randy McMurchy <[email protected]> - * Update the CUPS section of the Makefile to remove the proper - files (upstream changed the S/K naming) + * Update the CUPS section of the Makefile to remove the proper + files (upstream changed the S/K naming) 2007-06-20 Dan Nicholson <[email protected]> - * Update lease info path for dhcpcd-3.x. + * Update lease info path for dhcpcd-3.x. 2007-06-20 Dan Nicholson <[email protected]> - * Use proper references for the pid and lease files in the dhcpcd - service script. + * Use proper references for the pid and lease files in the dhcpcd + service script. 2006-10-11 Dan Nicholson <[email protected]> - * Fixed gpm boot script to accept multiple arguments in the - variables, particularly GPMOPTS. Thanks to Christoph Felkes - for supplying the fix. + * Fixed gpm boot script to accept multiple arguments in the + variables, particularly GPMOPTS. Thanks to Christoph Felkes + for supplying the fix. 2006-06-24 Bruce Dubbs <[email protected]> - * Updated the openldap and nfs-server scripts to pass appropriate - signals to the stop functions. This change was due to changes - in the LFS functions script on 2/06/05! + * Updated the openldap and nfs-server scripts to pass appropriate + signals to the stop functions. This change was due to changes + in the LFS functions script on 2/06/05! 2006-06-24 Randy McMurchy <[email protected]> - * Updated the HAL script to work with HAL-0.5.7 + * Updated the HAL script to work with HAL-0.5.7 2006-06-23 Randy McMurchy <[email protected]> - * Updated the GDM script to the 2.14.2 version of GNOME + * Updated the GDM script to the 2.14.2 version of GNOME 2006-06-08 Bruce Dubbs <[email protected]> - * Updated bind to refer to /srv/named + * Updated bind to refer to /srv/named 2006-04-30 Randy McMurchy <[email protected]> - * Added a command to delete a pid file that the NFS server - leaves behind + * Added a command to delete a pid file that the NFS server + leaves behind 2006-04-27 Bruce Dubbs <[email protected]> - * Changed autofs order number to 52 so it will be run after cleanfs + * Changed autofs order number to 52 so it will be run after cleanfs 2006-04-23 Bruce Dubbs <[email protected]> - * Added qpopper initailization script and updated the Makefile + * Added qpopper initailization script and updated the Makefile 2006-04-15 Bruce Dubbs <[email protected]> - * Updated the ssh shutdown script to wait one second before setting OOM value + * Updated the ssh shutdown script to wait one second before setting OOM value 2006-04-11 Bruce Dubbs <[email protected]> - * Updated the netfs shutdown script to avoid errors with multiple entries + * Updated the netfs shutdown script to avoid errors with multiple entries 2006-04-11 Bruce Dubbs <[email protected]> - * Updated the sshd script to prevent killing ssh in Out Of Memory conditions + * Updated the sshd script to prevent killing ssh in Out Of Memory conditions 2006-02-05 Randy McMurchy <[email protected]> - * Updated the GDM script to the 2.12.2 version of GNOME + * Updated the GDM script to the 2.12.2 version of GNOME 2006-01-01 Randy McMurchy <[email protected]> - * Changed the name of the D-BUS pid file that is removed + * Changed the name of the D-BUS pid file that is removed 2005-11-21 Randy McMurchy <[email protected]> - * Removed the --compress parameter from the RSync bootscript + * Removed the --compress parameter from the RSync bootscript 2005-10-17 Randy McMurchy <[email protected]> - * Updated the GDM script to the 2.12 version of GNOME + * Updated the GDM script to the 2.12 version of GNOME 2005-10-01 Randy McMurchy <[email protected]> - * Added HAL init script and updated Makefile to include a HAL target + * Added HAL init script and updated Makefile to include a HAL target 2005-09-26 Randy McMurchy <[email protected]> - * Added D-BUS init script and updated Makefile to include a D-BUS - target + * Added D-BUS init script and updated Makefile to include a D-BUS + target 2005-09-10 Igor Zivkovic <[email protected]> - * Updated PPPoE service script to use the new command names. + * Updated PPPoE service script to use the new command names. 2005-07-31 DJ Lucas <[email protected]> - * Removed courier bootscript. - * Removed start and restart sections of alsa bootscript. - * Added missing echo in mysql script. - * Reordered bootscripts for samba/cups interaction. + * Removed courier bootscript. + * Removed start and restart sections of alsa bootscript. + * Added missing echo in mysql script. + * Reordered bootscripts for samba/cups interaction. 2005-07-08 DJ Lucas <[email protected]> - * Moved all scripts to use new functions provided by - lfs-bootscripts-3.2.1. + * Moved all scripts to use new functions provided by + lfs-bootscripts-3.2.1. 2005-06-26 DJ Lucas <[email protected]> - * Added uninstall targets to Makefile. Patch provided by - Matthias Berndt. + * Added uninstall targets to Makefile. Patch provided by + Matthias Berndt. 2005-06-13 Igor Zivkovic <[email protected]> - * Corrected the MySQL script to make it compatible with the new LFS - boot scripts (Jay D. McHugh). + * Corrected the MySQL script to make it compatible with the new LFS + boot scripts (Jay D. McHugh). 2005-05-31 Randy McMurchy <[email protected]> - * Removed explicit path from GDM script commands so that the commands - will work no matter where $GNOME_PREFIX is. + * Removed explicit path from GDM script commands so that the commands + will work no matter where $GNOME_PREFIX is. 2005-05-30 Randy McMurchy <[email protected]> - * Updated GDM script to GNOME-2.10. + * Updated GDM script to GNOME-2.10. 2005-05-09 Igor Zivkovic <[email protected]> - * Added a killproc parameter to mysql (Nathan Coulson). + * Added a killproc parameter to mysql (Nathan Coulson). 2005-03-13 Bruce Dubbs <[email protected]> - * Updated openldap1 and openldap2 to check for running - daemons before starting. + * Updated openldap1 and openldap2 to check for running + daemons before starting. 2005-03-13 Bruce Dubbs <[email protected]> - * Added iptables initialization script. + * Added iptables initialization script. 2005-03-02 Randy McMurchy <[email protected]> - * Added 'status' option to portmap bootscript. + * Added 'status' option to portmap bootscript. 2005-01-02 DJ Lucas <[email protected]> - * Added courier bootscript. + * Added courier bootscript. 2004-12-27 Randy McMurchy <[email protected]> - * Changed Exim bootscript to start the daemon with -q15m instead - of -q1m. + * Changed Exim bootscript to start the daemon with -q15m instead + of -q1m. 2004-11-21 Igor Zivkovic <[email protected]> - * Removed setclock symlinks at install-ntp target and added a - substitute command in the book. + * Removed setclock symlinks at install-ntp target and added a + substitute command in the book. 2004-10-27 Randy McMurchy <[email protected]> - * Added new bootscript for Stunnel. + * Added new bootscript for Stunnel. 2004-10-23 Randy McMurchy <[email protected]> - * Modified PostgreSQL script because the pg_ctl script - is no longer able to run as user root. + * Modified PostgreSQL script because the pg_ctl script + is no longer able to run as user root. 2004-10-20 DJ Lucas <[email protected]> - * Added ability to print assigned addresses when using - dhcpcd service script. + * Added ability to print assigned addresses when using + dhcpcd service script. 2004-10-13 Igor Zivkovic <[email protected]> - * Added ntpd -gqx to ntp bootscript start case to set - the initial time (Thomas Trepl) - * Added setclock stop symlinks to runlevels 0, 1, 2 - and 6 on install-ntp target to write the system time - back to hardware clock (Jeremy Utley) + * Added ntpd -gqx to ntp bootscript start case to set + the initial time (Thomas Trepl) + * Added setclock stop symlinks to runlevels 0, 1, 2 + and 6 on install-ntp target to write the system time + back to hardware clock (Jeremy Utley) 2004-10-11 DJ Lucas <[email protected]> - * Fixed multiple errors in nfs-server bootscript - * Removed lockd from nfs-client bootscript - * Added svn keywords to remaining bootscripts + * Fixed multiple errors in nfs-server bootscript + * Removed lockd from nfs-client bootscript + * Added svn keywords to remaining bootscripts 2004-10-02 DJ Lucas <[email protected]> - * Changed all scripts to use full path names + * Changed all scripts to use full path names 2004-09-28 DJ Lucas <[email protected]> - * Replaced nfs-server and nfs-client scripts - * Adjusted mysql and winbind scripts to use PIDFILE - * Added svn keywords to remaining bootscripts + * Replaced nfs-server and nfs-client scripts + * Adjusted mysql and winbind scripts to use PIDFILE + * Added svn keywords to remaining bootscripts 2004-08-26 Randy McMurchy <[email protected]> - * Removed usb script (suggested by Alexander Patrakov) + * Removed usb script (suggested by Alexander Patrakov) 2004-08-06 Randy McMurchy <[email protected]> - * Added openldap (slapd and slurpd startup) scripts + * Added openldap (slapd and slurpd startup) scripts 2004-08-05 Randy McMurchy <[email protected]> - * Added cyrus-sasl (Cyrus SASL authdaemon) script + * Added cyrus-sasl (Cyrus SASL authdaemon) script 2004-08-03 DJ Lucas <[email protected]> - * Added MODE and DIRMODE variables to set - permissions of installed scripts and - directories - * Corrected script to remove svn directories - when creating release tarball + * Added MODE and DIRMODE variables to set + permissions of installed scripts and + directories + * Corrected script to remove svn directories + when creating release tarball 2004-07-31 Randy McMurchy <[email protected]> - * Added nas (Network Audio Server) script + * Added nas (Network Audio Server) script 2004-07-28 DJ Lucas <[email protected]> - * Made minor fixups to dhcpcd, dhclient, and ipx - service scripts - * Added a shell script to create tarball + * Made minor fixups to dhcpcd, dhclient, and ipx + service scripts + * Added a shell script to create tarball 2004-07-28 Randy McMurchy <[email protected]> - * Changed location of PID file in mysql script + * Changed location of PID file in mysql script 2004-07-21 DJ Lucas <[email protected]> - * Changed vsftpd bootscript to use loadproc + * Changed vsftpd bootscript to use loadproc 2004-07-19 DJ Lucas <[email protected]> - * Added svn and vsftpd scripts + * Added svn and vsftpd scripts 2004-06-27 DJ Lucas <[email protected]> - * Added sysstat bootscript - * Fixed missing $EXTDIR targets in Makefile + * Added sysstat bootscript + * Fixed missing $EXTDIR targets in Makefile 2004-06-16 DJ Lucas <[email protected]> - * Added GPMOPTS to gpm script - * wrapped all gpm variables in quotes + * Added GPMOPTS to gpm script + * wrapped all gpm variables in quotes 2004-05-22 Tushar T <[email protected]> - * Added winbind script + * Added winbind script 2004-05-14 Tushar T <[email protected]> - * Added init.d/kerberos script - * Added init.d/usb script + * Added init.d/kerberos script + * Added init.d/usb script 2004-05-13 Tushar T <[email protected]> - * The begining of blfs-bootscripts + * The begining of blfs-bootscripts Modified: trunk/bootscripts/LICENSE =================================================================== --- trunk/bootscripts/LICENSE 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/LICENSE 2011-12-06 02:37:16 UTC (rev 9067) @@ -5,15 +5,15 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions in any form must retain the above copyright notice, - this list of conditions and the following disclaimer. + * Redistributions in any form must retain the above copyright notice, + this list of conditions and the following disclaimer. - * Neither the name of "Linux From Scratch" nor the names of its - contributors may be used to endorse or promote products derived from - this material without specific prior written permission. + * Neither the name of "Linux From Scratch" nor the names of its + contributors may be used to endorse or promote products derived from + this material without specific prior written permission. - * Any material derived from Linux From Scratch must contain a - reference to the "Linux From Scratch" project. + * Any material derived from Linux From Scratch must contain a + reference to the "Linux From Scratch" project. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, Modified: trunk/bootscripts/blfs/init.d/fcron =================================================================== --- trunk/bootscripts/blfs/init.d/fcron 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/blfs/init.d/fcron 2011-12-06 02:37:16 UTC (rev 9067) @@ -3,10 +3,10 @@ ### BEGIN INIT INFO # Provides: fcron -# Required-Start: $network -# Should-Start: $remote_fs -# Required-Stop: $network -# Should-Stop: $remote_fs +# Required-Start: $local_fs +# Should-Start: $remote_fs $syslog +# Required-Stop: $local_fs +# Should-Stop: $remote_fs $syslog # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Short-Description: Starts fcron. @@ -16,40 +16,38 @@ . /lib/lsb/init-functions -MESSAGE="FCron Daemon" BIN_FILE="/usr/sbin/fcron" -PIDFILE="/var/run/fcron.pid" #$LastChangedBy$ #$Date$ case "$1" in - start) - log_info_msg "Starting fcron..." - start_daemon ${BIN_FILE} + start) + log_info_msg "Starting fcron..." + start_daemon ${BIN_FILE} evaluate_retval - ;; + ;; - stop) - log_info_msg "Stopping fcron..." - killproc ${BIN_FILE} + stop) + log_info_msg "Stopping fcron..." + killproc ${BIN_FILE} evaluate_retval - ;; + ;; - restart) - $0 stop - sleep 1 - $0 start - ;; + restart) + $0 stop + sleep 1 + $0 start + ;; - status) - statusproc ${BIN_FILE} - ;; + status) + statusproc ${BIN_FILE} + ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; esac -# End $rc_base/init.d/fcron +# End /etc/init.d/fcron Modified: trunk/bootscripts/blfs/init.d/lprng =================================================================== --- trunk/bootscripts/blfs/init.d/lprng 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/blfs/init.d/lprng 2011-12-06 02:37:16 UTC (rev 9067) @@ -12,9 +12,9 @@ ### BEGIN INIT INFO # Provides: lprng -# Required-Start: $network +# Required-Start: $local_fs # Should-Start: $remote_fs -# Required-Stop: $network +# Required-Stop: $local_fs # Should-Stop: $remote_fs # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 @@ -30,38 +30,38 @@ #$Date$ case "$1" in - start) - log_info_msg "Starting lpd..." - start_daemon /usr/sbin/lpd + start) + log_info_msg "Starting lpd..." + start_daemon /usr/sbin/lpd evaluate_retval - ;; + ;; - stop) - log_info_msg "Stopping lpd..." - killproc /usr/sbin/lpd + stop) + log_info_msg "Stopping lpd..." + killproc /usr/sbin/lpd evaluate_retval - ;; + ;; - reload) - boot_mesg "Reloading lpd..." - killproc /usr/sbin/lpd -HUP + reload) + boot_mesg "Reloading lpd..." + killproc /usr/sbin/lpd -HUP evaluate_retval - ;; + ;; - restart) - $0 stop - sleep 1 - $0 start - ;; + restart) + $0 stop + sleep 1 + $0 start + ;; - status) - statusproc /usr/sbin/lpd - ;; + status) + statusproc /usr/sbin/lpd + ;; - *) - echo "Usage: $0 {start|stop|reload|restart|status}" - exit 1 - ;; + *) + echo "Usage: $0 {start|stop|reload|restart|status}" + exit 1 + ;; esac # End /etc/init.d/lprng Deleted: trunk/bootscripts/blfs/init.d/portmap =================================================================== --- trunk/bootscripts/blfs/init.d/portmap 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/blfs/init.d/portmap 2011-12-06 02:37:16 UTC (rev 9067) @@ -1,65 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin portmap -# -# Description : Start portmap daemon -# -# Author : Bruce Dubbs - [email protected] -# -# Version : LFS 7.0 -# -######################################################################## - -### BEGIN INIT INFO -# Provides: $portmap -# Required-Start: $network -# Should-Start: -# Required-Stop: $network -# Should-Stop: -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Starts the portmap daemon. -# Description: Starts the portmap daemon to convert RPC program numbers -# into DARPA protocol port numbers. It must be running in -# order to make RPC# calls. -# X-LFS-Provided-By: LFS -### END INIT INFO - -. /lib/lsb/init-functions -# Begin $rc_base/init.d/portmap - -#$LastChangedBy$ -#$Date$ - -case "$1" in - start) - log_info_msg "Starting RPC Portmap" - start_daemon /sbin/portmap - evaluate_retval - ;; - - stop) - log_info_msg "Stopping Portmap" - killproc /sbin/portmap - evaluate_retval - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc /sbin/portmap - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; - -esac - -# End /etc/init.d/portmap - Modified: trunk/bootscripts/blfs/init.d/random =================================================================== --- trunk/bootscripts/blfs/init.d/random 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/blfs/init.d/random 2011-12-06 02:37:16 UTC (rev 9067) @@ -11,17 +11,16 @@ ######################################################################## ### BEGIN INIT INFO -# Provides: random -# Required-Start: $syslog +# Provides: random +# Required-Start: $local_fs # Should-Start: -# Required-Stop: $syslog +# Required-Stop: $local_fs # Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Initialises /dev/urandom -# Description: Initialises /dev/urandom from a seed stored in -# /var/tmp. -# X-LFS-Provided-By: BLFS / LFS 7.0 +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Initialises /dev/urandom +# Description: Initialises /dev/urandom from a seed stored in /var/tmp. +# X-LFS-Provided-By: BLFS / LFS 7.0 ### END INIT INFO . /lib/lsb/init-functions @@ -32,18 +31,18 @@ case "$1" in start) log_info_msg "Initializing kernel random number generator..." + if [ -f /var/tmp/random-seed ]; then /bin/cat /var/tmp/random-seed >/dev/urandom fi - /bin/dd if=/dev/urandom of=/var/tmp/random-seed \ - count=1 &>/dev/null + + /bin/dd if=/dev/urandom of=/var/tmp/random-seed count=1 &>/dev/null evaluate_retval ;; stop) log_info_msg "Saving random seed..." - /bin/dd if=/dev/urandom of=/var/tmp/random-seed \ - count=1 &>/dev/null + /bin/dd if=/dev/urandom of=/var/tmp/random-seed count=1 &>/dev/null evaluate_retval ;; @@ -53,4 +52,4 @@ ;; esac -# End $rc_base/init.d/random +# End /etc/init.d/random Modified: trunk/bootscripts/blfs/init.d/svn =================================================================== --- trunk/bootscripts/blfs/init.d/svn 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/blfs/init.d/svn 2011-12-06 02:37:16 UTC (rev 9067) @@ -33,7 +33,7 @@ log_info_msg "Starting Subversion..." start_daemon /usr/bin/svnserve -d -r /srv/svn/repositories evaluate_retval - ;; + ;; stop) log_info_msg "Stopping Subversion..." Modified: trunk/bootscripts/blfs/init.d/vsftpd =================================================================== --- trunk/bootscripts/blfs/init.d/vsftpd 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/blfs/init.d/vsftpd 2011-12-06 02:37:16 UTC (rev 9067) @@ -11,10 +11,10 @@ ######################################################################## ### BEGIN INIT INFO -# Provides: $svnserve -# Required-Start: +# Provides: ftpd +# Required-Start: $remote_fs # Should-Start: -# Required-Stop: $sendsignals +# Required-Stop: $remote_fs # Should-Stop: # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 @@ -29,38 +29,38 @@ #$Date$ case "$1" in - start) - log_info_msg "Starting vsFTPD Server..." - start_daemon /usr/sbin/vsftpd + start) + log_info_msg "Starting vsFTPD Server..." + start_daemon /usr/sbin/vsftpd evaluate_retval - ;; + ;; - stop) - log_info_msg "Stopping vsFTPD Server..." - killproc /usr/sbin/vsftpd + stop) + log_info_msg "Stopping vsFTPD Server..." + killproc /usr/sbin/vsftpd evaluate_retval - ;; + ;; - reload) - log_info_msg "Reloading vsFTPD Server..." - killproc /usr/sbin/vsftpd -HUP + reload) + log_info_msg "Reloading vsFTPD Server..." + killproc /usr/sbin/vsftpd -HUP evaluate_retval - ;; + ;; - restart) - $0 stop - sleep 1 - $0 start - ;; + restart) + $0 stop + sleep 1 + $0 start + ;; - status) - statusproc /usr/sbin/vsftpd - ;; + status) + statusproc /usr/sbin/vsftpd + ;; - *) - echo "Usage: $0 {start|stop|reload|restart|status}" - exit 1 - ;; + *) + echo "Usage: $0 {start|stop|reload|restart|status}" + exit 1 + ;; esac # End /etc/init.d/vsftpd Modified: trunk/bootscripts/blfs/services/dhclient =================================================================== --- trunk/bootscripts/blfs/services/dhclient 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/blfs/services/dhclient 2011-12-06 02:37:16 UTC (rev 9067) @@ -21,66 +21,66 @@ } case "$2" in - up) - log_info_msg "\nStarting dhclient on the $1 interface..." + up) + log_info_msg "\nStarting dhclient on the $1 interface..." - /sbin/dhclient $1 $DHCP_START - # Save the return value - RET="$?" - # Print the assigned settings if requested - if [ "$RET" = "0" -a "$PRINTIP" = "yes" ]; then - # Get info from dhclient.leases file - IPADDR=`getipstats | grep "fixed-address" | \ - sed 's/ fixed-address //' | \ - sed 's/\;//'` - NETMASK=`getipstats | grep "subnet-mask" | \ - sed 's/ option subnet-mask //' | \ - sed 's/\;//'` - GATEWAY=`getipstats | grep "routers" | \ - sed 's/ option routers //' | \ - sed 's/\;//'` - DNS=`getipstats | grep "domain-name-servers" | \ - sed 's/ option domain-name-servers //' | \ - sed 's/\;//' | sed 's/,/ and /'` + /sbin/dhclient $1 $DHCP_START + # Save the return value + RET="$?" + # Print the assigned settings if requested + if [ "$RET" = "0" -a "$PRINTIP" = "yes" ]; then + # Get info from dhclient.leases file + IPADDR=`getipstats | grep "fixed-address" | \ + sed 's/ fixed-address //' | \ + sed 's/\;//'` + NETMASK=`getipstats | grep "subnet-mask" | \ + sed 's/ option subnet-mask //' | \ + sed 's/\;//'` + GATEWAY=`getipstats | grep "routers" | \ + sed 's/ option routers //' | \ + sed 's/\;//'` + DNS=`getipstats | grep "domain-name-servers" | \ + sed 's/ option domain-name-servers //' | \ + sed 's/\;//' | sed 's/,/ and /'` - if [ "$PRINTALL" = "yes" ]; then - # this is messy, the messages are on one very long - # line on the screen and in the log - log_info_msg " DHCP Assigned Settings for $1:" - log_info_msg " IP Address: $IPADDR" - log_info_msg " Subnet Mask: $NETMASK" - log_info_msg " Default Gateway: $GATEWAY" - log_info_msg " DNS Server: $DNS" - $(exit "$RET") - evaluate_retval - else - log_info_msg " IP Addresss:""$IPADDR" - $(exit "$RET") - evaluate_retval - fi - else - $(exit "$RET") - evaluate_retval - fi - ;; + if [ "$PRINTALL" = "yes" ]; then + # this is messy, the messages are on one very long + # line on the screen and in the log + log_info_msg " DHCP Assigned Settings for $1:" + log_info_msg " IP Address: $IPADDR" + log_info_msg " Subnet Mask: $NETMASK" + log_info_msg " Default Gateway: $GATEWAY" + log_info_msg " DNS Server: $DNS" + $(exit "$RET") + evaluate_retval + else + log_info_msg " IP Addresss:""$IPADDR" + $(exit "$RET") + evaluate_retval + fi + else + $(exit "$RET") + evaluate_retval + fi + ;; - down) - log_info_msg "Stopping dhclient on the $1 interface..." + down) + log_info_msg "Stopping dhclient on the $1 interface..." - if [ -z "$DHCP_STOP" ]; then - # This breaks multiple interfaces please provide - # the correct stop arguments. - killproc dhclient - else - /sbin/dhclient $1 $DHCP_STOP - evaluate_retval - fi - ;; + if [ -z "$DHCP_STOP" ]; then + # This breaks multiple interfaces please provide + # the correct stop arguments. + killproc dhclient + else + /sbin/dhclient $1 $DHCP_STOP + evaluate_retval + fi + ;; - *) - echo "Usage: $0 [interface] {up|down}" - exit 1 - ;; + *) + echo "Usage: $0 [interface] {up|down}" + exit 1 + ;; esac # End services/dhclient Modified: trunk/bootscripts/blfs/sysconfig/autofs.conf =================================================================== --- trunk/bootscripts/blfs/sysconfig/autofs.conf 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/blfs/sysconfig/autofs.conf 2011-12-06 02:37:16 UTC (rev 9067) @@ -2,16 +2,16 @@ # # Autofs configuration file # -# Filename: /etc/sysconfig/autofs.conf +# Filename: /etc/sysconfig/autofs.conf # -# Author: Bryan Mason +# Author: Bryan Mason # # Edit History: # -# Date Author Action +# Date Author Action # ---------------------------------------------------------------------- -# 19 Jan 2004 B. Mason Created -# 18 Oct 2004 L. Lawrence Assume /usr is not mounted, add timeout +# 19 Jan 2004 B. Mason Created +# 18 Oct 2004 L. Lawrence Assume /usr is not mounted, add timeout automount=/sbin/automount localoptions='' Deleted: trunk/bootscripts/blfs/sysconfig/network-devices/services/dhclient =================================================================== --- trunk/bootscripts/blfs/sysconfig/network-devices/services/dhclient 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/blfs/sysconfig/network-devices/services/dhclient 2011-12-06 02:37:16 UTC (rev 9067) @@ -1,86 +0,0 @@ -#!/bin/sh -# Begin $network-devices/services/dhclient - -# Based upon lfs-bootscripts-1.12 $network_devices/if{down,up} -# Rewritten by Nathan Coulson <[email protected]> -# Adapted for dhclient by DJ Lucas <[email protected]> - -#$LastChangedBy$ -#$Date$ - -. /etc/sysconfig/rc -. $rc_functions -. $IFCONFIG - -getipstats() -{ - # Print the last 16 lines of dhclient.leases - sed -e :a -e '$q;N;17,$D;ba' /var/state/dhcp//dhclient.leases -} - -case "$2" in - up) - boot_mesg "Starting dhclient on the $1 interface..." - /sbin/dhclient $1 $DHCP_START - # Save the return value - RET="$?" - # Print the assigned settings if requested - if [ "$RET" = "0" -a "$PRINTIP" = "yes" ]; then - # Get info from dhclient.leases file - IPADDR=`getipstats | grep "fixed-address" | \ - sed 's/ fixed-address //' | \ - sed 's/\;//'` - NETMASK=`getipstats | grep "subnet-mask" | \ - sed 's/ option subnet-mask //' | \ - sed 's/\;//'` - GATEWAY=`getipstats | grep "routers" | \ - sed 's/ option routers //' | \ - sed 's/\;//'` - DNS=`getipstats | grep "domain-name-servers" | \ - sed 's/ option domain-name-servers //' | \ - sed 's/\;//' | sed 's/,/ and /'` - - if [ "$PRINTALL" = "yes" ]; then - $(exit "$RET") - evaluate_retval - boot_mesg " DHCP Assigned Settings for $1:" - boot_mesg_flush - boot_mesg " IP Address: $IPADDR" - boot_mesg_flush - boot_mesg " Subnet Mask: $NETMASK" - boot_mesg_flush - boot_mesg " Default Gateway: $GATEWAY" - boot_mesg_flush - boot_mesg " DNS Server: $DNS" - boot_mesg_flush - else - boot_mesg " IP Addresss:""$IPADDR" - $(exit "$RET") - evaluate_retval - fi - else - $(exit "$RET") - evaluate_retval - fi - ;; - - down) - boot_mesg "Stopping dhclient on the $1 interface..." - if [ "$DHCP_STOP" = "" ] - then - # This breaks multiple interfaces please provide - # the correct stop arguments. - killproc dhclient - else - /sbin/dhclient $1 $DHCP_STOP - evaluate_retval - fi - ;; - - *) - echo "Usage: $0 [interface] {up|down}" - exit 1 - ;; -esac - -# End $network_devices/services/dhclient Deleted: trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd =================================================================== --- trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd 2011-12-05 22:58:00 UTC (rev 9066) +++ trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd 2011-12-06 02:37:16 UTC (rev 9067) @@ -1,92 +0,0 @@ -#!/bin/sh -# Begin $network-devices/services/dhcpcd - -# Based upon lfs-bootscripts-1.12 $network_devices/if{down,up} -# Rewritten by Nathan Coulson <[email protected]> -# Adapted for dhcpcd by DJ Lucas <[email protected]> - -#$LastChangedBy$ -#$Date$ - -. /etc/sysconfig/rc -. $rc_functions -. $IFCONFIG - -PIDFILE="/var/run/dhcpcd-$1.pid" -LEASEINFO="/var/lib/dhcpcd/dhcpcd-$1.info" - -case "$2" in - up) - boot_mesg -n "Starting dhcpcd on the $1 interface..." - # Test to see if there is a stale pid file - if [ -f "$PIDFILE" ] - then - ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null - if [ $? != 0 ] - then - rm -f $PIDFILE > /dev/null - else - boot_mesg "dhcpcd already running!" ${WARNING} - echo_warning - exit 2 - fi - fi - /sbin/dhcpcd $1 $DHCP_START - # Save the return value - RET="$?" - # Print the assigned settings if requested - if [ "$RET" = "0" -a "$PRINTIP" = "yes" ]; then - . $LEASEINFO - if [ "$PRINTALL" = "yes" ]; then - echo "" - echo_ok - boot_mesg " DHCP Assigned Settings for $1:" - boot_mesg_flush - boot_mesg " IP Address: $IPADDR" - boot_mesg_flush - boot_mesg " Subnet Mask: $NETMASK" - boot_mesg_flush - boot_mesg " Default Gateway: $GATEWAYS" - boot_mesg_flush - boot_mesg " DNS Server: $DNSSERVERS" - boot_mesg_flush - else - boot_mesg " IP Addresss: $IPADDR" - echo_ok - fi - else - echo "" - $(exit "$RET") - evaluate_retval - fi - ;; - - down) - boot_mesg -n "Stopping dhcpcd on the $1 interface..." - if [ -z "$DHCP_STOP" ] - then - echo "" - killproc -p "$PIDFILE" /sbin/dhcpcd - else - /sbin/dhcpcd $1 $DHCP_STOP &> /dev/null - RET="$?" - if [ "$RET" -eq 0 ]; then - echo "" - echo_ok - elif [ "$RET" -eq 1 ]; then - boot_mesg "dhcpcd not running!" ${WARNING} - echo_warning - else - echo "" - echo_failure - fi - fi - ;; - - *) - echo "Usage: $0 [interface] {up|down}" - exit 1 - ;; -esac - -# End $network_devices/services/dhcpcd -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
