From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RzXSZ-0000To-AJ for garchives@archives.gentoo.org; Mon, 20 Feb 2012 17:55:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA237E0B2F; Mon, 20 Feb 2012 17:55:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8769DE0B2F for ; Mon, 20 Feb 2012 17:55:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF4F81B401E for ; Mon, 20 Feb 2012 17:55:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A7CF2E53FF for ; Mon, 20 Feb 2012 17:55:25 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1329760268.06d67017850e106f14d8948003027612253b143a.WilliamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/swap.in X-VCS-Directories: init.d/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 06d67017850e106f14d8948003027612253b143a X-VCS-Branch: master Date: Mon, 20 Feb 2012 17:55:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6d832fe9-b322-45e1-8246-946627e86430 X-Archives-Hash: 9a45df7afd75748c4fae51b35845a607 commit: 06d67017850e106f14d8948003027612253b143a Author: William Hubbs gentoo org> AuthorDate: Mon Feb 20 17:51:08 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Feb 20 17:51:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D06d67017 Revert "swap: go back to using swapon for Linux systems" This reverts commit 297720787f914ca34f2d04c66980c18c57700865. robbat2 tells me there is a better way to fix this. --- init.d/swap.in | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/init.d/swap.in b/init.d/swap.in index fa08b4d..0b229a1 100644 --- a/init.d/swap.in +++ b/init.d/swap.in @@ -12,7 +12,15 @@ start() { ebegin "Activating swap devices" case "$RC_UNAME" in - Linux) swapon -a -e >/dev/null;; + Linux) + local dev + for dev in $(fstabinfo -b -t swap); do + case "$dev" in + /dev/loop*) ;; + *) swapon $dev >/dev/null;; + esac + done + ;; NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;; *) swapon -a >/dev/null;; esac