core/systemd to 216-3

core/systemd/PKGBUILD

@@ -7,13 +7,13 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=216
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
-             'util-linux' 'linux-api-headers' 'pam' 'python' 'python-lxml' 'quota-tools'
-             'shadow' 'xz')
+             'util-linux' 'linux-api-headers' 'pam' 'python' 'python-lxml'
+             'quota-tools' 'shadow' 'xz')
 options=('strip' 'debug')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
@@ -69,6 +69,7 @@ package_systemd() {
           etc/dbus-1/system.d/org.freedesktop.timedate1.conf
           etc/pam.d/systemd-user
           etc/systemd/bootchart.conf
+          etc/systemd/coredump.conf
           etc/systemd/journald.conf
           etc/systemd/logind.conf
           etc/systemd/system.conf
@@ -109,13 +110,16 @@ package_systemd() {
   install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
   install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
 
-  # ensure proper permissions for /var/log/journal
+  # ensure proper permissions for /var/log/journal. This is only to placate
   chown root:systemd-journal "$pkgdir/var/log/journal"
-  chmod 2755 "$pkgdir/var/log/journal"
+  chmod 2755 "$pkgdir/var/log/journal"{,/remote}
 
   # fix pam file
   sed 's|system-auth|system-login|g' -i "$pkgdir/etc/pam.d/systemd-user"
 
+  # ship default policy to leave services disabled
+  echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
+
   ### split out manpages for sysvcompat
   rm -rf "$srcdir/_sysvcompat"
   install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/

core/systemd/systemd.install

@@ -37,7 +37,6 @@ _dir_empty() {
 
 post_common() {
   systemd-sysusers
-  systemd-tmpfiles --create
   udevadm hwdb --update
   journalctl --update-catalog
 }
@@ -142,13 +141,17 @@ _215_2_changes() {
   systemd-tmpfiles --create etc.conf
 }
 
-_216_1_changes() {
+_216_2_changes() {
   echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
   echo '   tuned in /etc/systemd/coredump.conf.'
 }
 
 post_install() {
-  systemd-firstboot --setup-machine-id
+  # because systemd can't sanely manage this meanial task...
+  uuidgen | {
+    read
+    echo "${REPLY//-}">etc/machine-id
+  }
 
   post_common "$@"
 
@@ -175,7 +178,8 @@ post_upgrade() {
                     210-1
                     213-4
                     214-2
-                    215-2)
+                    215-2
+                    216-2)
 
   for v in "${upgrades[@]}"; do
     if [[ $(vercmp "$v" "$2") -eq 1 ]]; then