[gentoo-commits] gentoo-x86 commit in eclass: mount-boot.eclass

[Mike Frysinger (vapier)]

vapier      15/07/30 07:03:14

  Modified:             mount-boot.eclass
  Log:
  do not attempt to mount /boot when installing packages into a different root #532264 by Michał Górny

Revision  Changes    Path
1.21                 eclass/mount-boot.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mount-boot.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mount-boot.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mount-boot.eclass?r1=1.20&r2=1.21

Index: mount-boot.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mount-boot.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mount-boot.eclass	30 Jul 2015 07:00:40 -0000	1.20
+++ mount-boot.eclass	30 Jul 2015 07:03:14 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mount-boot.eclass,v 1.20 2015/07/30 07:00:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mount-boot.eclass,v 1.21 2015/07/30 07:03:14 vapier Exp $
 
 # @ECLASS: mount-boot.eclass
 # @MAINTAINER:
@@ -16,6 +16,11 @@
 EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_prerm pkg_postrm
 
 mount-boot_mount_boot_partition() {
+	# Since this eclass only deals with /boot, skip things when ROOT is active.
+	if [[ "${ROOT:-/}" != "/" ]] ; then
+		return
+	fi
+
 	if [[ -n ${DONT_MOUNT_BOOT} ]] ; then
 		return
 	else