From 3a41c1eb3efd8e48738d0e28c738db4c3e925aa1 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 27 Apr 2011 17:34:17 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/initscripts/initscripts-1.0/halt | 2 +- meta/recipes-core/initscripts/initscripts-1.0/reboot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/initscripts/initscripts-1.0') diff --git a/meta/recipes-core/initscripts/initscripts-1.0/halt b/meta/recipes-core/initscripts/initscripts-1.0/halt index 609b793b7c..021d9be127 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/halt +++ b/meta/recipes-core/initscripts/initscripts-1.0/halt @@ -24,6 +24,6 @@ then hddown="" fi -halt -d -f -i -p $hddown +halt SED_HALTARGS -p $hddown : exit 0 diff --git a/meta/recipes-core/initscripts/initscripts-1.0/reboot b/meta/recipes-core/initscripts/initscripts-1.0/reboot index 4c55885aba..cf32e95cb9 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/reboot +++ b/meta/recipes-core/initscripts/initscripts-1.0/reboot @@ -12,4 +12,4 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin echo -n "Rebooting... " -reboot -d -f -i +reboot SED_HALTARGS -- cgit v1.2.3-54-g00ecf