diff options
| -rw-r--r-- | libre/filesystem/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/filesystem/filesystem.install | 20 | ||||
| -rw-r--r-- | libre/filesystem/group | 2 | ||||
| -rw-r--r-- | libre/filesystem/passwd | 8 | ||||
| -rw-r--r-- | libre/filesystem/shadow | 5 |
5 files changed, 31 insertions, 14 deletions
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 16d3b8944..7c5383411 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 214251 2014-06-04 14:43:58Z dreisner $ +# $Id: PKGBUILD 215050 2014-06-11 23:14:55Z dreisner $ # Maintainer (Arch): Tom Gundersen <teg@jklm.no> # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=filesystem pkgver=2014.06 -pkgrel=1 +pkgrel=2 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -21,14 +21,14 @@ 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=('764dca1d786d43fbee33364ccbebfcd3' +md5sums=('89adbc553847ba96b3437234dc224f9d' '6be47d893fd49b2e4a8c0e811b350861' '9e4533df61f0c82d6b2e2371f7376282' '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' '6e488ffecc8ba142c0cf7e2d7aeb832e' - '18a8a3564f40a28d8f9f6060001c6f9e' - '2ef2429c2c98d0883906aa6f5363be80' + 'a998d1e6c7cc5791a7f4a2b49b2d10ce' + '1ec1b16e2a71fad63ab8f147069a5d97' '693c97f2c9a519bb97a17008e92c2b74' '1745349eb24ed21b4cfaa6f423bddb76' '7bc65f234dfb6abf24e7c3b03e86f4ff' diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 7a43b24df..2ce661725 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -1,14 +1,14 @@ # args: <group> [options] _addgroup() { - if ! getent group "$1" >/dev/null; then - groupadd "$@" >/dev/null + if ! getent group "$1" >/dev/null && groupadd "$@" >/dev/null; then + need_group_update=1 fi } # args: <group> [options] _adduser() { - if ! getent passwd "$1" >/dev/null; then - useradd "$@" >/dev/null + if ! getent passwd "$1" >/dev/null && useradd "$@" >/dev/null; then + need_passwd_update=1 fi } @@ -40,12 +40,20 @@ post_upgrade() { _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 + _addgroup systemd-bus-proxy -g 194 + _adduser systemd-bus-proxy -u 194 -g 194 -d / -s /usr/bin/nologin + _addgroup systemd-resolve -g 195 + _adduser systemd-resolve -u 195 -g 195 -d / -s /usr/bin/nologin - # sync gshadow to group (fixes FS#19869) - if ! grep -q '^lock:' etc/gshadow; then + # update shadow files if needed + if (( need_group_update )); then grpconv >/dev/null fi + if (( need_passwd_update )); then + pwconv >/dev/null + fi + if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf fi diff --git a/libre/filesystem/group b/libre/filesystem/group index 3a481a2c0..0d26d616a 100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -36,3 +36,5 @@ systemd-journal:x:190: systemd-journal-gateway:x:191: systemd-timesync:x:192: systemd-network:x:193: +systemd-bus-proxy:x:194: +systemd-resolve:x:195: diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd index 2f404bb41..b3e79eb9d 100644 --- a/libre/filesystem/passwd +++ b/libre/filesystem/passwd @@ -1,12 +1,14 @@ root:x:0:0:root:/root:/bin/bash bin:x:1:1:bin:/bin:/usr/bin/nologin -daemon:x:2:2:daemon:/sbin:/usr/bin/nologin +daemon:x:2:2:daemon:/:/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 +uuidd:x:68:68:uuidd:/:/usr/bin/nologin +dbus:x:81:81:dbus:/:/usr/bin/nologin 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 +systemd-bus-proxy:x:194:194:systemd-bus-proxy:/:/usr/bin/nologin +systemd-resolve:x:195:195:systemd-resolve:/:/usr/bin/nologin diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow index 39ebb13c7..4c6e3d18f 100644 --- a/libre/filesystem/shadow +++ b/libre/filesystem/shadow @@ -7,3 +7,8 @@ http:x:14871:::::: uuidd:x:14871:::::: dbus:x:14871:::::: nobody:x:14871:::::: +systemd-journal-gateway:x:14871:::::: +systemd-timesync:x:14871:::::: +systemd-network:x:14871:::::: +systemd-bus-proxy:x:14871:::::: +systemd-resolve:x:14871:::::: |