|
From: <abe...@us...> - 2011-11-04 17:00:23
|
Revision: 5248
http://astlinux.svn.sourceforge.net/astlinux/?rev=5248&view=rev
Author: abelbeck
Date: 2011-11-04 17:00:17 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
/etc/init.d/local, add support for /mnt/kd/rc.local.stop, if exists and executable will be one of the first scripts to run when the box is restarted or halted.
Useful for stashing away logs, etc.
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/local
Added Paths:
-----------
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01local
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/local
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/local 2011-11-03 21:34:01 UTC (rev 5247)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/local 2011-11-04 17:00:17 UTC (rev 5248)
@@ -18,7 +18,10 @@
}
stop () {
- :
+
+ if [ -x /mnt/kd/rc.local.stop ]; then
+ /mnt/kd/rc.local.stop
+ fi
}
case $1 in
Added: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01local
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01local (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01local 2011-11-04 17:00:17 UTC (rev 5248)
@@ -0,0 +1 @@
+link ../../init.d/local
\ No newline at end of file
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01local
___________________________________________________________________
Added: svn:special
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-11-21 15:00:01
|
Revision: 5773
http://astlinux.svn.sourceforge.net/astlinux/?rev=5773&view=rev
Author: abelbeck
Date: 2012-11-21 14:59:53 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
more cleanup, remove unused runlevels, Thanks Michael
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/template
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K01zaptel
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K12tftpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K13mini_httpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K15dhcpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K16named
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S01zaptel
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S21named
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S22dhcpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S56tftpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S80mini_httpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01nistnet
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K02openser
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K04iaxmodem
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K06nprobe
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K12tftpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K13mini_httpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K15dhcpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K16named
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K81hostapd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K92wifi
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K93zaptel
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K98pcmcia
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S00pcmcia
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S01zaptel
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S02wifi
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S12hostapd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S21named
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S22dhcpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S56tftpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S58openser
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S61iaxmodem
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S80mini_httpd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S93nprobe
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S95nistnet
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/init.d/template
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/template 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/template 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-. /etc/rc.conf
-
-init () {
-}
-
-start () {
-}
-
-stop () {
-}
-
-case $1 in
-
-start)
- start
- ;;
-
-stop)
- stop
- ;;
-
-init)
- init
- start
- ;;
-
-restart)
- stop
- sleep 2
- start
- ;;
-
-*)
- echo "Usage: start|stop|restart"
- ;;
-
-esac
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K01zaptel
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K01zaptel 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K01zaptel 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/zaptel
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K12tftpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K12tftpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K12tftpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/tftpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K13mini_httpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K13mini_httpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K13mini_httpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/mini_httpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K15dhcpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K15dhcpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K15dhcpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/dhcpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K16named
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K16named 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/K16named 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/named
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S01zaptel
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S01zaptel 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S01zaptel 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/zaptel
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S21named
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S21named 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S21named 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/named
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S22dhcpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S22dhcpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S22dhcpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/dhcpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S56tftpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S56tftpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S56tftpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/tftpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S80mini_httpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S80mini_httpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/custom/S80mini_httpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/mini_httpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01nistnet
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01nistnet 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01nistnet 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/nistnet
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K02openser
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K02openser 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K02openser 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/openser
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K04iaxmodem
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K04iaxmodem 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K04iaxmodem 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/iaxmodem
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K06nprobe
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K06nprobe 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K06nprobe 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/nprobe
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K12tftpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K12tftpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K12tftpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/tftpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K13mini_httpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K13mini_httpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K13mini_httpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/mini_httpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K15dhcpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K15dhcpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K15dhcpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/dhcpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K16named
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K16named 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K16named 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/named
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K81hostapd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K81hostapd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K81hostapd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/hostapd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K92wifi
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K92wifi 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K92wifi 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/wifi
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K93zaptel
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K93zaptel 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K93zaptel 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/zaptel
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K98pcmcia
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K98pcmcia 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K98pcmcia 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/pcmcia
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S00pcmcia
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S00pcmcia 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S00pcmcia 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/pcmcia
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S01zaptel
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S01zaptel 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S01zaptel 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/zaptel
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S02wifi
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S02wifi 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S02wifi 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/wifi
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S12hostapd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S12hostapd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S12hostapd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/hostapd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S21named
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S21named 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S21named 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/named
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S22dhcpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S22dhcpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S22dhcpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/dhcpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S56tftpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S56tftpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S56tftpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/tftpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S58openser
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S58openser 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S58openser 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/openser
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S61iaxmodem
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S61iaxmodem 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S61iaxmodem 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/iaxmodem
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S80mini_httpd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S80mini_httpd 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S80mini_httpd 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/mini_httpd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S93nprobe
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S93nprobe 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S93nprobe 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/nprobe
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S95nistnet
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S95nistnet 2012-11-20 22:11:54 UTC (rev 5772)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S95nistnet 2012-11-21 14:59:53 UTC (rev 5773)
@@ -1 +0,0 @@
-link ../../init.d/nistnet
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-06 20:32:39
|
Revision: 5870
http://astlinux.svn.sourceforge.net/astlinux/?rev=5870&view=rev
Author: abelbeck
Date: 2013-01-06 20:32:33 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
add 'prosody' user and group
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/group
branches/1.0/project/astlinux/target_skeleton/etc/passwd
Modified: branches/1.0/project/astlinux/target_skeleton/etc/group
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/group 2013-01-06 06:39:43 UTC (rev 5869)
+++ branches/1.0/project/astlinux/target_skeleton/etc/group 2013-01-06 20:32:33 UTC (rev 5870)
@@ -12,5 +12,6 @@
audio:x:29:
video:x:44:
users:x:100:
+prosody:x:130:
zabbix:x:906:
nobody:x:65535:
Modified: branches/1.0/project/astlinux/target_skeleton/etc/passwd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/passwd 2013-01-06 06:39:43 UTC (rev 5869)
+++ branches/1.0/project/astlinux/target_skeleton/etc/passwd 2013-01-06 20:32:33 UTC (rev 5870)
@@ -1,5 +1,6 @@
root:x:0:0:root:/root:/bin/sh
sshd:x:22:22:sshd:/dev/null:/bin/false
ftp:x:21:21:ftp user:/home/ftp:/bin/false
+prosody:x:130:130:XMPP-server:/etc/prosody/data:/bin/false
zabbix:x:906:906:Zabbix User:/dev/null:/bin/false
nobody:x:1000:1000:no one:/dev/null:/bin/false
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-28 16:32:57
|
Revision: 5932
http://astlinux.svn.sourceforge.net/astlinux/?rev=5932&view=rev
Author: abelbeck
Date: 2013-01-28 16:32:44 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
Propagate new 'prosody' user to /etc/shadow and /etc/shadow-
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/shadow
branches/1.0/project/astlinux/target_skeleton/etc/shadow-
Modified: branches/1.0/project/astlinux/target_skeleton/etc/shadow
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/shadow 2013-01-23 16:27:51 UTC (rev 5931)
+++ branches/1.0/project/astlinux/target_skeleton/etc/shadow 2013-01-28 16:32:44 UTC (rev 5932)
@@ -1,5 +1,6 @@
root:$1$$axJeFIpwicqOTwFpuoUAs1:12215:0:99999:7:::
sshd:!:0:0:99999:7:::
ftp:!:0:0:99999:7:::
+prosody:!:0:0:99999:7:::
zabbix:!:0:0:99999:7:::
nobody:!:0:0:99999:7:::
Modified: branches/1.0/project/astlinux/target_skeleton/etc/shadow-
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/shadow- 2013-01-23 16:27:51 UTC (rev 5931)
+++ branches/1.0/project/astlinux/target_skeleton/etc/shadow- 2013-01-28 16:32:44 UTC (rev 5932)
@@ -1,5 +1,6 @@
root:$1$$axJeFIpwicqOTwFpuoUAs1:12215:0:99999:7:::
sshd:!:0:0:99999:7:::
ftp:!:0:0:99999:7:::
+prosody:!:0:0:99999:7:::
zabbix:!:0:0:99999:7:::
nobody:!:0:0:99999:7:::
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-08-20 21:59:18
|
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.
|
|
From: <abe...@us...> - 2014-10-03 23:51:59
|
Revision: 6746
http://sourceforge.net/p/astlinux/code/6746
Author: abelbeck
Date: 2014-10-03 23:51:54 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
Set the root user shell to /bin/bash so it does not depend on what /bin/sh points to, additionally automatically update the root passwd entry if /etc/passwd is edited and on asturw via the FIRSTRUN script.
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
branches/1.0/project/astlinux/target_skeleton/etc/passwd
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN 2014-10-03 17:38:12 UTC (rev 6745)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN 2014-10-03 23:51:54 UTC (rev 6746)
@@ -36,6 +36,17 @@
done
}
+update_root_passwd_default()
+{
+ local base="$1" current
+
+ current="$(grep "^root:" "${base}/etc/passwd")"
+ if [ -n "$current" -a "$current" != "$(grep "^root:" "/etc/passwd")" ]; then
+ sed -i -e "s|^root:.*$|${current}|" "/etc/passwd"
+ echo "FIRSTRUN: Updated system default 'root' user in '/etc/passwd'"
+ fi
+}
+
init () {
local new old=""
@@ -61,9 +72,11 @@
if [ -d /oldroot/mnt/asturo ]; then
add_system_default_users /oldroot/mnt/asturo
update_system_default_users /oldroot/mnt/asturo
+ update_root_passwd_default /oldroot/mnt/asturo
elif [ -d /oldroot/image ]; then
add_system_default_users /oldroot/image
update_system_default_users /oldroot/image
+ update_root_passwd_default /oldroot/image
fi
case $old in
Modified: branches/1.0/project/astlinux/target_skeleton/etc/passwd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/passwd 2014-10-03 17:38:12 UTC (rev 6745)
+++ branches/1.0/project/astlinux/target_skeleton/etc/passwd 2014-10-03 23:51:54 UTC (rev 6746)
@@ -1,4 +1,4 @@
-root:x:0:0:root:/root:/bin/sh
+root:x:0:0:root:/root:/bin/bash
sshd:x:22:22:sshd:/dev/null:/bin/false
ftp:x:21:21:ftp user:/home/ftp:/bin/false
prosody:x:130:130:XMPP-server:/etc/prosody/data:/bin/false
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-02 15:51:28
|
Revision: 7302
http://sourceforge.net/p/astlinux/code/7302
Author: abelbeck
Date: 2015-11-02 15:51:26 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
dhcpv6, add support for [IPv4/DHCPv6], seems some ISP's will do this to pull static prefixes on business accounts
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
Added Paths:
-----------
branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/dhcp6c.action
Added: branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/dhcp6c.action
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/dhcp6c.action (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/dhcp6c.action 2015-11-02 15:51:26 UTC (rev 7302)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+interface="$1"
+
+action="$2"
+
+kill_dhcp6c()
+{
+ if [ -f "/var/run/dhcp6c-${interface}.pid" ]; then
+ kill $(cat "/var/run/dhcp6c-${interface}.pid") 2>/dev/null
+ sleep 1
+ fi
+}
+
+case $action in
+
+ up)
+ if [ -f "/etc/wide-dhcpv6/dhcp6c-${interface}.conf" ]; then
+ kill_dhcp6c
+ dhcp6c -c /etc/wide-dhcpv6/dhcp6c-${interface}.conf -p /var/run/dhcp6c-${interface}.pid ${interface}
+ fi
+ ;;
+
+ down)
+ kill_dhcp6c
+ ;;
+
+esac
+
+exit 0
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/dhcp6c.action
___________________________________________________________________
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 2015-11-01 23:55:07 UTC (rev 7301)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-11-02 15:51:26 UTC (rev 7302)
@@ -540,38 +540,7 @@
rm -f /tmp/etc/ppp/pppoe.conf
fi
- #Static IP
- if [ -n "$EXTIP" -a -n "$EXTIF" ] && ! isextppp extif; then
-
- case $EXTIF in
- wp)
- ;;
- hdlc0|pvc0)
- ip tunnel add $EXTIF mode ipip remote $EXTGW local $EXTIP
- ip link set dev $EXTIF up
- ;;
- *)
- ip addr add $EXTIP/$EXTNM brd + dev $EXTIF
- if [ -n "$EXTIP_ALIAS" ]; then
- alias_interface add $EXTIF "$EXTIP_ALIAS"
- fi
- if [ "$IPV6" = "yes" -a -n "$EXTIPV6" ]; then
- ip -6 addr add $EXTIPV6 dev $EXTIF
- fi
- ip link set dev $EXTIF up
- ;;
- esac
-
- if [ -n "$EXTGW" ]; then
- ip route add default via $EXTGW dev $EXTIF
- fi
- if [ "$IPV6" = "yes" -a -n "$EXTGWIPV6" ]; then
- ip -6 route add default via $EXTGWIPV6 dev $EXTIF metric 1
- fi
- #end static IP
- fi
-
- #Static IP on 2nd IF
+ #Static IP Failover Interface
if [ -n "$EXT2IP" -a -n "$EXT2IF" ] && ! isextppp ext2if; then
case $EXT2IF in
@@ -582,14 +551,24 @@
ip link set dev $EXT2IF up
;;
*)
+ up_delay=0
ip addr add $EXT2IP/$EXT2NM brd + dev $EXT2IF
if [ -n "$EXT2IP_ALIAS" ]; then
alias_interface add $EXT2IF "$EXT2IP_ALIAS"
fi
- if [ "$IPV6" = "yes" -a -n "$EXT2IPV6" ]; then
- ip -6 addr add $EXT2IPV6 dev $EXT2IF
+ if [ "$IPV6" = "yes" ]; then
+ if [ "$EXT2DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ up_delay=4
+ init_dhcp6c ext2if $EXT2IF
+ ifplugd -apq -t2 -u3 -d3 -i $EXT2IF -r /etc/ifplugd/dhcp6c.action
+ elif [ -n "$EXT2IPV6" ]; then
+ ip -6 addr add $EXT2IPV6 dev $EXT2IF
+ fi
fi
ip link set dev $EXT2IF up
+ if [ $up_delay -gt 0 ]; then
+ sleep $up_delay
+ fi
;;
esac
@@ -606,6 +585,46 @@
#end static ip on 2nd if
fi
+ #Static IP
+ if [ -n "$EXTIP" -a -n "$EXTIF" ] && ! isextppp extif; then
+
+ case $EXTIF in
+ wp)
+ ;;
+ hdlc0|pvc0)
+ ip tunnel add $EXTIF mode ipip remote $EXTGW local $EXTIP
+ ip link set dev $EXTIF up
+ ;;
+ *)
+ ip addr add $EXTIP/$EXTNM brd + dev $EXTIF
+ if [ -n "$EXTIP_ALIAS" ]; then
+ alias_interface add $EXTIF "$EXTIP_ALIAS"
+ fi
+ if [ "$IPV6" = "yes" -a -n "$EXTIPV6" ] && \
+ [ "$DHCPV6_CLIENT_ENABLE" != "yes" -o "$DHCPV6_CLIENT_REQUEST_ADDRESS" = "no" ]; then
+ ip -6 addr add $EXTIPV6 dev $EXTIF
+ fi
+ ip link set dev $EXTIF up
+ if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ sleep 4
+ init_dhcp6c extif $EXTIF
+ dhcp6c -c /etc/wide-dhcpv6/dhcp6c-$EXTIF.conf -p /var/run/dhcp6c-$EXTIF.pid $EXTIF
+ ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/dhcp6c.action
+ sleep 2
+ fi
+ ;;
+ esac
+
+ if [ -n "$EXTGW" ]; then
+ ip route add default via $EXTGW dev $EXTIF
+ fi
+ if [ "$IPV6" = "yes" -a -n "$EXTGWIPV6" ] && \
+ [ "$DHCPV6_CLIENT_ENABLE" != "yes" -o "$DHCPV6_CLIENT_REQUEST_ADDRESS" = "no" ]; then
+ ip -6 route add default via $EXTGWIPV6 dev $EXTIF metric 1
+ fi
+ #end static IP
+ fi
+
#DHCP Failover Interface
if [ -n "$EXT2IF" -a -z "$EXT2IP" ] && ! isextppp ext2if; then
if [ "$IPV6" = "yes" -a "$EXT2DHCPV6_CLIENT_ENABLE" = "yes" ]; then
@@ -616,12 +635,15 @@
sleep 4
# No DHCPv6 - Static IPv6 if defined
- if [ "$IPV6" = "yes" -a -n "$EXT2IPV6" -a -n "$EXT2GWIPV6" ] && \
- [ "$EXT2DHCPV6_CLIENT_ENABLE" != "yes" ]; then
- ip -6 addr add $EXT2IPV6 dev $EXT2IF
- for x in $EXT2ROUTESIPV6; do
- ip -6 route add $x via $EXT2GWIPV6 dev $EXT2IF metric 1
- done
+ if [ "$IPV6" = "yes" ]; then
+ if [ -n "$EXT2IPV6" -a "$EXT2DHCPV6_CLIENT_ENABLE" != "yes" ]; then
+ ip -6 addr add $EXT2IPV6 dev $EXT2IF
+ fi
+ if [ -n "$EXT2GWIPV6" ]; then
+ for x in $EXT2ROUTESIPV6; do
+ ip -6 route add $x via $EXT2GWIPV6 dev $EXT2IF metric 1
+ done
+ fi
fi
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-26 22:50:13
|
Revision: 7990
http://sourceforge.net/p/astlinux/code/7990
Author: abelbeck
Date: 2016-11-26 22:50:11 +0000 (Sat, 26 Nov 2016)
Log Message:
-----------
Add user/group for 'ntp' and 'avahi'
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/group
branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
branches/1.0/project/astlinux/target_skeleton/etc/passwd
branches/1.0/project/astlinux/target_skeleton/etc/shadow
branches/1.0/project/astlinux/target_skeleton/etc/shadow-
Modified: branches/1.0/project/astlinux/target_skeleton/etc/group
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/group 2016-11-26 22:16:48 UTC (rev 7989)
+++ branches/1.0/project/astlinux/target_skeleton/etc/group 2016-11-26 22:50:11 UTC (rev 7990)
@@ -10,7 +10,9 @@
floppy:x:25:
tape:x:26:
audio:x:29:
+ntp:x:38:
video:x:44:
+avahi:x:70:
users:x:100:
prosody:x:130:
ldap:x:439:
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN 2016-11-26 22:16:48 UTC (rev 7989)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN 2016-11-26 22:50:11 UTC (rev 7990)
@@ -10,7 +10,7 @@
local base="$1" user file IFS
unset IFS
- for user in zabbix prosody ldap kamailio; do
+ for user in zabbix prosody ldap kamailio ntp avahi; do
for file in passwd shadow group; do
if ! grep -q "^${user}:" "/etc/${file}"; then
grep "^${user}:" "${base}/etc/${file}" >> "/etc/${file}"
Modified: branches/1.0/project/astlinux/target_skeleton/etc/passwd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/passwd 2016-11-26 22:16:48 UTC (rev 7989)
+++ branches/1.0/project/astlinux/target_skeleton/etc/passwd 2016-11-26 22:50:11 UTC (rev 7990)
@@ -1,6 +1,8 @@
root:x:0:0:root:/root:/bin/bash
sshd:x:22:22:sshd:/dev/null:/bin/false
ftp:x:21:21:ftp user:/home/ftp:/bin/false
+ntp:x:38:38:NTP-server:/var/lib/ntp:/bin/false
+avahi:x:70:70:Avahi mDNS/DNS-SD Stack:/var/run/avahi-daemon:/bin/false
prosody:x:130:130:XMPP-server:/etc/prosody/data:/bin/false
ldap:x:439:439:LDAP-server:/var/lib/ldap:/bin/false
zabbix:x:906:906:Zabbix User:/dev/null:/bin/false
Modified: branches/1.0/project/astlinux/target_skeleton/etc/shadow
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/shadow 2016-11-26 22:16:48 UTC (rev 7989)
+++ branches/1.0/project/astlinux/target_skeleton/etc/shadow 2016-11-26 22:50:11 UTC (rev 7990)
@@ -1,6 +1,8 @@
root:$1$$axJeFIpwicqOTwFpuoUAs1:12215:0:99999:7:::
sshd:!:0:0:99999:7:::
ftp:!:0:0:99999:7:::
+ntp:!:0:0:99999:7:::
+avahi:!:0:0:99999:7:::
prosody:!:0:0:99999:7:::
ldap:!:0:0:99999:7:::
zabbix:!:0:0:99999:7:::
Modified: branches/1.0/project/astlinux/target_skeleton/etc/shadow-
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/shadow- 2016-11-26 22:16:48 UTC (rev 7989)
+++ branches/1.0/project/astlinux/target_skeleton/etc/shadow- 2016-11-26 22:50:11 UTC (rev 7990)
@@ -1,6 +1,8 @@
root:$1$$axJeFIpwicqOTwFpuoUAs1:12215:0:99999:7:::
sshd:!:0:0:99999:7:::
ftp:!:0:0:99999:7:::
+ntp:!:0:0:99999:7:::
+avahi:!:0:0:99999:7:::
prosody:!:0:0:99999:7:::
ldap:!:0:0:99999:7:::
zabbix:!:0:0:99999:7:::
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|