diff options
| -rw-r--r-- | libre/filesystem/PKGBUILD | 27 | ||||
| -rw-r--r-- | libre/filesystem/filesystem.install | 4 | ||||
| -rw-r--r-- | libre/filesystem/group | 2 | ||||
| -rw-r--r-- | libre/filesystem/gshadow | 2 | ||||
| -rw-r--r-- | libre/filesystem/os-release | 2 | ||||
| -rw-r--r-- | libre/filesystem/passwd | 2 | ||||
| -rw-r--r-- | libre/filesystem/shadow | 2 |
7 files changed, 17 insertions, 24 deletions
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index d2b2d8aca..8adc24971 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 282858 2016-12-05 23:47:36Z seblu $ +# $Id: PKGBUILD 291699 2017-03-26 22:06:04Z seblu $ # Maintainer (Arch): Sébastien Luttringer # Contributor (Arch): Tom Gundersen <teg@jklm.no> # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=filesystem -pkgver=2016.12 -pkgrel=2.parabola2 +pkgver=2017.03 +pkgrel=2.parabola1 pkgdesc='Base Parabola GNU/Linux-libre files (Parabola rebranded)' arch=('i686' 'x86_64' 'armv7h') license=('GPL') @@ -23,22 +23,22 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' 'shells' 'gshadow' 'profile' 'parabola.7.txt' 'locale.sh') -md5sums=('4d7417d2bf8872665c0907f09ae37c34' +md5sums=('76c80215d8dd395d3be4b8a711d585b6' '6be47d893fd49b2e4a8c0e811b350861' '7b21f0f97f048988908bf93778bba65f' '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' '6e488ffecc8ba142c0cf7e2d7aeb832e' - 'a998d1e6c7cc5791a7f4a2b49b2d10ce' - '1ec1b16e2a71fad63ab8f147069a5d97' + 'cb1a751b05541d8eebaace316de0e809' + 'c0c27476ee248355bf308c8502a8c860' '693c97f2c9a519bb97a17008e92c2b74' '49639d107b75fe4e668ae27749da32ab' '7bc65f234dfb6abf24e7c3b03e86f4ff' 'd41d8cd98f00b204e9800998ecf8427e' - '83e0de34441a56684db8f813099d62f8' + '24f9ba68a8fea07621d68f77584a1c69' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' - '69e460404f45bdb7288d1de662e56dd9' + 'c08581d4f982be8806d3afa912a65203' 'cfa3345c485c59e681ab39a44dc7ece1' 'd5732ffdb3488e1383d4ea199343e767' '71ed98c52e11ada1f936ac8cb14eecd9') @@ -92,14 +92,16 @@ package() { # 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/parabola-release ln -sv parabola-release etc/arch-release @@ -156,4 +158,7 @@ package() { 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 } diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 9793ad25c..478c049e7 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -30,10 +30,6 @@ post_upgrade() { _addgroup scanner -g 96 _addgroup rfkill -g 24 _addgroup lock -g 54 - _addgroup uuidd -g 68 - _adduser uuidd -u 68 -d / -g uuidd -s /usr/bin/nologin - _addgroup dbus -g 81 - _adduser dbus -u 81 -d / -g dbus -s /usr/bin/nologin _addgroup input -g 97 _addgroup systemd-journal -g 190 _addgroup systemd-journal-gateway -g 191 diff --git a/libre/filesystem/group b/libre/filesystem/group index f922eadcf..2e6dcef93 100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -21,8 +21,6 @@ proc:x:26: http:x:33: games:x:50: lock:x:54: -uuidd:x:68: -dbus:x:81: network:x:90: video:x:91: audio:x:92: diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index b89cf7709..ac5396ee0 100644 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow @@ -21,8 +21,6 @@ proc::: http::: games::: lock::: -uuidd:x:: -dbus:x:: network:x:: video:x:: audio::: diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release index 273a1dfbb..987882266 100644 --- a/libre/filesystem/os-release +++ b/libre/filesystem/os-release @@ -1,7 +1,7 @@ NAME="Parabola" +PRETTY_NAME="Parabola GNU/Linux-libre" ID=parabola ID_LIKE=arch -PRETTY_NAME="Parabola GNU/Linux-libre" ANSI_COLOR="1;35" HOME_URL="https://www.parabola.nu/" BUG_REPORT_URL="https://labs.parabola.nu/" diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd index b3e79eb9d..c0987cef1 100644 --- a/libre/filesystem/passwd +++ b/libre/filesystem/passwd @@ -4,8 +4,6 @@ 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:/:/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 diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow index 4c6e3d18f..9c99a6c34 100644 --- a/libre/filesystem/shadow +++ b/libre/filesystem/shadow @@ -4,8 +4,6 @@ daemon:x:14871:::::: mail:x:14871:::::: ftp:x:14871:::::: http:x:14871:::::: -uuidd:x:14871:::::: -dbus:x:14871:::::: nobody:x:14871:::::: systemd-journal-gateway:x:14871:::::: systemd-timesync:x:14871:::::: |