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

[Sébastien Luttringer]

    Date: Sunday, September 3, 2017 @ 21:43:18
  Author: seblu
Revision: 304621

upgpkg: filesystem 2017.09-1

- fix FS#55467
- define archlinux default PATH with a systemd environment generator

Added:
  filesystem/trunk/env-generator
Modified:
  filesystem/trunk/PKGBUILD
  filesystem/trunk/tmpfiles

---------------+
 PKGBUILD      |   28 ++++++++++++++++------------
 env-generator |    3 +++
 tmpfiles      |    1 -
 3 files changed, 19 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-03 20:09:04 UTC (rev 304620)
+++ PKGBUILD	2017-09-03 21:43:18 UTC (rev 304621)
@@ -3,7 +3,7 @@
 # Contributor: Tom Gundersen <teg at jklm.no>
 
 pkgname=filesystem
-pkgver=2017.08
+pkgver=2017.09
 pkgrel=1
 pkgdesc='Base Arch Linux files'
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release'
         'resolv.conf' 'shells' 'gshadow' 'profile' 'locale.sh' 'sysusers'
-        'tmpfiles')
+        'tmpfiles' 'env-generator')
 md5sums=('7fed1e1fb855e41a6d64d41f8521d69a'
          '7813c481156f6b280a3ba91fc6236368'
          '44851ecc062ba34a4c024b6f3246c48f'
@@ -39,7 +39,8 @@
          '13feaea89d404729ad2f7cf0bcc41d85'
          '71ed98c52e11ada1f936ac8cb14eecd9'
          '6ec767b80e0df5c4450078363a31bca0'
-         '6723590b164b281f471e8b1cd926b633')
+         '0267a3a463f35eec8a31f40a720dfd86'
+         '2b0344e9639f35f3c0d5637a23556089')
 
 package() {
   cd "$pkgdir"
@@ -68,7 +69,7 @@
   done
   touch etc/arch-release
   install -m755 "$srcdir"/locale.sh etc/profile.d/locale.sh
-  install -Dm644 "$srcdir"/os-release "$pkgdir"/usr/lib/os-release
+  install -Dm644 "$srcdir"/os-release usr/lib/os-release
 
   # setup /var
   for d in cache local opt log/old lib/misc empty; do
@@ -91,16 +92,16 @@
   done
 
   # add lib symlinks
-  ln -s usr/lib "$pkgdir"/lib
+  ln -s usr/lib lib
   [[ $CARCH = 'x86_64' ]] && (
-    ln -s usr/lib "$pkgdir"/lib64
-    ln -s lib "$pkgdir"/usr/lib64
+    ln -s usr/lib lib64
+    ln -s lib usr/lib64
   )
 
   # add bin symlinks
-  ln -s usr/bin "$pkgdir"/bin
-  ln -s usr/bin "$pkgdir"/sbin
-  ln -s bin "$pkgdir"/usr/sbin
+  ln -s usr/bin bin
+  ln -s usr/bin sbin
+  ln -s bin usr/sbin
 
   # setup /usr/local hierarchy
   for d in bin etc games include lib man sbin share src; do
@@ -109,10 +110,13 @@
   ln -s ../man usr/local/share/man
 
   # setup systemd-sysusers
-  install -D -m644 "$srcdir"/sysusers "$pkgdir"/usr/lib/sysusers.d/arch.conf
+  install -D -m644 "$srcdir"/sysusers usr/lib/sysusers.d/arch.conf
 
   # setup systemd-tmpfiles
-  install -D -m644 "$srcdir"/tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/arch.conf
+  install -D -m644 "$srcdir"/tmpfiles usr/lib/tmpfiles.d/arch.conf
+
+  # setup systemd.environment-generator
+  install -D -m755 "$srcdir"/env-generator usr/lib/systemd/system-environment-generators/10-arch
 }
 
 # vim:set ts=2 sw=2 et:

Added: env-generator
===================================================================
--- env-generator	                        (rev 0)
+++ env-generator	2017-09-03 21:43:18 UTC (rev 304621)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo 'PATH=/usr/local/sbin:/usr/local/bin:/usr/bin'


Property changes on: filesystem/trunk/env-generator
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: tmpfiles
===================================================================
--- tmpfiles	2017-09-03 20:09:04 UTC (rev 304620)
+++ tmpfiles	2017-09-03 21:43:18 UTC (rev 304621)
@@ -12,7 +12,6 @@
 C /etc/nsswitch.conf
 C /etc/passwd
 C /etc/profile
-C /etc/resolv.conf
 C /etc/securetty
 C /etc/shadow
 C /etc/shells