From e4146c094546e5d8e8a48b48636586c5e21ad509 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Mon, 20 Feb 2012 18:59:17 -0600 Subject: 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. --- init.d/swap.in | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/init.d/swap.in b/init.d/swap.in index 0b229a1..fa08b4d 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 -- cgit v1.2.3