- removed inputrc (it must be in readline),

- reformatings,
- removed processing doc in Makefile.am and autogen.sh.

svn-id: @375

diff --git a/Makefile.am b/Makefile.am
index b41b0490ddda71dc99eed97c3f2e5cf49f1653af..71e8d3a600a424cfd9cca16f2656198d4972b917 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = src doc ppp sysconfig rc.d
+SUBDIRS = src ppp sysconfig rc.d
 
 sysconf_DATA = \
        adjtime \

diff --git a/autogen.sh b/autogen.sh
index b625a375fcdef926012d8188e8e249e9968dd35f..22e4cf00ea106c41c5078a0276a3ed201fbda886 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,6 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="PLD rc-scripts"
 
 (test -f $srcdir/configure.in \
-  && test -d $srcdir/doc \
   && test -d $srcdir/src) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level rc-scripts directory"

diff --git a/inputrc b/inputrc
deleted file mode 100644 (file)
index 7a5dd5c..0000000
--- a/inputrc
+++ /dev/null
@@ -1,12 +0,0 @@
-set meta-flag on
-set convert-meta off
-set output-meta on
-set horizontal-scroll-mode on
-"\e\e[C": forward-word
-"\e\e[D": backward-word
-"\e\e[3~": kill-word
-"\e[1~": beginning-of-line
-"\e[7~": beginning-of-line
-"\e[3~": delete-char
-"\e[4~": end-of-line
-"\e[8~": end-of-line

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 46d53a3e47ea08716d211caa310b217d6914afa1..e96b37e9c7e4222a16e5d1ddf2d6205c98365888 100644 (file)
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -1,7 +1,7 @@
 # functions    This file contains functions to be used by most or all
 #              shell scripts in the /etc/init.d directory.
 #
-# Version:     @(#) /etc/init.d/functions $Revision: 1.8 $ $Date: 1999/06/18 19:23:51 $
+# Version:     @(#) /etc/init.d/functions $Revision: 1.9 $ $Date: 1999/06/19 11:29:04 $
 #
 # Author:      Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 # Hacked by:    Greg Galloway and Marc Ewing
@@ -38,55 +38,55 @@ fi
 # Some functions to handle PLD-style messages
 show() 
 {
-  text="$*".............................................
-  echo -ne `echo $text | cut -c1-45`
+       text="$*".............................................
+       echo -ne `echo $text | cut -c1-45`
 }
 
 busy() 
 {
-  echo -n "`tput setaf 6`[`tput setaf 5` BUSY `tput setaf 6`]`tput setaf 7`"
+       echo -n "`tput setaf 6`[`tput setaf 5` BUSY `tput setaf 6`]`tput setaf 7`"
 }
 
 ok() 
 {
-  echo  "`tput setaf 6`[`tput setaf 2` DONE `tput setaf 6`]`tput setaf 7`"
+       echo  "`tput setaf 6`[`tput setaf 2` DONE `tput setaf 6`]`tput setaf 7`"
 }
 
 started()
 {
-  echo  "`tput setaf 6`[`tput setaf 2` WORK `tput setaf 6`]`tput setaf 7`"
+       echo  "`tput setaf 6`[`tput setaf 2` WORK `tput setaf 6`]`tput setaf 7`"
 }
 
 fail() 
 {
-  echo  "`tput setaf 6`[`tput setaf 1` FAIL `tput setaf 6`]`tput setaf 7`"
+       echo  "`tput setaf 6`[`tput setaf 1` FAIL `tput setaf 6`]`tput setaf 7`"
 }
 
 died() 
 {
-  echo  "`tput setaf 6`[`tput setaf 1` DIED `tput setaf 6`]`tput setaf 7`"
+       echo  "`tput setaf 6`[`tput setaf 1` DIED `tput setaf 6`]`tput setaf 7`"
 }
 
 deltext() 
 {
-  echo -ne '\b\b\b\b\b\b\b\b'
+       echo -ne '\b\b\b\b\b\b\b\b'
 }
 
 # Usage run_cmd Message command_to_run
 run_cmd()
 {
-_ERRORS=""
-MESSAGE=$1
-show "$MESSAGE"; busy
-shift
-if _ERRORS="`initlog -c \"$*\"`"; then
-deltext; ok
-else
-deltext; fail; echo $_ERRORS
-fi
-exit_code=$?
-unset _ERRORS
-return $exit_code
+       _ERRORS=""
+       MESSAGE=$1
+       show "$MESSAGE"; busy
+       shift
+       if _ERRORS="`initlog -c \"$*\"`"; then
+               deltext; ok
+       else
+               deltext; fail; echo $_ERRORS
+       fi
+       exit_code=$?
+       unset _ERRORS
+       return $exit_code
 }
 
 # A function to start a program (now it's usefull on read-only filesystem too)
@@ -97,10 +97,10 @@ daemon()
        [ -z "$DEFAULT_SERVICE_RUN_NICE_LEVEL" ] && DEFAULT_SERVICE_RUN_NICE_LEVEL=0
        # Test syntax.
        case $1 in
-           '')    echo '$0: Usage: daemon [+/-nicelevel] {program}'
-                  return 1;;
-           -*|+*) SERVICE_RUN_NICE_LEVEL=$1
-                  shift;;
+       '')     echo '$0: Usage: daemon [+/-nicelevel] {program}'
+               return 1;;
+       -*|+*) SERVICE_RUN_NICE_LEVEL=$1
+               shift;;
        esac
 
        # make sure it doesn't core dump anywhere; while this could mask
@@ -110,14 +110,14 @@ daemon()
        # And start it up.
        busy
        if _ERRORS="`nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} initlog -c "$*" 2>&1`"; then
-         deltext
-         ok
+               deltext
+               ok
        else
-         deltext
-         fail
-         echo $_ERRORS
+               deltext
+               fail
+               echo $_ERRORS
        fi
-       unset _ERRORS
+       unset _ERRORS
 }
 
 # A function to stop a program.
@@ -164,10 +164,10 @@ killproc()
                        kill $killlevel $pid >$TMPFILE 2>&1
                fi
        else
-         rm -f /var/run/$base.pid
-         deltext
-         fail
-         return
+               rm -f /var/run/$base.pid
+               deltext
+               fail
+               return
        fi
 
         # Remove pid file if any.

diff --git a/rc.d/init.d/killall b/rc.d/init.d/killall
index 7529bf782166aaa085133cca32acc9215d4afd61..898e70366ffe26c8fee76369fbe36f7f9702cbf5 100644 (file)
--- a/rc.d/init.d/killall
+++ b/rc.d/init.d/killall
@@ -12,9 +12,9 @@ for i in /var/lock/subsys/*; do
 
        # Bring the subsystem down.
        if [ -f /etc/rc.d/init.d/$subsys.init ]; then
-           /etc/rc.d/init.d/$subsys.init stop
+               /etc/rc.d/init.d/$subsys.init stop
        else
-           /etc/rc.d/init.d/$subsys stop
+               /etc/rc.d/init.d/$subsys stop
        fi
 done
 

diff --git a/rc.d/init.d/shutdwn b/rc.d/init.d/shutdwn
index d5d9001fcdeb139d4d0ef3b313cd62c4c9499189..25ea234a2556f0c6ea7025d0b02b57b6a47b263f 100755 (executable)
--- a/rc.d/init.d/shutdwn
+++ b/rc.d/init.d/shutdwn
@@ -32,24 +32,24 @@ run_cmd "Remounting root filesystem in ro mode" mount -n -o remount,ro /
 
 # turn off raid
 if [ -x /sbin/raidstop -a -f /etc/raidtab ]; then
-    # we can not use raidstop -a here because this will only stop
-    # devices listed in the default config file which is not always
-    # the case. So we look only for the active raid devices
-    if [ -f /proc/mdstat ] ; then
-        mddevs=$(grep ^md /proc/mdstat | awk '{ print $1 }')
-        for mddev in $mddevs ; do
-            run_cmd "Turning off RAID for $mddev" raidstop /dev/$mddev
-        done
-        unset mddev mddevs
-    fi
-    #runcmd "Turning off RAID" /sbin/raidstop -a
+       # we can not use raidstop -a here because this will only stop
+       # devices listed in the default config file which is not always
+       # the case. So we look only for the active raid devices
+       if [ -f /proc/mdstat ] ; then
+               mddevs=$(grep ^md /proc/mdstat | awk '{ print $1 }')
+               for mddev in $mddevs ; do
+                       run_cmd "Turning off RAID for $mddev" raidstop /dev/$mddev
+               done
+               unset mddev mddevs
+       fi
+       #runcmd "Turning off RAID" /sbin/raidstop -a
 fi
 
 show "Remounting remaining filesystems ro mode"; busy
-if (mount | awk '/ext2/ { print $3 }' | while read line; do 
-    mount -n -o ro,remount $line
-done); then
-deltext; ok
+if (mount | awk '/ext2/ { print $3 }' | \
+       while read line; do 
+               mount -n -o ro,remount $line done); then
+       deltext; ok
 else
-deltext; fail
+       deltext; fail
 fi

diff --git a/rc.d/init.d/single b/rc.d/init.d/single
index 7356a8207a7284ff55d88e5643a4694315a6acec..5f03f78d90048fd53ec7adeea0aa0ae4d7cec5f4 100644 (file)
--- a/rc.d/init.d/single
+++ b/rc.d/init.d/single
@@ -39,7 +39,7 @@ case "$1" in
 
 # make sure modprobe is working
 if [ -f /proc/sys/kernel/modprobe ]; then
-   echo "/sbin/modprobe" > /proc/sys/kernel/modprobe
+       echo "/sbin/modprobe" > /proc/sys/kernel/modprobe
 fi
 
 # If they want to run something in single user mode, might as well run it...

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 9c6b93c43817983a3592a604b1674439ed088f27..d3673cefe0af862f817249433a5f41a487ce1ad0 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -15,23 +15,23 @@ export PATH
 
 # Read network config data.
 if [ -f /etc/sysconfig/network ]; then
-    . /etc/sysconfig/network
+       . /etc/sysconfig/network
 else
-    NETWORKING=no
-    HOSTNAME=localhost
+       NETWORKING=no
+       HOSTNAME=localhost
 fi
 
 # Read system config data.
 if [ -f /etc/sysconfig/system ]; then
-    . /etc/sysconfig/system
+       . /etc/sysconfig/system
 else
-    RUN_SULOGIN_ON_ERR=yes
-    RUN_ISAPNP=yes
-    PANIC_REBOOT_TIME=0
-    DELAY_LOGIN=yes
-    CLEAN_TMP=no
-    CONSOLE_LOGLEVEL=1
-    LOAD_SOUND=yes
+       RUN_SULOGIN_ON_ERR=yes
+       RUN_ISAPNP=yes
+       PANIC_REBOOT_TIME=0
+       DELAY_LOGIN=yes
+       CLEAN_TMP=no
+       CONSOLE_LOGLEVEL=1
+       LOAD_SOUND=yes
 fi
 
 # Set console loglevel
@@ -45,14 +45,14 @@ run_cmd "Host: ${HOSTNAME}" hostname ${HOSTNAME}
 
 # Set the NIS domain name
 if [ -n "$NISDOMAIN" ]; then
-run_cmd "NIS Domain: ${NISDOMAIN}" domainname $NISDOMAIN
+       run_cmd "NIS Domain: ${NISDOMAIN}" domainname $NISDOMAIN
 else
-    domainname ""
+       domainname ""
 fi
 
 if [ -f /fsckoptions ]; then
        fsckoptions=`cat /fsckoptions`
-    else
+else
        fsckoptions=''
 fi
 
@@ -91,25 +91,25 @@ if [ ! -f /fastboot ]; then
 fi
 
 if [ -x /sbin/quotaon ]; then
-    run_cmd "Turning on quotas on root filesystem" /sbin/quotaon /
+       run_cmd "Turning on quotas on root filesystem" /sbin/quotaon /
 fi
 
 # check for arguments 
 
 mount -t proc /proc /proc
 if grep -i nopnp /proc/cmdline >/dev/null ; then
-    PNP=
+       PNP=
 else
-    PNP=yes
+       PNP=yes
 fi
 
 # set up pnp 
 if [ -x /sbin/isapnp -a -f /etc/isapnp/isapnp.conf ]; then
-    if [ -n "$PNP" ] && [ "$RUN_ISAPNP" == "yes" ]; then
-       run_cmd "Setting up ISA PNP devices"/sbin/isapnp /etc/isapnp/isapnp.conf
-    else
-       show "Skipping ISA PNP configuration"; ok
-    fi
+       if [ -n "$PNP" ] && [ "$RUN_ISAPNP" == "yes" ]; then
+               run_cmd "Setting up ISA PNP devices"/sbin/isapnp /etc/isapnp/isapnp.conf
+       else
+               show "Skipping ISA PNP configuration"; ok
+       fi
 fi
 
 # Remount the root filesystem read-write.
@@ -122,14 +122,14 @@ fi
 
 # /etc/nologin when starting system
 if [ "$DELAY_LOGIN" == "yes" ] && [ ! -f /etc/nologin ]; then
-  show "Enabling Delay Login"; busy
-  echo > /etc/nologin
-  echo "[EN] System bootup in progress  - please wait" >> /etc/nologin
-  echo "[PL] Startowanie systemu w toku - proszê czekaæ" >> /etc/nologin
-  echo >> /etc/nologin
-  chmod 644 /etc/nologin
-  cp -fp /etc/nologin /etc/nologin.boot
-  deltext; ok
+       show "Enabling Delay Login"; busy
+       echo > /etc/nologin
+       echo "[EN] System bootup in progress  - please wait" >> /etc/nologin
+       echo "[PL] Startowanie systemu w toku - proszê czekaæ" >> /etc/nologin
+       echo >> /etc/nologin
+       chmod 644 /etc/nologin
+       cp -fp /etc/nologin /etc/nologin.boot
+       deltext; ok
 fi
 
 
@@ -141,43 +141,43 @@ mount -f /
 mount -f /proc
 
 if ! grep -i nomodules /proc/cmdline >/dev/null && [ -f /proc/ksyms ]; then
-    USEMODULES=y
+       USEMODULES=y
 else
-    USEMODULES=
+       USEMODULES=
 fi
 
 # Set up kernel version-dependent symlinks.
 rm -f /lib/modules/preferred
 if [ -n "$USEMODULES" ]; then
-    ktag="`cat /proc/version`"
-    mtag="`grep -l "$ktag" /lib/modules/*/.rhkmvtag 2> /dev/null`"
-    if [ -n "$mtag" ]; then
-       mver="`echo $mtag | sed -e 's,/lib/modules/,,' -e 's,/.rhkmvtag,,' -e 's,[      ].*$,,'`"
-       ln -sf /lib/modules/$mver /lib/modules/preferred
-       ln -sf /boot/System.map-$mver /boot/System.map
-       ln -sf /boot/module-info-$mver /boot/module-info
-    fi
+       ktag="`cat /proc/version`"
+       mtag="`grep -l "$ktag" /lib/modules/*/.rhkmvtag 2> /dev/null`"
+       if [ -n "$mtag" ]; then
+               mver="`echo $mtag | sed -e 's,/lib/modules/,,' -e 's,/.rhkmvtag,,' -e 's,[      ].*$,,'`"
+               ln -sf /lib/modules/$mver /lib/modules/preferred
+               ln -sf /boot/System.map-$mver /boot/System.map
+               ln -sf /boot/module-info-$mver /boot/module-info
+       fi
 fi
 
 if [ -x /sbin/depmod -a -n "$USEMODULES" ]; then
-    # Get ready for kerneld if module support in the kernel
-    if [ -e /lib/modules/preferred ]; then
-       run_cmd "Finding module dependencies" depmod -a preferred
-    else
-       run_cmd "Finding module dependencies" depmod -a
-    fi
+       # Get ready for kerneld if module support in the kernel
+       if [ -e /lib/modules/preferred ]; then
+               run_cmd "Finding module dependencies" depmod -a preferred
+       else
+               run_cmd "Finding module dependencies" depmod -a
+       fi
 fi
 
 # load sound modules
 if  (! grep -i nomodules /proc/cmdline >/dev/null) && [ "$LOAD_SOUND" == "yes" ]; then
-    if [ -n "$USEMODULES" ]; then
-       if grep -s "alias sound" /etc/modules.conf > /dev/null ; then
-           run_cmd "Loading sound module" modprobe sound
-           if grep -s "alias midi" /etc/conf.modules > /dev/null ; then
-               run_cmd "Loading midi module" modprobe midi
-           fi
+       if [ -n "$USEMODULES" ]; then
+               if grep -s "alias sound" /etc/modules.conf > /dev/null ; then
+                       run_cmd "Loading sound module" modprobe sound
+                       if grep -s "alias midi" /etc/conf.modules > /dev/null ; then
+                               run_cmd "Loading midi module" modprobe midi
+                       fi
+               fi
        fi
-    fi
 fi
 
 if [ -f /proc/sys/kernel/modprobe ]; then
@@ -250,12 +250,12 @@ run_cmd "Mounting local filesystems." mount -a -t nonfs,smbfs,ncpfs,proc
 
 # set the console font
 if [ -x /sbin/setsysfont ]; then
-    show "Loading default system font"; busy
-    if (/sbin/setsysfont > /dev/null 2>&1); then deltext; ok; else deltext; fail; fi
+       show "Loading default system font"; busy
+       if (/sbin/setsysfont > /dev/null 2>&1); then deltext; ok; else deltext; fail; fi
 fi
 
 if [ -x /sbin/quotaon ]; then
-    run_cmd "Turning on quotas for local filesystems" /sbin/quotaon -a
+       run_cmd "Turning on quotas for local filesystems" /sbin/quotaon -a
 fi
 
 # Clean out /etc & /var/{run/*,log/{b,w}tmpx}}.
@@ -265,13 +265,9 @@ rm -f /var/run/utmp
 chown root.utmpx /var/run/utmpx
 chmod 0664 /var/run/utmpx /var/log/wtmpx
 
-# Uncomment if you planing to run `utmpd'
-#:>/var/log/wtmp
-#:>/var/run/utmp
-
 # Clean /tmp
 if [ "$CLEAN_TMP" == "yes" ]; then
-rm -rf /tmp/*
+       rm -rf /tmp/*
 fi
 
 # Delete UUCP lock files.
@@ -296,36 +292,36 @@ show "Setting clock"; busy
 ARC=0
 UTC=0
 if [ -f /etc/sysconfig/clock ]; then
-    . /etc/sysconfig/clock
+       . /etc/sysconfig/clock
 
-    # convert old style clock config to new values
-    if [ "${CLOCKMODE}" = "GMT" ]; then
-           UTC=true
-    elif [ "${CLOCKMODE}" = "ARC" ]; then
+       # convert old style clock config to new values
+       if [ "${CLOCKMODE}" = "GMT" ]; then
+               UTC=true
+       elif [ "${CLOCKMODE}" = "ARC" ]; then
            ARC=true
-    fi
+       fi
 fi
 
 if [ -x /sbin/hwclock ]; then
-    CLOCKFLAGS="--hctosys"
-    CLOCK=/sbin/hwclock
+       CLOCKFLAGS="--hctosys"
+       CLOCK=/sbin/hwclock
 else
-    CLOCKFLAGS="-a"
-    CLOCK=/sbin/clock
+       CLOCKFLAGS="-a"
+       CLOCK=/sbin/clock
 fi
 
 case "$UTC" in
   yes|true)
-    CLOCKFLAGS="$CLOCKFLAGS -u";
-#    echo -n " (utc)"
-  ;;
+       CLOCKFLAGS="$CLOCKFLAGS -u";
+#      echo -n " (utc)"
+       ;;
 esac
 
 case "$ARC" in
   yes|true)
-    CLOCKFLAGS="$CLOCKFLAGS -A";
-#   echo -n " (arc)"
-  ;;
+       CLOCKFLAGS="$CLOCKFLAGS -A";
+#      echo -n " (arc)"
+       ;;
 esac
 
 #echo -n ": "
@@ -336,7 +332,10 @@ show "Date set to `date`"; ok
 # Right, now turn on swap in case we swap to files.
 show "Enabling swap space"; busy
 if [ "`LANG=C swapon -a 2>&1 | grep -v "busy"`" == "" ]; then
-deltext; ok; else deltext; fail; fi
+       deltext; ok
+else
+       deltext; fail
+fi
 
 # Initialize the serial ports.
 if [ -f /etc/rc.d/rc.serial ]; then
@@ -348,8 +347,8 @@ fi
 if [ -f /proc/scsi/scsi ] && cat /proc/scsi/scsi | grep -q 'Type:   Sequential-Access' 2>/dev/null ; then
        if cat /proc/devices | grep -qv ' 9 st' ; then
                if [ -n "$USEMODULES" ] ; then
-                   # Try to load the module.  If it fails, ignore it...
-                   insmod -p st >/dev/null 2>&1 && modprobe st >/dev/null 2>&1
+                       # Try to load the module.  If it fails, ignore it...
+                       insmod -p st >/dev/null 2>&1 && modprobe st >/dev/null 2>&1
                fi
        fi
 fi
@@ -377,4 +376,3 @@ chmod 640 /var/log/dmesg
 
 # Feed entropy into the entropy pool
 /etc/rc.d/init.d/random start
-