Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre

4 files changed, 16 insertions, 12 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 9590f1a83..16d3b8944 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -4,8 +4,8 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=filesystem
-pkgver=2014.05
-pkgrel=2
+pkgver=2014.06
+pkgrel=1
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,13 +21,13 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
         'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt'
         'locale.sh')
-md5sums=('e26a6b21c1e154e87a5c45e8b8c366fd'
+md5sums=('764dca1d786d43fbee33364ccbebfcd3'
          '6be47d893fd49b2e4a8c0e811b350861'
          '9e4533df61f0c82d6b2e2371f7376282'
          '4c4540eeb748bf1f71d631b8c1dcf0b3'
          'f28150d4c0b22a017be51b9f7f9977ed'
          '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '932af5f313265a774ec5995d9e720025'
+         '18a8a3564f40a28d8f9f6060001c6f9e'
          '2ef2429c2c98d0883906aa6f5363be80'
          '693c97f2c9a519bb97a17008e92c2b74'
          '1745349eb24ed21b4cfaa6f423bddb76'
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 62e553ce4..7a43b24df 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -38,6 +38,8 @@ post_upgrade() {
 	_adduser systemd-journal-gateway -u 191 -g 191 -d / -s /usr/bin/nologin
 	_addgroup systemd-timesync -g 192
 	_adduser systemd-timesync -u 192 -g 192 -d / -s /usr/bin/nologin
+	_addgroup systemd-network -g 193
+	_adduser systemd-network -u 193 -g 193 -d / -s /usr/bin/nologin
 
 	# sync gshadow to group (fixes FS#19869)
 	if ! grep -q '^lock:' etc/gshadow; then
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 0d0918cbb..3a481a2c0 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -35,3 +35,4 @@ users:x:100:
 systemd-journal:x:190:
 systemd-journal-gateway:x:191:
 systemd-timesync:x:192:
+systemd-network:x:193:
diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd
index b65b7cc8a..2f404bb41 100644
--- a/libre/filesystem/passwd
+++ b/libre/filesystem/passwd
@@ -1,11 +1,12 @@
 root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/false
-daemon:x:2:2:daemon:/sbin:/bin/false
-mail:x:8:12:mail:/var/spool/mail:/bin/false
-ftp:x:14:11:ftp:/srv/ftp:/bin/false
-http:x:33:33:http:/srv/http:/bin/false
+bin:x:1:1:bin:/bin:/usr/bin/nologin
+daemon:x:2:2:daemon:/sbin:/usr/bin/nologin
+mail:x:8:12:mail:/var/spool/mail:/usr/bin/nologin
+ftp:x:14:11:ftp:/srv/ftp:/usr/bin/nologin
+http:x:33:33:http:/srv/http:/usr/bin/nologin
 uuidd:x:68:68:uuidd:/:/sbin/nologin
 dbus:x:81:81:dbus:/:/sbin/nologin
-nobody:x:99:99:nobody:/:/bin/false
-systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/bin/false
-systemd-timesync:x:192:192:systemd-timesync:/:/bin/false
+nobody:x:99:99:nobody:/:/usr/bin/nologin
+systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/usr/bin/nologin
+systemd-timesync:x:192:192:systemd-timesync:/:/usr/bin/nologin
+systemd-network:x:193:193:systemd-network:/:/usr/bin/nologin