From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3E65C1381F3 for ; Fri, 26 Jul 2013 17:23:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C13F2E0A61; Fri, 26 Jul 2013 17:23:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5186EE0A61 for ; Fri, 26 Jul 2013 17:23:35 +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 0C0FF33E8B5 for ; Fri, 26 Jul 2013 17:23:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 962CDE468F for ; Fri, 26 Jul 2013 17:23:32 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1374858929.e942e88b8cf37cd7dc292b7dbcfa567114bdb28e.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/swapfiles.in X-VCS-Directories: init.d/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: e942e88b8cf37cd7dc292b7dbcfa567114bdb28e X-VCS-Branch: master Date: Fri, 26 Jul 2013 17:23:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3c87b309-a057-4f1b-afdd-ec01ffee1eb4 X-Archives-Hash: f6468dad4a7dea173c57610e899c395c commit: e942e88b8cf37cd7dc292b7dbcfa567114bdb28e Author: William Hubbs gmail com> AuthorDate: Fri Jul 26 17:15:29 2013 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Jul 26 17:15:29 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e942e88b swapfiles: do not try to unmount all tmpfs mounts This is handled in the swap script, so it should not be done here as well. X-Gentoo-Bug: 477534 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=477534 --- init.d/swapfiles.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in index ec73baa..144096a 100644 --- a/init.d/swapfiles.in +++ b/init.d/swapfiles.in @@ -21,14 +21,6 @@ start() stop() { ebegin "Deactivating additional swap space" - - # Try to unmount all tmpfs filesystems not in use, else a deadlock may - # occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it - # fixme: Do we need this here since we are only unmounting swap files - # and loopback swap? - cd "$RC_SVCDIR" - umount -a -t tmpfs 2>/dev/null - case "$RC_UNAME" in Linux) if [ -e /proc/swaps ]; then