[arch-commits] Commit in systemd/trunk (PKGBUILD systemd.install)

[Dave Reisner]

    Date: Monday, January 7, 2013 @ 21:59:16
  Author: dreisner
Revision: 174857

upgpkg: systemd 197-1

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-----------------+
 PKGBUILD        |   30 ++++++++++++------------------
 systemd.install |   34 +++++++++++++++++++++++++++-------
 2 files changed, 39 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-08 02:53:39 UTC (rev 174856)
+++ PKGBUILD	2013-01-08 02:59:16 UTC (rev 174857)
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=196
-pkgrel=2
+pkgver=197
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -17,7 +17,7 @@
         'initcpio-install-udev'
         'initcpio-install-timestamp'
         'use-split-usr-path.patch')
-md5sums=('05ebd7f108e420e2b4e4810ea4b3c810'
+md5sums=('56a860dceadfafe59f40141eb5223743'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
@@ -30,15 +30,19 @@
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
 
   ./configure \
+      PYTHON=python2 \
+      PYTHON_CONFIG=python2-config \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
       --sysconfdir=/etc \
       --enable-introspection \
       --enable-gtk-doc \
       --disable-audit \
-      --disable-ima \
-      --with-distro=arch
+      --disable-ima
 
+  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
+  # https://pokersource.info/show_bug.cgi?id=50989
+
   make
 }
 
@@ -50,9 +54,9 @@
   pkgdesc="system and service manager"
   depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
            'pam' 'util-linux' 'xz')
-  provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver")
-  replaces=('libsystemd' 'systemd-tools' 'udev')
-  conflicts=('libsystemd' 'systemd-tools' 'udev')
+  provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
+  replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
+  conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
   optdepends=('cryptsetup: required for encrypted block devices'
               'libmicrohttpd: systemd-journal-gatewayd'
               'quota-tools: kernel-level quota management'
@@ -87,12 +91,6 @@
   done
   rm -rf "$pkgdir/etc/bash_completion.d"
 
-  # zsh completion isn't installed as part of 196
-  # http://i.imgur.com/hMJgX.jpg
-  # TODO(dreisner): remove this for 197
-  install -Dm644 "$pkgname-$pkgver/shell-completion/systemd-zsh-completion.zsh" \
-      "$pkgdir/usr/share/zsh/site-functions/_systemd"
-
   # don't write units to /etc by default -- we'll enable this on post_install
   # as a sane default
   rm "$pkgdir/etc/systemd/system/getty.target.wants/getty at tty1.service"
@@ -101,10 +99,6 @@
   # get rid of RPM macros
   rm -r "$pkgdir/etc/rpm"
 
-  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
-  # https://pokersource.info/show_bug.cgi?id=50989
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
   # the path to udevadm is hardcoded in some places
   install -d "$pkgdir/sbin"
   ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"

Modified: systemd.install
===================================================================
--- systemd.install	2013-01-08 02:53:39 UTC (rev 174856)
+++ systemd.install	2013-01-08 02:59:16 UTC (rev 174857)
@@ -24,14 +24,28 @@
   fi
 }
 
+mask_net_naming() {
+  if [ ! -e etc/udev/rules.d/80-net-name-slot.rules ]; then
+    printf >etc/udev/rules.d/80-net-name-slot.rules '# %s\n' \
+      "This file masks persistent renaming rules for network devices. If you" \
+      "delete this file, /usr/lib/udev/rules.d/80-net-name-slot.rules may" \
+      "rename network devices according to ID_NET_NAME_{ONBOARD,SLOT,PATH}" \
+      "properties of your network devices, with priority in that order. See" \
+      "the output of 'udevadm test-builtin /sys/class/net/\$interface' for" \
+      "details on what that new name might be." \
+      "" \
+      "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+  fi
+}
+
 post_install() {
   post_common
 
   # enable getty at tty1 by default, but don't track the file
   systemctl enable getty at .service
 
-  echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
-  echo "   bootloader to replace sysvinit with systemd"
+  echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
+  echo "   bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
 }
 
 post_upgrade() {
@@ -50,11 +64,6 @@
     printf '    controlled with the Storage setting in /etc/systemd/journald.conf\n'
   fi
 
-  if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then
-    printf '==> The legacy configuration options are no longer supported in rc.conf,\n'
-    printf '    convert your rc.conf to the new configuration formats.\n'
-  fi
-
   # logind's protocol changed. kindly restart the daemon to avoid locking
   # out further logins.
   if [ "$(vercmp 195 "$2")" -eq 1 ]; then
@@ -62,6 +71,17 @@
       systemctl restart systemd-logind.service
     fi
   fi
+
+  if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then
+    printf '==> The legacy configuration options are no longer supported in rc.conf,\n'
+    printf '    convert your rc.conf to the new configuration formats.\n'
+  fi
+
+  if [ "$(vercmp 197-1 "$2")" -eq 1 ]; then
+    mask_net_naming
+    printf '==> Persistent net naming rules have been shipped as disabled.\n'
+    printf '    See /etc/udev/rules.d/80-net-name-slot.rules for more detail\n'
+  fi
 }
 
 # vim:set ts=2 sw=2 et: