From 7f5b6f93394116ce3a4868b386f3cee9f1129f9b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 13 Jun 2008 14:20:37 +0000 Subject: initscripts: rename simple shell scripts to *.sh so they are sourced instead of forking git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4642 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/initscripts/initscripts-1.0/banner | 17 ----------------- meta/packages/initscripts/initscripts-1.0/banner.sh | 17 +++++++++++++++++ meta/packages/initscripts/initscripts-1.0/finish | 6 ------ meta/packages/initscripts/initscripts-1.0/finish.sh | 6 ++++++ meta/packages/initscripts/initscripts_1.0.bb | 18 +++++++++--------- 5 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 meta/packages/initscripts/initscripts-1.0/banner create mode 100644 meta/packages/initscripts/initscripts-1.0/banner.sh delete mode 100755 meta/packages/initscripts/initscripts-1.0/finish create mode 100755 meta/packages/initscripts/initscripts-1.0/finish.sh (limited to 'meta') diff --git a/meta/packages/initscripts/initscripts-1.0/banner b/meta/packages/initscripts/initscripts-1.0/banner deleted file mode 100644 index 0349ce195..000000000 --- a/meta/packages/initscripts/initscripts-1.0/banner +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -if [ ! -e /dev/tty ]; then - /bin/mknod -m 0666 /dev/tty c 5 0 -fi - -if ( > /dev/tty0 ) 2>/dev/null; then - vtmaster=/dev/tty0 -elif ( > /dev/vc/0 ) 2>/dev/null; then - vtmaster=/dev/vc/0 -elif ( > /dev/console ) 2>/dev/null; then - vtmaster=/dev/console -else - vtmaster=/dev/null -fi -echo > $vtmaster -echo "Please wait: booting..." > $vtmaster diff --git a/meta/packages/initscripts/initscripts-1.0/banner.sh b/meta/packages/initscripts/initscripts-1.0/banner.sh new file mode 100644 index 000000000..0349ce195 --- /dev/null +++ b/meta/packages/initscripts/initscripts-1.0/banner.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +if [ ! -e /dev/tty ]; then + /bin/mknod -m 0666 /dev/tty c 5 0 +fi + +if ( > /dev/tty0 ) 2>/dev/null; then + vtmaster=/dev/tty0 +elif ( > /dev/vc/0 ) 2>/dev/null; then + vtmaster=/dev/vc/0 +elif ( > /dev/console ) 2>/dev/null; then + vtmaster=/dev/console +else + vtmaster=/dev/null +fi +echo > $vtmaster +echo "Please wait: booting..." > $vtmaster diff --git a/meta/packages/initscripts/initscripts-1.0/finish b/meta/packages/initscripts/initscripts-1.0/finish deleted file mode 100755 index 4f9f75f47..000000000 --- a/meta/packages/initscripts/initscripts-1.0/finish +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if ! test -e /etc/.configured; then - > /etc/.configured -fi - diff --git a/meta/packages/initscripts/initscripts-1.0/finish.sh b/meta/packages/initscripts/initscripts-1.0/finish.sh new file mode 100755 index 000000000..4f9f75f47 --- /dev/null +++ b/meta/packages/initscripts/initscripts-1.0/finish.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +if ! test -e /etc/.configured; then + > /etc/.configured +fi + diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb index 17abd0a0b..6f65e12bb 100644 --- a/meta/packages/initscripts/initscripts_1.0.bb +++ b/meta/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r108" +PR = "r109" SRC_URI = "file://functions \ file://halt \ @@ -13,8 +13,8 @@ SRC_URI = "file://functions \ file://devpts \ file://hostname.sh \ file://mountall.sh \ - file://banner \ - file://finish \ + file://banner.sh \ + file://finish.sh \ file://bootmisc.sh \ file://mountnfs.sh \ file://reboot \ @@ -54,7 +54,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}/finish ${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 install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d @@ -77,7 +77,7 @@ do_install () { # # Install device dependent scripts # - install -m 0755 ${WORKDIR}/banner ${D}${sysconfdir}/init.d/banner + install -m 0755 ${WORKDIR}/banner.sh ${D}${sysconfdir}/init.d/banner.sh install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs # # Create runlevel links @@ -100,7 +100,7 @@ do_install () { ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt 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/banner.sh ${D}${sysconfdir}/rcS.d/S02banner.sh ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S10checkroot.sh # ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh ln -sf ../init.d/mountall.sh ${D}${sysconfdir}/rcS.d/S35mountall.sh @@ -108,13 +108,13 @@ do_install () { ln -sf ../init.d/mountnfs.sh ${D}${sysconfdir}/rcS.d/S45mountnfs.sh ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh # ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom - ln -sf ../init.d/finish ${D}${sysconfdir}/rcS.d/S99finish + ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh # udev will run at S04 if installed - ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S03sysfs + ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S03sysfs.sh ln -sf ../init.d/populate-volatile.sh ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh ln -sf ../init.d/devpts.sh ${D}${sysconfdir}/rcS.d/S38devpts.sh if [ "${TARGET_ARCH}" = "arm" ]; then - ln -sf ../init.d/alignment.sh ${D}${sysconfdir}/rcS.d/S06alignment + ln -sf ../init.d/alignment.sh ${D}${sysconfdir}/rcS.d/S06alignment.sh fi install -m 0755 ${WORKDIR}/device_table.txt ${D}${sysconfdir}/device_table -- cgit v1.2.3