libre/filesystem: Fix

 - PKGBUILD: include md5sums() also, for diffing with Arch
 - PKGBUILD: include the fotter, for diffing with Arch
 - issue: sync with Arch
 - os-release: Re-add ID_LIKE.  The change made
   to mirror Arch commit

       git-svn-id: file:///srv/repos/svn-packages/svn@341200 eb2447ed-0c53-47e4-bac8-5bc4a241df78

   should have changed it from ID_LIKE="arch archlinux" to ID_LIKE=arch,
   but it dropped ID_LIKE entirely.  This broke Holo.
 - sysctl, sysusers, tmpfiles, environment-generator: Don't duplicate files
   having the same file twice can cause problems.  Some things hard-code
   the file names.  Use Arch's names.  There's no reason to consider these
   branding.

3 files changed, 34 insertions, 12 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 82f1c4288..0fa3ca06f 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -5,7 +5,8 @@
 
 pkgname=filesystem
 pkgver=2018.12
-pkgrel=2.par1
+pkgrel=2
+pkgrel+=.par2
 pkgdesc='Base Parabola GNU/Linux-libre files'
 arch=('i686' 'x86_64' 'armv7h' 'ppc64le')
 license=('GPL')
@@ -22,6 +23,28 @@ source=('crypttab' 'env-generator' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts'
         'issue' 'ld.so.conf' 'locale.sh' 'motd' 'nsswitch.conf' 'os-release'
         'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl'
         'sysusers' 'tmpfiles')
+md5sums=('5fa6674df7645d7f5895f2d12b4ef4e9'
+         '2b0344e9639f35f3c0d5637a23556089'
+         'e33f6dfdd61978fcb3ddf1431286e05a'
+         '7fed1e1fb855e41a6d64d41f8521d69a'
+         '1c1e3b08acfa286f4b417c49de3e4366'
+         '7d119a9cce152aa182fb3392ddeecea7'
+         'a1315ea3e2b64d197b6efaf9c14ff778'
+         '50d7534eb401aeeff3fec43cdea1c616'
+         '5deb9f890a4d08a245e9752ede77271e'
+         '580cf8b59eebfaac4fad373ffadc9912'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '981ee4d7e506a9d6d9ed2d872e16004b'
+         'afdb512931a0fb34e59b67df5ac7f02d'
+         '5182ac38a0de85da8ade93ef71975ca4'
+         '2c79e1762978235e7b4a9ef595f6c029'
+         '0ee015fad07732676d9488ae498eed41'
+         'f04bcb2803afc4dcb95670fe87343b4d'
+         'f64466dd77c7bec37a8b47681468211a'
+         'a78cd8d7f8240a8448edee82f503c34e'
+         'a51847c012555c843dbdf8df0da171d3'
+         '9010c45efc9156e6f57f641ce43f9ad7'
+         '0267a3a463f35eec8a31f40a720dfd86')
 sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
             'ed0cb4f1db4021f8c3b5ce78fdf91d2c0624708f58f36c9cf867f4d93c3bc6da'
             'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696'
@@ -29,12 +52,12 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
             '90d879374f77bac47f132164c1e7fc4892e994ff1d1ac376efa0c1c26ea37273'
             '4d7b647169063dfedbff5e1e22cee77bd1a4183dbcfd5e802e68939da4bbf733'
             'd9cd8a77d9e0aa5e90d7f4ed74c8745c17b525e720e28e4c44364150003c35f9'
-            '3ad448c78cab733759ae3365620504b1444e854effd066f1c7174652f046ebe1'
+            '8b8f24af3454e87b4e316b4978d0de7958a98cc44606aa801d9696d2c21f4385'
             'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5'
             '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10'
             'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
             '2af11d071689f648859a65dd9fbb677bfaa89b0935676e4f1df769e9a90f73a9'
-            'cf8dfc568f4a6aafc712dbe74542faaec5649b62e67cbb1c856f9d4f3e53b90d'
+            '790e27d0c37afab5a2816f8a848b38b3298efde88fd4ee655adc27bd60901e15'
             '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
             '5da078777cda24e4df697e2928451723f2303bfdbb2ce9551c822188c7945d25'
             '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c'
@@ -120,18 +143,16 @@ package() {
   ln -s ../man usr/local/share/man
 
   # setup systemd-sysctl
-  install -D -m644 "$srcdir"/sysctl usr/lib/sysctl.d/10-parabola.conf
-  ln -sv 10-parabola.conf usr/lib/sysctl.d/10-arch.conf
+  install -D -m644 "$srcdir"/sysctl usr/lib/sysctl.d/10-arch.conf
 
   # setup systemd-sysusers
-  install -D -m644 "$srcdir"/sysusers usr/lib/sysusers.d/parabola.conf
-  ln -sv parabola.conf 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 usr/lib/tmpfiles.d/parabola.conf
-  ln -sv parabola.conf 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-parabola
-  ln -sv 10-parabola usr/lib/systemd/system-environment-generators/10-arch
+  install -D -m755 "$srcdir"/env-generator usr/lib/systemd/system-environment-generators/10-arch
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/filesystem/issue b/libre/filesystem/issue
index b001c55dd..8fc2fbb0b 100644
--- a/libre/filesystem/issue
+++ b/libre/filesystem/issue
@@ -1,2 +1,2 @@
-Parabola GNU/Linux-libre \r  (\n) (\l)
+Parabola GNU/Linux-libre \r (\l)
 
diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release
index 16d28572b..500714dbc 100644
--- a/libre/filesystem/os-release
+++ b/libre/filesystem/os-release
@@ -1,6 +1,7 @@
 NAME="Parabola"
 PRETTY_NAME="Parabola GNU/Linux-libre"
 ID=parabola
+ID_LIKE=arch
 BUILD_ID=rolling
 ANSI_COLOR="1;35"
 HOME_URL="https://www.parabola.nu/"