r877 - in trunk: hlfs lfs-bootscripts

archaic at linuxfromscratch.org archaic at linuxfromscratch.org
Sat Mar 19 17:17:36 PST 2005


Author: archaic
Date: 2005-03-19 18:17:35 -0700 (Sat, 19 Mar 2005)
New Revision: 877

Added:
   trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-3.patch
   trunk/lfs-bootscripts/lfs-bootscripts-3.1.0-hlfs-3.patch
Removed:
   trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-2.patch
Log:
Updated lfs-bootscript patch for hlfs.

Deleted: trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-2.patch
===================================================================
--- trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-2.patch	2005-03-19 22:14:37 UTC (rev 876)
+++ trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-2.patch	2005-03-20 01:17:35 UTC (rev 877)
@@ -1,20 +0,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
-Date: 2005-01-23
-Initial Package Version: 3.1.0
-Upstream Status: Not submitted.
-Origin: None
-Description: This patch adds options to syslog-ng so it runs in chroot as
-a regular user.
-
-diff -Naur lfs-bootscripts-3.1.0.orig/lfs/init.d/syslog-ng lfs-bootscripts-3.1.0/lfs/init.d/syslog-ng
---- lfs-bootscripts-3.1.0.orig/lfs/init.d/syslog-ng	2005-01-23 10:46:53.465743516 +0000
-+++ lfs-bootscripts-3.1.0/lfs/init.d/syslog-ng	2005-01-24 01:03:26.504972063 +0000
-@@ -18,7 +18,7 @@
- case "${1}" in
- 	start)
- 		boot_mesg "Starting system log daemon..."
--		loadproc syslog-ng
-+		loadproc syslog-ng -C /var/log -u syslog -g syslog
- 		;;
- 
- 	stop)

Added: trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-3.patch
===================================================================
--- trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-3.patch	2005-03-19 22:14:37 UTC (rev 876)
+++ trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-3.patch	2005-03-20 01:17:35 UTC (rev 877)
@@ -0,0 +1,152 @@
+Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
+Date: 2005-03-19
+Initial Package Version: 3.1.0
+Upstream Status: Not submitted.
+Origin: lfs-bootscripts-2.0.5
+Description: This patch replaces syslog-ng with sysklogd.
+
+diff -Naur lfs-bootscripts-3.1.0.orig/Makefile lfs-bootscripts-3.1.0/Makefile
+--- lfs-bootscripts-3.1.0.orig/Makefile	2005-01-23 10:46:53.469742394 +0000
++++ lfs-bootscripts-3.1.0/Makefile	2005-01-23 10:47:48.521305631 +0000
+@@ -38,12 +38,12 @@
+ 	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/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
+@@ -51,17 +51,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
+diff -Naur lfs-bootscripts-3.1.0.orig/lfs/init.d/sysklogd lfs-bootscripts-3.1.0/lfs/init.d/sysklogd
+--- lfs-bootscripts-3.1.0.orig/lfs/init.d/sysklogd	1970-01-01 00:00:00.000000000 +0000
++++ lfs-bootscripts-3.1.0/lfs/init.d/sysklogd	2005-01-23 11:25:58.335469735 +0000
+@@ -0,0 +1,45 @@
++#!/bin/sh
++# Begin $rc_base/init.d/sysklogd - Syslogd and Klogd loaders
++
++# Based on sysklogd script from LFS-3.1 and earlier.
++# Rewritten by Gerard Beekmans  - gerard at linuxfromscratch.org
++# Modified by Robert Connolly for HLFS.
++
++. /etc/sysconfig/rc
++. $rc_functions
++
++case "$1" in
++	start)
++		echo "Starting system log daemon..."
++		loadproc syslogd -m 0
++
++		echo "Starting kernel log daemon..."
++		loadproc klogd
++		;;
++
++	stop)
++		echo "Stopping kernel log daemon..."
++		killproc klogd
++
++		echo "Stopping system log daemon..."
++		killproc syslogd
++		;;
++
++	restart)
++		$0 stop
++		sleep 1
++		$0 start
++		;;
++
++	status)
++		statusproc syslogd
++		statusproc klogd
++		;;
++
++	*)
++		echo "Usage: $0 {start|stop|restart|status}"
++		exit 1
++		;;
++esac
++
++# End $rc_base/init.d/sysklogd
+diff -Naur lfs-bootscripts-3.1.0.orig/lfs/init.d/syslog-ng lfs-bootscripts-3.1.0/lfs/init.d/syslog-ng
+--- lfs-bootscripts-3.1.0.orig/lfs/init.d/syslog-ng	2005-01-23 10:46:53.465743516 +0000
++++ lfs-bootscripts-3.1.0/lfs/init.d/syslog-ng	1970-01-01 00:00:00.000000000 +0000
+@@ -1,50 +0,0 @@
+-#!/bin/sh
+-########################################################################
+-# Begin $rc_base/init.d/syslog-ng
+-#
+-# Description : Syslog-ng loader
+-#
+-# Authors     : Gerard Beekmans - gerard at linuxfromscratch.org
+-#
+-# 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

Added: trunk/lfs-bootscripts/lfs-bootscripts-3.1.0-hlfs-3.patch
===================================================================
--- trunk/lfs-bootscripts/lfs-bootscripts-3.1.0-hlfs-3.patch	2005-03-19 22:14:37 UTC (rev 876)
+++ trunk/lfs-bootscripts/lfs-bootscripts-3.1.0-hlfs-3.patch	2005-03-20 01:17:35 UTC (rev 877)
@@ -0,0 +1 @@
+link ../hlfs/lfs-bootscripts-3.1.0-hlfs-3.patch
\ No newline at end of file


Property changes on: trunk/lfs-bootscripts/lfs-bootscripts-3.1.0-hlfs-3.patch
___________________________________________________________________
Name: svn:special
   + *




More information about the patches mailing list