[Astlinux-commits] SF.net SVN: astlinux:[6173] branches/1.0/project/astlinux/target_skeleton/ etc

[<abe...@us...>]

Revision: 6173
          http://sourceforge.net/p/astlinux/code/6173
Author:   abelbeck
Date:     2013-08-20 21:59:14 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
syslogd, add new netsyslogd service to handle SYSLOGHOST remote syslog when defined, the syslogd service is now local only, move syslogd earlier so network can log to syslog - such as udhcpc and ifplugd

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/syslogd

Added Paths:
-----------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/netsyslogd
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K88netsyslogd
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K92syslogd
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S02syslogd
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S11netsyslogd

Removed Paths:
-------------
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K27syslogd
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S08syslogd

Modified: branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action	2013-08-15 01:35:01 UTC (rev 6172)
+++ branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action	2013-08-20 21:59:14 UTC (rev 6173)
@@ -16,13 +16,11 @@
 
   up)
     kill_udhcpc
-    udhcpc -b -s /etc/udhcpc.script -H $(uname -n) -p /var/run/udhcpc-${interface}.pid -i ${interface}
-    logger -t udhcpc.action -p kern.info "udhcp up: ${interface}"
+    udhcpc -b -T2 -t6 -S -s /etc/udhcpc.script -H $(uname -n) -p /var/run/udhcpc-${interface}.pid -i ${interface}
     ;;
 
   down)
     kill_udhcpc
-    logger -t udhcpc.action -p kern.info "udhcp down: ${interface}"
     ;;
 
 esac

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc	2013-08-15 01:35:01 UTC (rev 6172)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc	2013-08-20 21:59:14 UTC (rev 6173)
@@ -7,6 +7,9 @@
 
 init () {
 
+  # Setup Hostname
+  hostname "$HOSTNAME"
+
   if [ -n "$VI_EDITOR_OPTIONS" ]; then
     echo -e "$VI_EDITOR_OPTIONS" > /root/.exrc
   fi

Added: branches/1.0/project/astlinux/target_skeleton/etc/init.d/netsyslogd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/netsyslogd	                        (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/netsyslogd	2013-08-20 21:59:14 UTC (rev 6173)
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+# Gracefully exit if remote logging is not enabled.
+if [ -z "$SYSLOGHOST" ]; then
+  exit 0
+fi
+
+PIDFILE="/var/run/syslogd.pid"
+
+restart () {
+  local action="$1" LOGSIZE NLOGS
+
+  if [ "$PERSISTLOG" = "yes" ]; then
+    LOGSIZE=10240
+    NLOGS=5
+  else
+    LOGSIZE=1024
+    NLOGS=2
+  fi
+
+  if [ -f $PIDFILE ]; then
+    kill $(cat $PIDFILE) >/dev/null 2>&1
+    sleep 1
+  fi
+  if [ "$action" = "remote" ]; then
+    echo "Starting Remote syslogd..."
+    syslogd -s $LOGSIZE -m 60 -b $NLOGS -L -R "$SYSLOGHOST"
+  else
+    echo "Stopping Remote syslogd..."
+    syslogd -s $LOGSIZE -m 60 -b $NLOGS
+  fi
+}
+
+case $1 in 
+
+start)
+  restart remote
+  ;;
+
+stop)
+  restart local
+  ;;
+
+init)
+  restart remote
+  ;;
+
+restart)
+  restart remote
+  ;;
+
+*)
+  echo "Usage start|stop|restart"
+  ;;
+
+esac


Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/init.d/netsyslogd
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2013-08-15 01:35:01 UTC (rev 6172)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2013-08-20 21:59:14 UTC (rev 6173)
@@ -179,9 +179,6 @@
 start () {
   local IF
 
-  # set hostname
-  hostname "$HOSTNAME"
-
   # IPv6
   if [ "$IPV6" = "yes" ]; then
     modprobe ipv6
@@ -499,8 +496,8 @@
 
   #DHCP
   if [ -n "$EXTIF" -a -z "$EXTIP" ] && ! isextppp extif; then
-    udhcpc -b -T2 -t6 -s /etc/udhcpc.script -H $HOSTNAME -p /var/run/udhcpc-$EXTIF.pid -i $EXTIF
-    ifplugd -apqs -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/udhcpc.action
+    udhcpc -b -T2 -t6 -S -s /etc/udhcpc.script -H $HOSTNAME -p /var/run/udhcpc-$EXTIF.pid -i $EXTIF
+    ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/udhcpc.action
 
     # No DHCPv6 - Static IPv6 if defined
     if [ "$IPV6" = "yes" -a -n "$EXTIPV6" -a -n "$EXTGWIPV6" ]; then
@@ -511,8 +508,8 @@
 
   #DHCP
   if [ -n "$EXT2IF" -a -z "$EXT2IP" ] && ! isextppp ext2if; then
-    udhcpc -b -T2 -t6 -s /etc/udhcpc.script -H $HOSTNAME -p /var/run/udhcpc-$EXT2IF.pid -i $EXT2IF
-    ifplugd -apqs -t2 -u3 -d3 -i $EXT2IF -r /etc/ifplugd/udhcpc.action
+    udhcpc -b -T2 -t6 -S -s /etc/udhcpc.script -H $HOSTNAME -p /var/run/udhcpc-$EXT2IF.pid -i $EXT2IF
+    ifplugd -apq -t2 -u3 -d3 -i $EXT2IF -r /etc/ifplugd/udhcpc.action
 
     # No DHCPv6 - Static IPv6 if defined
     if [ "$IPV6" = "yes" -a -n "$EXT2IPV6" -a -n "$EXT2GWIPV6" ]; then

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/syslogd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/syslogd	2013-08-15 01:35:01 UTC (rev 6172)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/syslogd	2013-08-20 21:59:14 UTC (rev 6173)
@@ -2,29 +2,30 @@
 
 . /etc/rc.conf
 
+PIDFILE="/var/run/syslogd.pid"
+
 start () {
-  local -i LOGSIZE=1 NLOGS=2
+  local LOGSIZE NLOGS
 
   if [ "$PERSISTLOG" = "yes" ]; then
-    LOGSIZE=10
+    LOGSIZE=10240
     NLOGS=5
+  else
+    LOGSIZE=1024
+    NLOGS=2
   fi
 
-  let LOGSIZE*=1024
-
   echo "Starting syslogd..."
-  if [ -n "$SYSLOGHOST" ]; then
-    /sbin/syslogd -s $LOGSIZE -m 60 -b $NLOGS -L -R "$SYSLOGHOST"
-  else
-    /sbin/syslogd -s $LOGSIZE -m 60 -b $NLOGS
-  fi
+  syslogd -s $LOGSIZE -m 60 -b $NLOGS
   klogd
 }
 
 stop () {
-  if ps | grep -q -e '[ /]syslogd[ ]' -e '[ /]syslogd$'; then
+  if [ -f $PIDFILE ]; then
     echo "Stopping syslogd..."
-    killall syslogd >/dev/null 2>&1
+    kill $(cat $PIDFILE) >/dev/null 2>&1
+    rm -f $PIDFILE
+
     killall klogd >/dev/null 2>&1
   fi
 }

Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K27syslogd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K27syslogd	2013-08-15 01:35:01 UTC (rev 6172)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K27syslogd	2013-08-20 21:59:14 UTC (rev 6173)
@@ -1 +0,0 @@
-link ../../init.d/syslogd
\ No newline at end of file

Added: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K88netsyslogd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K88netsyslogd	                        (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K88netsyslogd	2013-08-20 21:59:14 UTC (rev 6173)
@@ -0,0 +1 @@
+link ../../init.d/netsyslogd
\ No newline at end of file


Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K88netsyslogd
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Copied: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K92syslogd (from rev 6172, branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K27syslogd)
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K92syslogd	                        (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K92syslogd	2013-08-20 21:59:14 UTC (rev 6173)
@@ -0,0 +1 @@
+link ../../init.d/syslogd
\ No newline at end of file

Copied: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S02syslogd (from rev 6172, branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S08syslogd)
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S02syslogd	                        (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S02syslogd	2013-08-20 21:59:14 UTC (rev 6173)
@@ -0,0 +1 @@
+link ../../init.d/syslogd
\ No newline at end of file

Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S08syslogd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S08syslogd	2013-08-15 01:35:01 UTC (rev 6172)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S08syslogd	2013-08-20 21:59:14 UTC (rev 6173)
@@ -1 +0,0 @@
-link ../../init.d/syslogd
\ No newline at end of file

Added: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S11netsyslogd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S11netsyslogd	                        (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S11netsyslogd	2013-08-20 21:59:14 UTC (rev 6173)
@@ -0,0 +1 @@
+link ../../init.d/netsyslogd
\ No newline at end of file


Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S11netsyslogd
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.