diff options
| -rwxr-xr-x | meta/packages/initscripts/initscripts-1.0/mountall.sh | 14 | ||||
| -rw-r--r-- | meta/packages/initscripts/initscripts_1.0.bb | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/meta/packages/initscripts/initscripts-1.0/mountall.sh b/meta/packages/initscripts/initscripts-1.0/mountall.sh index b5cb85a1e9..84227a5fe3 100755 --- a/meta/packages/initscripts/initscripts-1.0/mountall.sh +++ b/meta/packages/initscripts/initscripts-1.0/mountall.sh @@ -27,19 +27,7 @@ kill -USR1 1 # Execute swapon command again, in case we want to swap to # a file on a now mounted filesystem. # -doswap=yes -case "`uname -r`" in - 2.[0123].*) - if grep -qs resync /proc/mdstat - then - doswap=no - fi - ;; -esac -if test $doswap = yes -then - swapon -a 2> /dev/null -fi +swapon -a 2> /dev/null : exit 0 diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb index 16f987e49e..9e8c8aa9ca 100644 --- a/meta/packages/initscripts/initscripts_1.0.bb +++ b/meta/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r110" +PR = "r111" SRC_URI = "file://functions \ file://halt \ |