summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorBenjamin Decavel2008-11-26 19:16:29 +0100
committerBenjamin Decavel2008-11-26 19:16:29 +0100
commit9d8ad4a413977047a7279b397b8c9dbaa7c2a55a (patch)
tree03a8ca36f22355b255f10d88f89bd45a28eaf3ce /package
parent0984115ccd566299fa0329644a7ed549529ccef4 (diff)
Init scripts are now looking for the config file in /etc
Diffstat (limited to 'package')
-rw-r--r--package/initramfs/root/etc/init.d/8021x_auth4
-rw-r--r--package/initramfs/root/etc/init.d/8021x_supplicant6
-rw-r--r--package/initramfs/root/etc/init.d/bridge6
-rw-r--r--package/initramfs/root/etc/init.d/ftp4
-rw-r--r--package/initramfs/root/etc/init.d/http4
-rw-r--r--package/initramfs/root/etc/init.d/serial4
-rw-r--r--package/initramfs/root/etc/init.d/snmp4
-rw-r--r--package/initramfs/root/etc/init.d/telnet4
8 files changed, 18 insertions, 18 deletions
diff --git a/package/initramfs/root/etc/init.d/8021x_auth b/package/initramfs/root/etc/init.d/8021x_auth
index e6095efc60..c21eacab1a 100644
--- a/package/initramfs/root/etc/init.d/8021x_auth
+++ b/package/initramfs/root/etc/init.d/8021x_auth
@@ -2,9 +2,9 @@
case "$1" in
start)
- [ -f /usr/local/etc/service.conf ] || exit 0
+ [ -f /etc/service.conf ] || exit 0
# Check that 8021x_auth service is up.
- grep " *8021X_AUTH *= *no" /usr/local/etc/service.conf && exit 0
+ grep " *8021X_AUTH *= *no" /etc/service.conf && exit 0
[ -f /etc/config/network ] || exit 0
# Check that networking is up.
grep " *NETWORKING *= *no" /etc/config/network && exit 0
diff --git a/package/initramfs/root/etc/init.d/8021x_supplicant b/package/initramfs/root/etc/init.d/8021x_supplicant
index 1e5fb83a89..e5c418573d 100644
--- a/package/initramfs/root/etc/init.d/8021x_supplicant
+++ b/package/initramfs/root/etc/init.d/8021x_supplicant
@@ -2,16 +2,16 @@
case "$1" in
start)
- [ -f /usr/local/etc/service.conf ] || exit 0
+ [ -f /etc/service.conf ] || exit 0
# Check that 8021x_supplicant service is up.
- grep " *8021x_SUPPLICANT *= *no" /usr/local/etc/service.conf && exit 0
+ grep " *8021x_SUPPLICANT *= *no" /etc/service.conf && exit 0
[ -f /etc/config/network ] || exit 0
# Check that networking is up.
grep " *NETWORKING *= *no" /etc/config/network && exit 0
# check that the server is present
[ -x /sbin/wpa_supplicant ] || exit 0
echo "Starting WPA supplicant"
- /sbin/wpa_supplicant -c/usr/local/etc/wired8021x.conf -ibr0 > /dev/null &
+ /sbin/wpa_supplicant -c /etc/wired8021x.conf -ibr0 > /dev/null &
echo $! > /var/run/8021x_supplicant.pid
;;
stop)
diff --git a/package/initramfs/root/etc/init.d/bridge b/package/initramfs/root/etc/init.d/bridge
index 5b009255c3..3460cdfded 100644
--- a/package/initramfs/root/etc/init.d/bridge
+++ b/package/initramfs/root/etc/init.d/bridge
@@ -5,9 +5,9 @@ EXIST="$?"
case "$1" in
start)
- [ -f /usr/local/etc/config/network ] || exit 0
+ [ -f /etc/config/network ] || exit 0
# Check that bridge service is up.
- grep " *BRIDGING *= *no" /usr/local/etc/config/network && exit 0
+ grep " *BRIDGING *= *no" /etc/config/network && exit 0
[ -d /proc/net/plc ] || exit 0
[ -d /proc/net/eth ] || exit 0
@@ -25,7 +25,7 @@ case "$1" in
brctl setfd br0 0
ifup br0
brctl setfd br0 5
- grep " *STP *= *yes" /usr/local/etc/config/network && brctl stp br0 on
+ grep " *STP *= *yes" /etc/config/network && brctl stp br0 on
;;
stop)
if [ "$EXIST" != "0" ]
diff --git a/package/initramfs/root/etc/init.d/ftp b/package/initramfs/root/etc/init.d/ftp
index 6205c600c8..c01199b23b 100644
--- a/package/initramfs/root/etc/init.d/ftp
+++ b/package/initramfs/root/etc/init.d/ftp
@@ -2,9 +2,9 @@
case "$1" in
start)
- [ -f /usr/local/etc/service.conf ] || exit 0
+ [ -f /etc/service.conf ] || exit 0
# Check that ftp service is up.
- grep " *FTP *= *no" /usr/local/etc/service.conf && exit 0
+ grep " *FTP *= *no" /etc/service.conf && exit 0
[ -f /etc/config/network ] || exit 0
# Check that networking is up.
grep " *NETWORKING *= *no" /etc/config/network && exit 0
diff --git a/package/initramfs/root/etc/init.d/http b/package/initramfs/root/etc/init.d/http
index 6fd40ae70d..d73a55a2d4 100644
--- a/package/initramfs/root/etc/init.d/http
+++ b/package/initramfs/root/etc/init.d/http
@@ -2,9 +2,9 @@
case "$1" in
start)
- [ -f /usr/local/etc/service.conf ] || exit 0
+ [ -f /etc/service.conf ] || exit 0
# Check that http service is up.
- grep " *HTTP *= *no" /usr/local/etc/service.conf && exit 0
+ grep " *HTTP *= *no" /etc/service.conf && exit 0
[ -f /etc/config/network ] || exit 0
# Check that networking is up.
grep " *NETWORKING *= *no" /etc/config/network && exit 0
diff --git a/package/initramfs/root/etc/init.d/serial b/package/initramfs/root/etc/init.d/serial
index 382f73cc85..09e4a7a7e1 100644
--- a/package/initramfs/root/etc/init.d/serial
+++ b/package/initramfs/root/etc/init.d/serial
@@ -2,9 +2,9 @@
case "$1" in
start)
- [ -f /usr/local/etc/service.conf ] || exit 0
+ [ -f /etc/service.conf ] || exit 0
# Check that serial service is up.
- grep " *SERIAL *= *no" /usr/local/etc/service.conf && exit 0
+ grep " *SERIAL *= *no" /etc/service.conf && exit 0
# check that the server is present
[ -x /sbin/getty ] || exit 0
echo "Starting Serial console"
diff --git a/package/initramfs/root/etc/init.d/snmp b/package/initramfs/root/etc/init.d/snmp
index a944985297..4fc4024421 100644
--- a/package/initramfs/root/etc/init.d/snmp
+++ b/package/initramfs/root/etc/init.d/snmp
@@ -2,9 +2,9 @@
case "$1" in
start)
- [ -f /usr/local/etc/service.conf ] || exit 0
+ [ -f /etc/service.conf ] || exit 0
# Check that snmp service is up.
- grep " *SNMP *= *no" /usr/local/etc/service.conf && exit 0
+ grep " *SNMP *= *no" /etc/service.conf && exit 0
[ -f /etc/config/network ] || exit 0
# Check that networking is up.
grep " *NETWORKING *= *no" /etc/config/network && exit 0
diff --git a/package/initramfs/root/etc/init.d/telnet b/package/initramfs/root/etc/init.d/telnet
index 2c66af1c60..ab1f8de433 100644
--- a/package/initramfs/root/etc/init.d/telnet
+++ b/package/initramfs/root/etc/init.d/telnet
@@ -2,9 +2,9 @@
case "$1" in
start)
- [ -f /usr/local/etc/service.conf ] || exit 0
+ [ -f /etc/service.conf ] || exit 0
# Check that telnet service is up.
- grep " *TELNET *= *no" /usr/local/etc/service.conf && exit 0
+ grep " *TELNET *= *no" /etc/service.conf && exit 0
[ -f /etc/config/network ] || exit 0
# Check that networking is up.
grep " *NETWORKING *= *no" /etc/config/network && exit 0