From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 13 Dec 2010 08:01:21 +0000 (+0000)
Subject: base-files: use shutdown instead of stop when the system goes down (patch by tripolar)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5a351509aa3f12e18cea2ab312ff7466631c8488;p=openwrt%2Fstaging%2Fnbd.git

base-files: use shutdown instead of stop when the system goes down (patch by tripolar)

SVN-Revision: 24540
---

diff --git a/package/base-files/files/etc/inittab b/package/base-files/files/etc/inittab
index 58be3bc617..e9de30bcc4 100644
--- a/package/base-files/files/etc/inittab
+++ b/package/base-files/files/etc/inittab
@@ -1,5 +1,5 @@
 ::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
+::shutdown:/etc/init.d/rcS K shutdown
 tts/0::askfirst:/bin/ash --login
 ttyS0::askfirst:/bin/ash --login
 tty1::askfirst:/bin/ash --login
diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index 072f143549..6ec88aef9c 100755
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -30,7 +30,7 @@ boot() {
 }
 
 shutdown() {
-	return 0
+	stop
 }
 
 disable() {
diff --git a/target/linux/ep93xx/base-files/etc/inittab b/target/linux/ep93xx/base-files/etc/inittab
index ea83e79ccd..9f7c0aee35 100644
--- a/target/linux/ep93xx/base-files/etc/inittab
+++ b/target/linux/ep93xx/base-files/etc/inittab
@@ -1,5 +1,5 @@
 ::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
+::shutdown:/etc/init.d/rcS K shutdown
 tts/0::askfirst:/bin/ash --login
 ttyAM0::askfirst:/bin/ash --login
 tty1::askfirst:/bin/ash --login
diff --git a/target/linux/ifxmips/base-files/etc/inittab b/target/linux/ifxmips/base-files/etc/inittab
index 7989a7f60e..67c36a6a9e 100644
--- a/target/linux/ifxmips/base-files/etc/inittab
+++ b/target/linux/ifxmips/base-files/etc/inittab
@@ -1,4 +1,4 @@
 ::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
+::shutdown:/etc/init.d/rcS K shutdown
 ttyS0::askfirst:/bin/ash --login
 ttyS1::askfirst:/bin/ash --login
diff --git a/target/linux/mpc52xx/base-files/etc/inittab b/target/linux/mpc52xx/base-files/etc/inittab
index 68b4331500..77dd6cafc1 100644
--- a/target/linux/mpc52xx/base-files/etc/inittab
+++ b/target/linux/mpc52xx/base-files/etc/inittab
@@ -1,3 +1,3 @@
 ::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
+::shutdown:/etc/init.d/rcS K shutdown
 ttyPSC0::askfirst:/bin/ash --login
diff --git a/target/linux/mpc83xx/base-files/etc/inittab b/target/linux/mpc83xx/base-files/etc/inittab
index 7989a7f60e..67c36a6a9e 100644
--- a/target/linux/mpc83xx/base-files/etc/inittab
+++ b/target/linux/mpc83xx/base-files/etc/inittab
@@ -1,4 +1,4 @@
 ::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
+::shutdown:/etc/init.d/rcS K shutdown
 ttyS0::askfirst:/bin/ash --login
 ttyS1::askfirst:/bin/ash --login
diff --git a/target/linux/omap24xx/base-files/etc/inittab b/target/linux/omap24xx/base-files/etc/inittab
index e39d2f158f..f55b7cd74e 100644
--- a/target/linux/omap24xx/base-files/etc/inittab
+++ b/target/linux/omap24xx/base-files/etc/inittab
@@ -1,5 +1,5 @@
 ::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
+::shutdown:/etc/init.d/rcS K shutdown
 tts/0::askfirst:/bin/ash --login
 ttyS2::askfirst:/bin/ash --login
 tty1::askfirst:/bin/ash --login
diff --git a/target/linux/omap35xx/base-files/etc/inittab b/target/linux/omap35xx/base-files/etc/inittab
index 89626ecdad..88567b245f 100644
--- a/target/linux/omap35xx/base-files/etc/inittab
+++ b/target/linux/omap35xx/base-files/etc/inittab
@@ -1,5 +1,5 @@
 ::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
+::shutdown:/etc/init.d/rcS K shutdown
 tts/0::askfirst:/bin/ash --login
 ttyS0::askfirst:/bin/ash --login
 ttyS1::askfirst:/bin/ash --login
diff --git a/target/linux/ppc44x/base-files/etc/inittab b/target/linux/ppc44x/base-files/etc/inittab
index 7989a7f60e..67c36a6a9e 100644
--- a/target/linux/ppc44x/base-files/etc/inittab
+++ b/target/linux/ppc44x/base-files/etc/inittab
@@ -1,4 +1,4 @@
 ::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
+::shutdown:/etc/init.d/rcS K shutdown
 ttyS0::askfirst:/bin/ash --login
 ttyS1::askfirst:/bin/ash --login
diff --git a/target/linux/ramips/base-files/etc/inittab b/target/linux/ramips/base-files/etc/inittab
index 7989a7f60e..67c36a6a9e 100644
--- a/target/linux/ramips/base-files/etc/inittab
+++ b/target/linux/ramips/base-files/etc/inittab
@@ -1,4 +1,4 @@
 ::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
+::shutdown:/etc/init.d/rcS K shutdown
 ttyS0::askfirst:/bin/ash --login
 ttyS1::askfirst:/bin/ash --login
diff --git a/target/linux/realview/base-files/etc/inittab b/target/linux/realview/base-files/etc/inittab
index 3674d98809..d9d571e8d9 100644
--- a/target/linux/realview/base-files/etc/inittab
+++ b/target/linux/realview/base-files/etc/inittab
@@ -1,5 +1,5 @@
 ::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
+::shutdown:/etc/init.d/rcS K shutdown
 tts/0::askfirst:/bin/ash --login
 ttyAMA0::askfirst:/bin/ash --login
 tty1::askfirst:/bin/ash --login