Author: bdubbs Date: 2008-03-06 15:28:11 -0700 (Thu, 06 Mar 2008) New Revision: 7205
Modified: trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml trunk/bootscripts/ChangeLog trunk/bootscripts/blfs/init.d/autofs Log: Fix typo in autofs bootscript Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2008-03-06 19:05:45 UTC (rev 7204) +++ trunk/BOOK/general.ent 2008-03-06 22:28:11 UTC (rev 7205) @@ -3,7 +3,7 @@ $Date$ --> -<!ENTITY day "06"> <!-- Always 2 digits --> +<!ENTITY day "07"> <!-- Always 2 digits --> <!ENTITY month "03"> <!-- Always 2 digits --> <!ENTITY year "2008"> <!ENTITY version "svn-&year;&month;&day;"> @@ -44,7 +44,7 @@ <!ENTITY lfs-gcc-version "4.1.2"> <!-- End LFS versions --> -<!ENTITY blfs-bootscripts-version "20071221"> +<!ENTITY blfs-bootscripts-version "20080306"> <!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 2008-03-06 19:05:45 UTC (rev 7204) +++ trunk/BOOK/introduction/welcome/changelog.xml 2008-03-06 22:28:11 UTC (rev 7205) @@ -42,6 +42,15 @@ --> <listitem> + <para>March 7th, 2008</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Fixed autofs bootscript.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>March 6th, 2008</para> <itemizedlist> <listitem> Modified: trunk/bootscripts/ChangeLog =================================================================== --- trunk/bootscripts/ChangeLog 2008-03-06 19:05:45 UTC (rev 7204) +++ trunk/bootscripts/ChangeLog 2008-03-06 22:28:11 UTC (rev 7205) @@ -1,3 +1,6 @@ +2008-03-06 Bruce Dubbs <[EMAIL PROTECTED]> + * 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. Modified: trunk/bootscripts/blfs/init.d/autofs =================================================================== --- trunk/bootscripts/blfs/init.d/autofs 2008-03-06 19:05:45 UTC (rev 7204) +++ trunk/bootscripts/blfs/init.d/autofs 2008-03-06 22:28:11 UTC (rev 7205) @@ -26,26 +26,26 @@ # function getmounts() { - if [ -f /etc/auto.master ] - then - cat /etc/auto.master | sed -e '/^#/d' -e '/^$/d'| - ( - while read dir map options - do - if [ ! -z "$dir" -a ! -z "$map" \ - -a x$(echo "$map" | cut -c1) != 'x-' ] - then - map=$(echo "/etc/$map" | sed -e 's:^/etc//:/:') - options=$(echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g') - if [ -x $map ]; then - echo " $dir program $map $options" - else - echo " $dir file $map $options" - fi - fi - done - ) - fi + if [ -f /etc/auto.master ] + then + cat /etc/auto.master | sed -e '/^#/d' -e '/^$/d'| + ( + while read dir map options + do + if [ ! -z "$dir" -a ! -z "$map" \ + -a x$(echo "$map" | cut -c1) != 'x-' ] + then + map=$(echo "/etc/$map" | sed -e 's:^/etc//:/:') + options=$(echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g') + if [ -x $map ]; then + echo " $dir program $map $options" + else + echo " $dir file $map $options" + fi + fi + done + ) + fi } # @@ -56,136 +56,136 @@ echo "Configured Mount Points:" getmounts | ( - while read dir type map options - do - echo $dir $type $map $options + while read dir type map options + do + echo $dir $type $map $options - if [ $type = 'file' ] - then - cat $map | sed -e '/^#/d' -e '/^$/d' | - ( - while read key options location - do - echo " $key $options $location" - done - ) - echo "" - fi - done + if [ $type = 'file' ] + then + cat $map | sed -e '/^#/d' -e '/^$/d' | + ( + while read key options location + do + echo " $key $options $location" + done + ) + echo "" + fi + done ) echo "Active Automount Daemons:" if [ $(COLUMNS=1024 ps ax | grep "[0-9]:[0-9][0-9] $automount " | wc -w) -gt 0 ] then - COLUMNS=1024 ps ax | grep "[0-9]:[0-9][0-9] $automount " | - ( - while read pid tt stat time command; do echo " $command" ; done - ) + COLUMNS=1024 ps ax | grep "[0-9]:[0-9][0-9] $automount " | + ( + while read pid tt stat time command; do echo " $command" ; done + ) else - echo " None"; + echo " None"; fi echo "" echo "Actively Automounted Directories:" getmounts | ( - while read dir type map options - do - line=$(mount | grep -v "^automount" | grep "$dir") - if [ $(echo $line | wc -w) -ne 0 ] - then - echo "$line" | sed -e "s/^./ &/" - fi - done + while read dir type map options + do + line=$(mount | grep -v "^automount" | grep "$dir") + if [ $(echo $line | wc -w) -ne 0 ] + then + echo "$line" | sed -e "s/^./ &/" + fi + done ) echo "" } case "$1" in - start) - getmounts | - ( - while read dir type map options - do - boot_mesg -n "Automounting $dir..." - pidfile=$(echo $dir | sed -e "y/\//-/" | sed -e "s/^-//") - pidpath=${piddir}/${pidroot}.${pidfile}.pid + start) + getmounts | + ( + while read dir type map options + do + boot_mesg -n "Automounting $dir..." + pidfile=$(echo $dir | sed -e "y/\//-/" | sed -e "s/^-//") + pidpath=${piddir}/${pidroot}.${pidfile}.pid - if [ ! -d "$dir" ] - then - boot_mesg -n " Creating mountpoint $dir..." - mkdir -p "$dir" - fi + if [ ! -d "$dir" ] + then + boot_mesg -n " Creating mountpoint $dir..." + mkdir -p "$dir" + fi - if [ ! -e "$map" ] - then - boot_mesg "Map file $map does not exist!" ${FAILURE} - echo_failed - continue - fi + if [ ! -e "$map" ] + then + boot_mesg "Map file $map does not exist!" ${FAILURE} + echo_failure + continue + fi - if [ ! -x "$map" -a "$type" = "program" ] - then - boot_mesg "Map file $map is not executable!" ${FAILURE} - echo_failed - continue - fi + if [ ! -x "$map" -a "$type" = "program" ] + then + boot_mesg "Map file $map is not executable!" ${FAILURE} + echo_failure + continue + fi - if [ -e "$pidpath" ] - then - boot_mesg " already running!" ${WARNING} - echo_warning - else - echo " " - $automount -p $pidpath $daemonoptions $dir $type $map $options $localoptions - evaluate_retval - fi - done - ) - ;; + if [ -e "$pidpath" ] + then + boot_mesg " already running!" ${WARNING} + echo_warning + else + echo " " + $automount -p $pidpath $daemonoptions $dir $type $map $options $localoptions + evaluate_retval + fi + done + ) + ;; - stop) - # Kill all automounters listed in /var/run - ls ${piddir}/${pidroot}.*.pid 2>/dev/null | - ( - while read pidpath - do - pid=$(cat $pidpath) - pidfile=$(basename $pidpath) - mountpoint=$(echo $pidfile | sed -e "s/^autofs\.\(.*\)\.pid$/\1/" | sed -e "y/-/\//") - boot_mesg "Stopping automount on /$mountpoint..." - kill $pid - evaluate_retval - done - ) + stop) + # Kill all automounters listed in /var/run + ls ${piddir}/${pidroot}.*.pid 2>/dev/null | + ( + while read pidpath + do + pid=$(cat $pidpath) + pidfile=$(basename $pidpath) + mountpoint=$(echo $pidfile | sed -e "s/^autofs\.\(.*\)\.pid$/\1/" | sed -e "y/-/\//") + boot_mesg "Stopping automount on /$mountpoint..." + kill $pid + evaluate_retval + done + ) - # Now kill any rogue automounters (automount process w/o pid files) - sleep 1 - COLUMNS=1024 ps ax | grep "[0-9]:[0-9][0-9] $automount " | - ( - while read pid everything_else - do - boot_mesg "Stopping automount with pid $pid..." - kill $pid - evaluate_retval - done - ) - ;; + # Now kill any rogue automounters (automount process w/o pid files) + sleep 1 + COLUMNS=1024 ps ax | grep "[0-9]:[0-9][0-9] $automount " | + ( + while read pid everything_else + do + boot_mesg "Stopping automount with pid $pid..." + kill $pid + evaluate_retval + done + ) + ;; - restart) - $0 stop - sleep 1 - $0 start - ;; + restart) + $0 stop + sleep 1 + $0 start + ;; - status) - status - ;; + status) + status + ;; - *) - echo "usage: $0 {start|stop|restart|status}" - exit 1 - ;; + *) + echo "usage: $0 {start|stop|restart|status}" + exit 1 + ;; esac -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
