initscripts: make commit b49e09758de7f29c049c12213347cb32fb64d7a4 apply to initscripts as well

19 files changed, 12 insertions, 5 deletions

diff --git a/packages/initscripts/files/hostname.sh b/packages/initscripts/files/hostname.sh
index 0f3d374286..1a3fd2f17e 100644
--- a/packages/initscripts/files/hostname.sh
+++ b/packages/initscripts/files/hostname.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # hostname.sh	Set hostname.
 #
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot
index e5aa9aaf99..e5aa9aaf99 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot
diff --git a/packages/initscripts/initscripts-1.0/foonas/checkroot.sh b/packages/initscripts/initscripts-1.0/foonas/checkroot
index c69a773482..c69a773482 100755
--- a/packages/initscripts/initscripts-1.0/foonas/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/foonas/checkroot
diff --git a/packages/initscripts/initscripts-1.0/foonas/domainname.sh b/packages/initscripts/initscripts-1.0/foonas/domainname.sh
index 7113467d8c..55cb5dcfba 100644
--- a/packages/initscripts/initscripts-1.0/foonas/domainname.sh
+++ b/packages/initscripts/initscripts-1.0/foonas/domainname.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # domainname.sh	Set the domainname.
 #
diff --git a/packages/initscripts/initscripts-1.0/jornada6xx/checkroot.sh b/packages/initscripts/initscripts-1.0/jornada6xx/checkroot
index 9e2d3cfc85..9e2d3cfc85 100755
--- a/packages/initscripts/initscripts-1.0/jornada6xx/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/jornada6xx/checkroot
diff --git a/packages/initscripts/initscripts-1.0/jornada7xx/checkroot.sh b/packages/initscripts/initscripts-1.0/jornada7xx/checkroot
index 9e2d3cfc85..9e2d3cfc85 100755
--- a/packages/initscripts/initscripts-1.0/jornada7xx/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/jornada7xx/checkroot
diff --git a/packages/initscripts/initscripts-1.0/logicpd-pxa270/checkroot.sh b/packages/initscripts/initscripts-1.0/logicpd-pxa270/checkroot
index 2a4d2a67a9..2a4d2a67a9 100644
--- a/packages/initscripts/initscripts-1.0/logicpd-pxa270/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/logicpd-pxa270/checkroot
diff --git a/packages/initscripts/initscripts-1.0/mtx-1/checkroot.sh b/packages/initscripts/initscripts-1.0/mtx-1/checkroot
index e8ae039650..e8ae039650 100755
--- a/packages/initscripts/initscripts-1.0/mtx-1/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/mtx-1/checkroot
diff --git a/packages/initscripts/initscripts-1.0/mtx-1/mountall.sh b/packages/initscripts/initscripts-1.0/mtx-1/mountall.sh
index 4d12c06254..6ce2863dd9 100755
--- a/packages/initscripts/initscripts-1.0/mtx-1/mountall.sh
+++ b/packages/initscripts/initscripts-1.0/mtx-1/mountall.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # mountall.sh	Mount all filesystems.
 #
diff --git a/packages/initscripts/initscripts-1.0/mtx-2/checkroot.sh b/packages/initscripts/initscripts-1.0/mtx-2/checkroot
index e8ae039650..e8ae039650 100755
--- a/packages/initscripts/initscripts-1.0/mtx-2/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/mtx-2/checkroot
diff --git a/packages/initscripts/initscripts-1.0/mtx-2/mountall.sh b/packages/initscripts/initscripts-1.0/mtx-2/mountall.sh
index 4d12c06254..6ce2863dd9 100755
--- a/packages/initscripts/initscripts-1.0/mtx-2/mountall.sh
+++ b/packages/initscripts/initscripts-1.0/mtx-2/mountall.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # mountall.sh	Mount all filesystems.
 #
diff --git a/packages/initscripts/initscripts-1.0/openprotium/checkroot.sh b/packages/initscripts/initscripts-1.0/openprotium/checkroot
index 6b63b07188..6b63b07188 100755
--- a/packages/initscripts/initscripts-1.0/openprotium/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/openprotium/checkroot
diff --git a/packages/initscripts/initscripts-1.0/openprotium/domainname.sh b/packages/initscripts/initscripts-1.0/openprotium/domainname.sh
index 7113467d8c..55cb5dcfba 100644
--- a/packages/initscripts/initscripts-1.0/openprotium/domainname.sh
+++ b/packages/initscripts/initscripts-1.0/openprotium/domainname.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # domainname.sh	Set the domainname.
 #
diff --git a/packages/initscripts/initscripts-1.0/openprotium/mountall.sh b/packages/initscripts/initscripts-1.0/openprotium/mountall.sh
index 94ea8217fd..b5ccf9e621 100644
--- a/packages/initscripts/initscripts-1.0/openprotium/mountall.sh
+++ b/packages/initscripts/initscripts-1.0/openprotium/mountall.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # mountall.sh	Mount all filesystems.
 #
diff --git a/packages/initscripts/initscripts-1.0/openprotium/umountinitrd.sh b/packages/initscripts/initscripts-1.0/openprotium/umountinitrd.sh
index 6ee0d50e84..12cf7c604c 100644
--- a/packages/initscripts/initscripts-1.0/openprotium/umountinitrd.sh
+++ b/packages/initscripts/initscripts-1.0/openprotium/umountinitrd.sh
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 # umount the static dev - we'd probably never use it.
 #
 [ -d /dev/.static/dev ] && umount /dev/.static/dev                              
diff --git a/packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot.sh b/packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot
index e5fc6ed8b5..e5fc6ed8b5 100755
--- a/packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot
diff --git a/packages/initscripts/initscripts-1.0/oplinux-uclibc/mountall.sh b/packages/initscripts/initscripts-1.0/oplinux-uclibc/mountall.sh
index 33d7065275..1418a4d0cf 100755
--- a/packages/initscripts/initscripts-1.0/oplinux-uclibc/mountall.sh
+++ b/packages/initscripts/initscripts-1.0/oplinux-uclibc/mountall.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # mountall.sh	Mount all filesystems.
 #
diff --git a/packages/initscripts/initscripts-1.0/oplinux/checkroot.sh b/packages/initscripts/initscripts-1.0/oplinux/checkroot
index e5fc6ed8b5..e5fc6ed8b5 100755
--- a/packages/initscripts/initscripts-1.0/oplinux/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/oplinux/checkroot
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 51725f8708..b497576036 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r111"
+PR = "r112"
 
 SRC_URI = "file://functions \
            file://halt \
@@ -25,7 +25,7 @@ SRC_URI = "file://functions \
            file://sendsigs \
            file://urandom \
            file://rmnologin \
-           file://checkroot.sh \
+           file://checkroot \
            file://umountnfs.sh \
            file://sysfs.sh \
            file://device_table.txt \
@@ -55,7 +55,7 @@ do_install () {
 
 	install -m 0755    ${WORKDIR}/functions		${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/checkroot.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/checkroot		${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/finish.sh		${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/halt		${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/hostname.sh	${D}${sysconfdir}/init.d
@@ -106,7 +106,7 @@ do_install () {
 	ln -sf		../init.d/save-rtc.sh	${D}${sysconfdir}/rc0.d/S25save-rtc.sh
 	ln -sf		../init.d/save-rtc.sh	${D}${sysconfdir}/rc6.d/S25save-rtc.sh
 	ln -sf		../init.d/banner	${D}${sysconfdir}/rcS.d/S02banner
-	ln -sf		../init.d/checkroot.sh	${D}${sysconfdir}/rcS.d/S10checkroot.sh
+	ln -sf		../init.d/checkroot		${D}${sysconfdir}/rcS.d/S10checkroot
 #	ln -sf		../init.d/checkfs.sh	${D}${sysconfdir}/rcS.d/S30checkfs.sh
 	ln -sf		../init.d/mountall.sh	${D}${sysconfdir}/rcS.d/S35mountall.sh
 	ln -sf		../init.d/hostname.sh	${D}${sysconfdir}/rcS.d/S39hostname.sh