From 2cb1142710cc2beb762c4c2b8edd44d3a97dafa0 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Thu, 26 May 2016 23:14:33 +0200 Subject: initscripts: check if swapon/swapoff exists before executing them Not all built images contain swapon/swapoff, for instance, it is configurable with or without them in busybox. So it'd better to check if they exist or not before executing them. Redirecting the potential errors to /dev/null is not good enough, which might suppress the *real* errors. Signed-off-by: Ming Liu Signed-off-by: Ross Burton --- meta/recipes-core/initscripts/initscripts-1.0/mountall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-core/initscripts/initscripts-1.0/mountall.sh') diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh index 94bae420c0..c719be5d9a 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh @@ -33,7 +33,7 @@ kill -USR1 1 # Execute swapon command again, in case we want to swap to # a file on a now mounted filesystem. # -swapon -a 2> /dev/null +[ -x /sbin/swapon ] && swapon -a : exit 0 -- cgit 1.2.3-korg