aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initscripts/initscripts_1.0.bb
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-04-27 17:34:17 +0100
committerSaul Wold <sgw@linux.intel.com>2011-05-04 22:12:27 -0700
commitace183894a5319cd73c94fd2653bbe52f29dca0b (patch)
tree69614a6f525dfeacc73602a088a3699322ebb242 /meta/recipes-core/initscripts/initscripts_1.0.bb
parent4a158b6ef125b555225472eefbe1ea226dc47c2c (diff)
downloadopenembedded-core-contrib-ace183894a5319cd73c94fd2653bbe52f29dca0b.tar.gz
openembedded-core-contrib-ace183894a5319cd73c94fd2653bbe52f29dca0b.tar.bz2
openembedded-core-contrib-ace183894a5319cd73c94fd2653bbe52f29dca0b.zip
initscripts: remove -i from halt/reboot arguments and allow override
Introduces a variable HALTARGS which specifies the arguments sent to halt and reboot, and sets the default value to "-d -f", dropping the previous -i (shut down all network interfaces before halt/reboot, which causes a freeze with NFS root.) Fixes [YOCTO #997]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/initscripts/initscripts_1.0.bb')
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index d99092584e..720c252e70 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
RDEPENDS_${PN} = "makedevs"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r124"
+PR = "r125"
SRC_URI = "file://functions \
file://halt \
@@ -38,6 +38,13 @@ SRC_URI_append_arm = " file://alignment.sh"
KERNEL_VERSION = ""
+HALTARGS ?= "-d -f"
+
+do_configure() {
+ sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/halt
+ sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/reboot
+}
+
do_install () {
#
# Create directories and install device independent scripts