From 0b70a10af25f10ef58b158cf8a1aa2d91b33aec5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 1 Aug 2008 11:30:57 +0000 Subject: initscripts: Make rm nologin a .sh script git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4995 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/initscripts/initscripts-1.0/rmnologin | 20 -------------------- .../initscripts/initscripts-1.0/rmnologin.sh | 20 ++++++++++++++++++++ meta/packages/initscripts/initscripts_1.0.bb | 16 ++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) delete mode 100755 meta/packages/initscripts/initscripts-1.0/rmnologin create mode 100755 meta/packages/initscripts/initscripts-1.0/rmnologin.sh diff --git a/meta/packages/initscripts/initscripts-1.0/rmnologin b/meta/packages/initscripts/initscripts-1.0/rmnologin deleted file mode 100755 index 417efc245..000000000 --- a/meta/packages/initscripts/initscripts-1.0/rmnologin +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: rmnologin -# Required-Start: $remote_fs $all -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: -# Short-Description: Remove /etc/nologin at boot -# Description: This script removes the /etc/nologin file as the -# last step in the boot process, if DELAYLOGIN=yes. -# If DELAYLOGIN=no, /etc/nologin was not created by -# bootmisc earlier in the boot process. -### END INIT INFO - -if test -f /etc/nologin.boot -then - rm -f /etc/nologin /etc/nologin.boot -fi - -: exit 0 diff --git a/meta/packages/initscripts/initscripts-1.0/rmnologin.sh b/meta/packages/initscripts/initscripts-1.0/rmnologin.sh new file mode 100755 index 000000000..417efc245 --- /dev/null +++ b/meta/packages/initscripts/initscripts-1.0/rmnologin.sh @@ -0,0 +1,20 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: rmnologin +# Required-Start: $remote_fs $all +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: +# Short-Description: Remove /etc/nologin at boot +# Description: This script removes the /etc/nologin file as the +# last step in the boot process, if DELAYLOGIN=yes. +# If DELAYLOGIN=no, /etc/nologin was not created by +# bootmisc earlier in the boot process. +### END INIT INFO + +if test -f /etc/nologin.boot +then + rm -f /etc/nologin /etc/nologin.boot +fi + +: exit 0 diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb index b007e887b..fa7abccbe 100644 --- a/meta/packages/initscripts/initscripts_1.0.bb +++ b/meta/packages/initscripts/initscripts_1.0.bb @@ -22,7 +22,7 @@ SRC_URI = "file://functions \ file://single \ file://sendsigs \ file://urandom \ - file://rmnologin \ + file://rmnologin.sh \ file://checkroot.sh \ file://umountnfs.sh \ file://sysfs.sh \ @@ -54,13 +54,13 @@ 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.sh ${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 install -m 0755 ${WORKDIR}/mountnfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/reboot ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rmnologin ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rmnologin.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/sendsigs ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/single ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/init.d @@ -82,10 +82,10 @@ do_install () { # # Create runlevel links # - ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc2.d/S99rmnologin - ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc3.d/S99rmnologin - ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc4.d/S99rmnologin - ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc5.d/S99rmnologin + ln -sf ../init.d/rmnologin.sh ${D}${sysconfdir}/rc2.d/S99rmnologin.sh + ln -sf ../init.d/rmnologin.sh ${D}${sysconfdir}/rc3.d/S99rmnologin.sh + ln -sf ../init.d/rmnologin.sh ${D}${sysconfdir}/rc4.d/S99rmnologin.sh + ln -sf ../init.d/rmnologin.sh ${D}${sysconfdir}/rc5.d/S99rmnologin.sh ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc6.d/S20sendsigs # ln -sf ../init.d/urandom ${D}${sysconfdir}/rc6.d/S30urandom ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh @@ -108,7 +108,7 @@ 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.sh ${D}${sysconfdir}/rcS.d/S99finish.sh +# 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.sh ln -sf ../init.d/populate-volatile.sh ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh -- cgit v1.2.3