Do not install /etc/hosts if it already exists, bug #21645

3 files changed, 27 insertions, 14 deletions

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 395b93345934..2e71ed06a1ed 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,8 +1,8 @@
 MD5 a376a9183f575cae744a22be561de340 baselayout-1.8.6.8-r1.ebuild 19092
 MD5 08d4f1d2390a81d1e05097a2d2d2af9d baselayout-1.8.5.9.ebuild 15442
-MD5 46efa1b6140dfb093a6414d22d438a01 baselayout-1.8.6.10-r1.ebuild 19690
+MD5 47d934edf2661454e3fd7e91f9c75549 baselayout-1.8.6.10-r1.ebuild 19797
 MD5 4bb66d88eb188f1f1aaa97ea58c1602b ChangeLog 18909
-MD5 232b12e26f3b82915eaa9d14a13b3218 baselayout-1.8.6.11.ebuild 19328
+MD5 e30c530cde4ec054482d6477450d3035 baselayout-1.8.6.11.ebuild 19549
 MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397
 MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
diff --git a/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
index 0430af656168..2955814ae09f 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild,v 1.8 2003/10/14 21:24:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild,v 1.9 2003/10/26 22:05:04 azarah Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -272,6 +272,9 @@ src_install() {
 		[ -f ${foo} ] && doins ${foo}
 	done
 	chmod go-rwx ${D}/etc/shadow
+	# We do not want to overwrite the user's settings
+	[ -f "${ROOT}/etc/hosts" ] && rm -f ${ROOT}/etc/hosts
+
 	keepdir_mount /mnt/floppy /mnt/cdrom
 	chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom
 
diff --git a/sys-apps/baselayout/baselayout-1.8.6.11.ebuild b/sys-apps/baselayout/baselayout-1.8.6.11.ebuild
index 5e3e78f0eafe..51cff473d458 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.11.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.11.ebuild,v 1.1 2003/10/14 21:24:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.11.ebuild,v 1.2 2003/10/26 22:05:04 azarah Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -159,38 +159,40 @@ keepdir_mount() {
 }
 
 create_dev_nodes() {
+	export PATH="${D}/sbin:${PATH}"
+
 	case ${ARCH} in
 		x86)
 			einfo "Using generic-i386 to make device nodes..."
-			${ROOT}/sbin/MAKEDEV generic-i386
+			${D}/sbin/MAKEDEV generic-i386
 			;;
 		ppc)
 			einfo "Using generic-powerpc to make device nodes..."
-			${ROOT}/sbin/MAKEDEV generic-powerpc
+			${D}/sbin/MAKEDEV generic-powerpc
 			;;
 		sparc)
 			einfo "Using generic-sparc to make device nodes..."
-			${ROOT}/sbin/MAKEDEV generic-sparc
+			${D}/sbin/MAKEDEV generic-sparc
 			;;
 		mips)
 			einfo "Using generic-mips to make device nodes..."
-			${ROOT}/sbin/MAKEDEV generic-mips
+			${D}/sbin/MAKEDEV generic-mips
 			;;
 		arm)
 			einfo "Using generic-arm to make device nodes..."
-			${ROOT}/sbin/MAKEDEV generic-arm
+			${D}/sbin/MAKEDEV generic-arm
 			;;
 		hppa)
 			einfo "Using generic-hppa to make device nodes..."
-			${ROOT}/sbin/MAKEDEV generic-hppa
+			${D}/sbin/MAKEDEV generic-hppa
 			;;
 		*)
 			einfo "Using generic to make device nodes..."
-			${ROOT}/sbin/MAKEDEV generic
+			${D}/sbin/MAKEDEV generic
 			;;
 	esac
 
-	${ROOT}/sbin/MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
+	${D}/sbin/MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
 }
 
 src_install() {
@@ -285,6 +287,9 @@ src_install() {
 		[ -f ${foo} ] && doins ${foo}
 	done
 	chmod go-rwx ${D}/etc/shadow
+	# We do not want to overwrite the user's settings
+	[ -f "${ROOT}/etc/hosts" ] && rm -f ${ROOT}/etc/hosts
+
 	keepdir_mount /mnt/floppy /mnt/cdrom
 	chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom
 
@@ -531,8 +536,13 @@ pkg_postinst() {
 	# is used, as this was the cause for all the devfs problems we had
 	if [ "${altmerge}" -eq "0" -a ! -e "${ROOT}/dev/.udev" ]
 	then
-		einfo "Populating /dev with device nodes..."
-		tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" -C "${ROOT}/dev"
+		if [ -n "$(use selinux)" -a \
+		     -z "$(use build)" -a -z "$(use bootstrap)" ]
+		then
+			einfo "Populating /dev with device nodes..."
+			tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
+				-C "${ROOT}/dev"
+		fi
 	fi
 
 	echo