[arch-commits] Commit in filesystem/trunk (PKGBUILD)

[Sébastien Luttringer]

    Date: Sunday, March 26, 2017 @ 21:01:41
  Author: seblu
Revision: 291693

upgpkg: filesystem 2017.03-1

- FS#52781
- FS#52408

Modified:
  filesystem/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2017-03-26 20:57:11 UTC (rev 291692)
+++ PKGBUILD    2017-03-26 21:01:41 UTC (rev 291693)
@@ -3,8 +3,8 @@
 # Contributor: Tom Gundersen <t...@jklm.no>
 
 pkgname=filesystem
-pkgver=2016.12
-pkgrel=2
+pkgver=2017.03
+pkgrel=1
 pkgdesc='Base Arch Linux files'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -88,14 +88,16 @@
        # vsftpd won't run with write perms on /srv/ftp
        install -d -m555 -g ftp srv/ftp
 
-       # setup /etc
-       install -d etc/{ld.so.conf.d,skel,profile.d}
+       # setup /etc and /usr/share/factory/etc
+       install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc
        for f in fstab group host.conf hosts issue ld.so.conf motd 
nsswitch.conf passwd resolv.conf securetty shells profile; do
                install -m644 "$srcdir"/$f etc/
+               install -m644 "$srcdir"/$f usr/share/factory/etc/
        done
-       ln -s /proc/self/mounts etc/mtab
+       ln -s ../proc/self/mounts etc/mtab
        for f in gshadow shadow crypttab; do
                install -m600 "$srcdir"/$f etc/
+               install -m600 "$srcdir"/$f usr/share/factory/etc/
        done
        touch etc/arch-release
        install -m755 "$srcdir"/locale.sh etc/profile.d/locale.sh
@@ -151,4 +153,7 @@
                install -d -m755 usr/local/$d
        done
        ln -s ../man usr/local/share/man
+
+       # remove conflict with systemd
+       rm usr/share/factory/etc/nsswitch.conf
 }