summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-07-30 07:03:14 +0000
committerMike Frysinger <vapier@gentoo.org>2015-07-30 07:03:14 +0000
commite2e11915223462070a84bc31f8b5da8d14add861 (patch)
treee00aff9bdc0922ff3e8df1909e567d2ef25e31f7
parentBump (diff)
downloadhistorical-e2e11915223462070a84bc31f8b5da8d14add861.tar.gz
historical-e2e11915223462070a84bc31f8b5da8d14add861.tar.bz2
historical-e2e11915223462070a84bc31f8b5da8d14add861.zip
do not attempt to mount /boot when installing packages into a different root #532264 by Michał Górny
-rw-r--r--eclass/mount-boot.eclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/mount-boot.eclass b/eclass/mount-boot.eclass
index b2b7d38093a8..3a79dcbc2eb7 100644
--- a/eclass/mount-boot.eclass
+++ b/eclass/mount-boot.eclass
@@ -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