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 F0E981389F5 for ; Mon, 17 Nov 2014 02:19:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58137E0DD5; Mon, 17 Nov 2014 02:19:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EEC47E0DD5 for ; Mon, 17 Nov 2014 02:19:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9FB33404B1 for ; Mon, 17 Nov 2014 02:19:25 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 559) id 7DAF729FF; Mon, 17 Nov 2014 02:19:23 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/static-dev: static-dev-0.1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: static-dev-0.1.ebuild ChangeLog X-VCS-Directories: sys-fs/static-dev X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20141117021923.7DAF729FF@oystercatcher.gentoo.org> Date: Mon, 17 Nov 2014 02:19:23 +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: 08fbe6b0-3b05-4974-907a-fe5fdc952675 X-Archives-Hash: d552796d9266384d91a761b6adca352f vapier 14/11/17 02:19:23 Modified: static-dev-0.1.ebuild ChangeLog Log: Only check for devtmpfs when installing into / #469620 by Roy Bamford. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200) Revision Changes Path 1.16 sys-fs/static-dev/static-dev-0.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild?r1=1.15&r2=1.16 Index: static-dev-0.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- static-dev-0.1.ebuild 27 Apr 2013 09:51:05 -0000 1.15 +++ static-dev-0.1.ebuild 17 Nov 2014 02:19:23 -0000 1.16 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild,v 1.15 2013/04/27 09:51:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild,v 1.16 2014/11/17 02:19:23 vapier Exp $ DESCRIPTION="A skeleton, statically managed /dev" HOMEPAGE="http://bugs.gentoo.org/107875" @@ -13,19 +13,20 @@ RDEPEND="sys-apps/makedev" +abort() { + echo + eerror "We have detected that you currently use udev or devfs or devtmpfs" + eerror "and this ebuild cannot install to the same mount-point." + die "Cannot install on udev/devfs tmpfs." +} + pkg_preinst() { - if [[ -d ${ROOT}/dev/.udev || -c ${ROOT}/dev/.devfs ]] || \ + if [[ -d ${ROOT}/dev/.udev || -c ${ROOT}/dev/.devfs ]] ; then + abort + fi + if [[ ${ROOT} == "/" ]] && \ ! awk '$2 == "/dev" && $3 == "devtmpfs" { exit 1 }' /proc/mounts ; then - echo "" - eerror "We have detected that you currently use udev or devfs or devtmpfs" - eerror "and this ebuild cannot install to the same mount-point." - eerror "Please reinstall the ebuild (as root) like follows:" - eerror "" - eerror "mkdir /tmp/newroot" - eerror "mount -o bind / /tmp/newroot" - eerror "ROOT=/tmp/newroot/ emerge sys-fs/static-dev" - eerror "umount /tmp/newroot" - die "Cannot install on udev/devfs tmpfs." + abort fi } 1.15 sys-fs/static-dev/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/static-dev/ChangeLog?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/static-dev/ChangeLog?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/static-dev/ChangeLog?r1=1.14&r2=1.15 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/static-dev/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ChangeLog 27 Apr 2013 09:51:05 -0000 1.14 +++ ChangeLog 17 Nov 2014 02:19:23 -0000 1.15 @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/static-dev -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/ChangeLog,v 1.14 2013/04/27 09:51:05 vapier Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/ChangeLog,v 1.15 2014/11/17 02:19:23 vapier Exp $ + + 17 Nov 2014; Mike Frysinger static-dev-0.1.ebuild: + Only check for devtmpfs when installing into / #469620 by Roy Bamford. 27 Apr 2013; Mike Frysinger static-dev-0.1.ebuild: Check for devtmpfs too #454404 by Alexander Tsoy.