make sure we update passwd/fstab/etc... properly #73116

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index f701d0d11e2dd1a4f46e4b059b76f5c1e8803652..dfbea4d86d10840142b9ebd4ed64b392f2f6b2a3 100644 (file)
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 d75a9d0fcbd0a904f053081895b4db81 ChangeLog 42866
 MD5 fffe698bc7055dadfc973ee21c7ea811 baselayout-1.10.3.ebuild 15557
 MD5 5a82dc04429fe73bebe1c286125d31ef baselayout-1.10.4.ebuild 15557
@@ -7,7 +10,7 @@ MD5 2d858926cc45dafb070e01636521da3b baselayout-1.9.4-r5.ebuild 16779
 MD5 5a6e60d4a0e6baf8f051488786595d0c baselayout-1.9.4-r6.ebuild 16833
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
 MD5 d8a976d600ec13746edc697941c49452 baselayout-1.11.5.ebuild 16300
-MD5 0b538c59295398a0726db9113bbe3104 baselayout-1.11.6-r1.ebuild 16453
+MD5 14278861a1ae53f620f07c07e168ac8c baselayout-1.11.6-r1.ebuild 16524
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r3 134
 MD5 ab3b5bbd5ce8a8b1386c834ff4a118b4 files/digest-baselayout-1.10.3 69
@@ -22,3 +25,10 @@ MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
 MD5 3d1b5592b9b3398edb36d29422dc0143 files/rc-scripts-1.4.16-livecd.patch 672
 MD5 2830f69d5bf36a3db710e893a5dc501f files/digest-baselayout-1.11.5 69
 MD5 91e3a9eebc03ba2f2d2226ee4f78a177 files/digest-baselayout-1.11.6-r1 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBryZYroRuSHgZdywRAhGQAJ9EzbM0Qj8TiKyAp0J8jlbn+VOYAACfWhL5
+N7fj4wasK97JAg+i1+dSb2U=
+=a5/9
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/baselayout/baselayout-1.11.6-r1.ebuild b/sys-apps/baselayout/baselayout-1.11.6-r1.ebuild
index 685cce8029ef2e49bd7b97f90dd0a88c9f67130f..cce16ae3c25a28523a22488dd9f45d7a13863faf 100644 (file)
--- a/sys-apps/baselayout/baselayout-1.11.6-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.6-r1.ebuild,v 1.3 2004/11/12 15:37:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.6-r1.ebuild,v 1.4 2004/12/02 14:27:20 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -454,9 +454,13 @@ pkg_postinst() {
        # Touching /etc/passwd and /etc/shadow after install can be fatal, as many
        # new users do not update them properly...  see src_install() for why they
        # are in /usr/share/baselayout/
-       if use build || use bootstrap; then
-               cp ${ROOT}/usr/share/baselayout/{passwd,shadow,group,fstab} ${ROOT}/etc
-       fi
+       for x in passwd shadow group fstab ; do
+               if [[ -e ${ROOT}/etc/${x} ]] ; then
+                       touch "${ROOT}/etc/${x}"
+               else
+                       cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
+               fi
+       done
 
        # Under what circumstances would mtab be a symlink?  It would be
        # nice if there were an explanatory comment here