mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 18:32:12 +02:00
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]. (From OE-Core rev: ace183894a5319cd73c94fd2653bbe52f29dca0b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -24,6 +24,6 @@ then
|
||||
hddown=""
|
||||
fi
|
||||
|
||||
halt -d -f -i -p $hddown
|
||||
halt SED_HALTARGS -p $hddown
|
||||
|
||||
: exit 0
|
||||
|
||||
@@ -12,4 +12,4 @@
|
||||
PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
||||
|
||||
echo -n "Rebooting... "
|
||||
reboot -d -f -i
|
||||
reboot SED_HALTARGS
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user