[oe-commits] Koen Kooi : initscripts: make commit b49e09758de7f29c049c12213347cb32fb64d7a4 apply to initscripts as well
GIT User account
git at amethyst.openembedded.net
Mon Feb 2 12:51:42 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 6ad50773f5672556d3393c89eddc58e014421bd6
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6ad50773f5672556d3393c89eddc58e014421bd6
Author: Koen Kooi <koen at openembedded.org>
Date: Mon Feb 2 13:48:26 2009 +0100
initscripts: make commit b49e09758de7f29c049c12213347cb32fb64d7a4 apply to initscripts as well
---
packages/initscripts/files/hostname.sh | 1 +
.../initscripts-1.0/{checkroot.sh => checkroot} | 0
.../foonas/{checkroot.sh => checkroot} | 0
.../initscripts-1.0/foonas/domainname.sh | 1 +
.../jornada6xx/{checkroot.sh => checkroot} | 0
.../jornada7xx/{checkroot.sh => checkroot} | 0
.../logicpd-pxa270/{checkroot.sh => checkroot} | 0
.../mtx-1/{checkroot.sh => checkroot} | 0
.../initscripts/initscripts-1.0/mtx-1/mountall.sh | 1 +
.../mtx-2/{checkroot.sh => checkroot} | 0
.../initscripts/initscripts-1.0/mtx-2/mountall.sh | 1 +
.../openprotium/{checkroot.sh => checkroot} | 0
.../initscripts-1.0/openprotium/domainname.sh | 1 +
.../initscripts-1.0/openprotium/mountall.sh | 1 +
.../initscripts-1.0/openprotium/umountinitrd.sh | 2 +-
.../oplinux-uclibc/{checkroot.sh => checkroot} | 0
.../initscripts-1.0/oplinux-uclibc/mountall.sh | 1 +
.../oplinux/{checkroot.sh => checkroot} | 0
packages/initscripts/initscripts_1.0.bb | 8 ++++----
19 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/packages/initscripts/files/hostname.sh b/packages/initscripts/files/hostname.sh
index 0f3d374..1a3fd2f 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
similarity index 100%
rename from packages/initscripts/initscripts-1.0/checkroot.sh
rename to 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
similarity index 100%
rename from packages/initscripts/initscripts-1.0/foonas/checkroot.sh
rename to 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 7113467..55cb5dc 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
similarity index 100%
rename from packages/initscripts/initscripts-1.0/jornada6xx/checkroot.sh
rename to 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
similarity index 100%
rename from packages/initscripts/initscripts-1.0/jornada7xx/checkroot.sh
rename to 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
similarity index 100%
rename from packages/initscripts/initscripts-1.0/logicpd-pxa270/checkroot.sh
rename to 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
similarity index 100%
rename from packages/initscripts/initscripts-1.0/mtx-1/checkroot.sh
rename to 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 4d12c06..6ce2863 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
similarity index 100%
rename from packages/initscripts/initscripts-1.0/mtx-2/checkroot.sh
rename to 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 4d12c06..6ce2863 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
similarity index 100%
rename from packages/initscripts/initscripts-1.0/openprotium/checkroot.sh
rename to 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 7113467..55cb5dc 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 94ea821..b5ccf9e 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 6ee0d50..12cf7c6 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
similarity index 100%
rename from packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot.sh
rename to 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 33d7065..1418a4d 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
similarity index 100%
rename from packages/initscripts/initscripts-1.0/oplinux/checkroot.sh
rename to packages/initscripts/initscripts-1.0/oplinux/checkroot
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 51725f8..b497576 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
More information about the Openembedded-commits
mailing list