diff options
| author | William Hubbs <williamh@gentoo.org> | 2012-02-20 18:59:17 -0600 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2012-02-20 18:59:17 -0600 |
| commit | e4146c094546e5d8e8a48b48636586c5e21ad509 (patch) | |
| tree | da8d708a04b71a43467b39204747287e9b92b72c /init.d/swap.in | |
| parent | 9e3fc7f3f5127a27dac686a885929f5bd856717f (diff) | |
Revert "Revert "swap: go back to using swapon for Linux systems""
This reverts commit 06d67017850e106f14d8948003027612253b143a.
After researching this further, we do need this commit. The other issue
is a bug in fstabinfo which will also need to be fixed.
Diffstat (limited to 'init.d/swap.in')
| -rw-r--r-- | init.d/swap.in | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/init.d/swap.in b/init.d/swap.in index 0b229a1c..fa08b4d0 100644 --- a/init.d/swap.in +++ b/init.d/swap.in @@ -12,15 +12,7 @@ start() { ebegin "Activating swap devices" case "$RC_UNAME" in - Linux) - local dev - for dev in $(fstabinfo -b -t swap); do - case "$dev" in - /dev/loop*) ;; - *) swapon $dev >/dev/null;; - esac - done - ;; + Linux) swapon -a -e >/dev/null;; NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;; *) swapon -a >/dev/null;; esac |