diff options
| author | Ming Liu <peter.x.liu@external.atlascopco.com> | 2016-05-26 23:14:33 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-30 15:58:15 +0100 |
| commit | f053b5fac3c3b48439934ce75789d2e94e84957a (patch) | |
| tree | ebc65a841a8614baf6a8989321840e5c1530ff53 | |
| parent | b426b2bc1a954e05e5fcbc40e6ff39251075305d (diff) | |
| download | poky-f053b5fac3c3b48439934ce75789d2e94e84957a.tar.gz | |
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.
(From OE-Core rev: 2cb1142710cc2beb762c4c2b8edd44d3a97dafa0)
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh b/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh index dfee2afaad..02f0351fcb 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh | |||
| @@ -69,7 +69,7 @@ fi | |||
| 69 | # before fsck, since fsck can be quite memory-hungry. | 69 | # before fsck, since fsck can be quite memory-hungry. |
| 70 | # | 70 | # |
| 71 | test "$VERBOSE" != no && echo "Activating swap" | 71 | test "$VERBOSE" != no && echo "Activating swap" |
| 72 | swapon -a 2> /dev/null | 72 | [ -x /sbin/swapon ] && swapon -a |
| 73 | 73 | ||
| 74 | # | 74 | # |
| 75 | # Check the root filesystem. | 75 | # Check the root filesystem. |
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 | |||
| 33 | # Execute swapon command again, in case we want to swap to | 33 | # Execute swapon command again, in case we want to swap to |
| 34 | # a file on a now mounted filesystem. | 34 | # a file on a now mounted filesystem. |
| 35 | # | 35 | # |
| 36 | swapon -a 2> /dev/null | 36 | [ -x /sbin/swapon ] && swapon -a |
| 37 | 37 | ||
| 38 | : exit 0 | 38 | : exit 0 |
| 39 | 39 | ||
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/umountfs b/meta/recipes-core/initscripts/initscripts-1.0/umountfs index 61324c630b..7fb5c58b3e 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/umountfs +++ b/meta/recipes-core/initscripts/initscripts-1.0/umountfs | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | PATH=/sbin:/bin:/usr/sbin:/usr/bin | 12 | PATH=/sbin:/bin:/usr/sbin:/usr/bin |
| 13 | 13 | ||
| 14 | echo "Deactivating swap..." | 14 | echo "Deactivating swap..." |
| 15 | swapoff -a | 15 | [ -x /sbin/swapoff ] && swapoff -a |
| 16 | 16 | ||
| 17 | # We leave /proc mounted. | 17 | # We leave /proc mounted. |
| 18 | echo "Unmounting local filesystems..." | 18 | echo "Unmounting local filesystems..." |