Author: jhuntwork
Date: 2005-03-30 10:40:46 -0700 (Wed, 30 Mar 2005)
New Revision: 4815

Added:
   trunk/bootscripts/lfs/init.d/sysklogd
Removed:
   trunk/bootscripts/lfs/init.d/syslog-ng
Modified:
   trunk/bootscripts/CHANGELOG
   trunk/bootscripts/Makefile
   trunk/bootscripts/lfs/init.d/functions
Log:
Changed syslog-ng bootscript to sysklogd - This needs to be merged to released 
bootscripts

Modified: trunk/bootscripts/CHANGELOG
===================================================================
--- trunk/bootscripts/CHANGELOG 2005-03-30 17:31:03 UTC (rev 4814)
+++ trunk/bootscripts/CHANGELOG 2005-03-30 17:40:46 UTC (rev 4815)
@@ -1,3 +1,6 @@
+n/a - March 30, 2005
+       * Changed from syslog-ng to sysklogd (Archaic)
+
 n/a - March 19, 2005
        * Updated RaQ2 patch (Jim Gifford)
        * Added net.agent for Hotplug of Network adapters in contrib

Modified: trunk/bootscripts/Makefile
===================================================================
--- trunk/bootscripts/Makefile  2005-03-30 17:31:03 UTC (rev 4814)
+++ trunk/bootscripts/Makefile  2005-03-30 17:40:46 UTC (rev 4815)
@@ -38,13 +38,13 @@
        install -m ${MODE} lfs/init.d/reboot        ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} lfs/init.d/sendsignals   ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} lfs/init.d/setclock      ${EXTDIR}/rc.d/init.d/
-       install -m ${MODE} lfs/init.d/syslog-ng     ${EXTDIR}/rc.d/init.d/
+       install -m ${MODE} lfs/init.d/sysklogd      ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} lfs/init.d/swap          ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} lfs/init.d/sysctl        ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} lfs/init.d/template      ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} lfs/init.d/udev          ${EXTDIR}/rc.d/init.d/
        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc0.d/K80network
-       ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc0.d/K90syslog-ng
+       ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc0.d/K90sysklogd
        ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rc0.d/S50hotplug
        ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
        ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc0.d/S70mountfs
@@ -52,17 +52,17 @@
        ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rc0.d/S90localnet
        ln -sf ../init.d/halt        ${EXTDIR}/rc.d/rc0.d/S99halt
        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc1.d/K80network
-       ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc1.d/K90syslog-ng
+       ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc1.d/K90sysklogd
        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc2.d/K80network
-       ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc2.d/K90syslog-ng
-       ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc3.d/S10syslog-ng
+       ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc2.d/K90sysklogd
+       ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc3.d/S10sysklogd
        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc3.d/S20network
-       ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc4.d/S10syslog-ng
+       ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc4.d/S10sysklogd
        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc4.d/S20network
-       ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc5.d/S10syslog-ng
+       ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc5.d/S10sysklogd
        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc5.d/S20network
        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc6.d/K80network
-       ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc6.d/K90syslog-ng
+       ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc6.d/K90sysklogd
        ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rc6.d/S50hotplug
        ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
        ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc6.d/S70mountfs
@@ -112,7 +112,7 @@
        install -m ${MODE} lfs/init.d/sendsignals   ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} lfs/init.d/setclock      ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} lfs/init.d/sysctl        ${EXTDIR}/rc.d/init.d/
-       install -m ${MODE} lfs/init.d/syslog-ng     ${EXTDIR}/rc.d/init.d/
+       install -m ${MODE} lfs/init.d/sysklogd      ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} contrib/livecd/startup   ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} contrib/livecd/mountsqfs ${EXTDIR}/rc.d/init.d/
        install -m ${MODE} contrib/livecd/network   ${EXTDIR}/rc.d/init.d/

Modified: trunk/bootscripts/lfs/init.d/functions
===================================================================
--- trunk/bootscripts/lfs/init.d/functions      2005-03-30 17:31:03 UTC (rev 
4814)
+++ trunk/bootscripts/lfs/init.d/functions      2005-03-30 17:40:46 UTC (rev 
4815)
@@ -87,7 +87,7 @@
 #               information to be passed to a bootup log and for better
 #               formatting of text sent to the screen.  The logging support
 #               now pushes messages to the local2 service which is now
-#               configured by LFS defalut in syslog-ng.conf.  This also 
+#               configured by LFS default in syslog.conf.  This also 
 #               requires that /usr/bin/logger be moved to /bin.
 #               Support for parallel bootscripts is not added *yet*...
 
#*******************************************************************************

Copied: trunk/bootscripts/lfs/init.d/sysklogd (from rev 4813, 
trunk/bootscripts/lfs/init.d/syslog-ng)
===================================================================
--- trunk/bootscripts/lfs/init.d/syslog-ng      2005-03-29 19:59:35 UTC (rev 
4813)
+++ trunk/bootscripts/lfs/init.d/sysklogd       2005-03-30 17:40:46 UTC (rev 
4815)
@@ -0,0 +1,57 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/sysklogd
+#
+# Description : Sysklogd loader
+#
+# Authors     : Gerard Beekmans - [EMAIL PROTECTED]
+#
+# Version     : 00.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+       start)
+               boot_mesg "Starting system log daemon..."
+               loadproc syslogd -m 0
+
+               boot_mesg "Starting kernel log daemon..."
+               loadproc klogd
+               ;;
+
+       stop)
+               boot_mesg "Stopping kernel log daemon..."
+               killproc klogd
+
+               boot_mesg "Stopping system log daemon..."
+               killproc syslogd
+               ;;
+
+       reload)
+               boot_mesg "Reloading system log daemon config file..."
+               reloadproc syslogd 1
+               ;;
+
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       status)
+               statusproc syslogd
+               statusproc klogd
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|reload|restart|status}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/sysklogd

Deleted: trunk/bootscripts/lfs/init.d/syslog-ng
===================================================================
--- trunk/bootscripts/lfs/init.d/syslog-ng      2005-03-30 17:31:03 UTC (rev 
4814)
+++ trunk/bootscripts/lfs/init.d/syslog-ng      2005-03-30 17:40:46 UTC (rev 
4815)
@@ -1,50 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/syslog-ng
-#
-# Description : Syslog-ng loader
-#
-# Authors     : Gerard Beekmans - [EMAIL PROTECTED]
-#
-# Version     : 00.00
-#
-# Notes       :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
-       start)
-               boot_mesg "Starting system log daemon..."
-               loadproc syslog-ng
-               ;;
-
-       stop)
-               boot_mesg "Stopping system log daemon..."
-               killproc syslog-ng
-               ;;
-
-       reload)
-               boot_mesg "Reloading system log daemon config file..."
-               reloadproc syslog-ng 1
-               ;;
-
-       restart)
-               ${0} stop
-               sleep 1
-               ${0} start
-               ;;
-
-       status)
-               statusproc syslog-ng
-               ;;
-
-       *)
-               echo "Usage: ${0} {start|stop|reload|restart|status}"
-               exit 1
-               ;;
-esac
-
-# End $rc_base/init.d/syslog-ng

-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page

Reply via email to