Merge pull request lunar-linux#213 from Ratler/systemd-197

systemd: Version bumped to 197
Ratler · Jan 9, 2013 · 81a6f3b · 81a6f3b
2 parents 0549d6c + 34883ff
commit 81a6f3b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/system/systemd/BUILD b/system/systemd/BUILD
@@ -1,9 +1,10 @@
 (
 
-  OPTS+=" --with-distro=other \
-          --libexecdir=/usr/lib \
+  OPTS+=" --libexecdir=/usr/lib \
           --enable-split-usr \
-          --disable-tcpwrap"
+          --disable-tcpwrap \
+          --with-kbd-loadkeys=/usr/bin/loadkeys \
+          --with-kbd-setfont=/usr/bin/setfont"
 
   # a not existing hostname is set to lunar.
   [ -f /etc/hostname ] || install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/hostname /etc/hostname &&
@@ -19,9 +20,6 @@
   # the case in lunar, so we switch it to root.
   sedit "s:0775 root lock:0775 root root:" tmpfiles.d/legacy.conf &&
 
-  # loadkeys and setfont are in /usr/bin
-  sedit 's:"/bin/loadkeys:"/usr/bin/loadkeys:;s:"/bin/setfont:"/usr/bin/setfont:' Makefile.am Makefile.in &&
-
   default_config &&
   make &&
   prepare_install &&
@@ -31,11 +29,14 @@
     lrm --upgrade udev
   fi &&
 
-  # systemd is no longer PSAFE during the make install phase due to install order of some libs (systemd-journal).
-  # Please check if this is fixed with the next release.
-  unset MAKES &&
   make install &&
 
+  # Disable new naming scheme
+  if [[ "$NEW_NAME_SCHEME" == "n" && ! -e /etc/udev/rules.d/80-net-name-slot.rules ]]; then
+    echo "Disabled the new network interface naming scheme" 
+    ln -sf /dev/null /etc/udev/rules.d/80-net-name-slot.rules
+  fi &&
+
   # Always install the legacy.conf file even if SysV compatibility isn't enabled
   install -m 0644 -o root -g root tmpfiles.d/legacy.conf /usr/lib/tmpfiles.d
 

diff --git a/system/systemd/CONFIGURE b/system/systemd/CONFIGURE
@@ -0,0 +1,9 @@
+NSCHEME=$(get_module_config NEW_NAME_SCHEME)
+if [ -z "$NSCHEME" ] && ip link | egrep -q '^[0-9]*: (eth|wlan|ppp|ath|tun|ra|usb|br)[0-9]+[^>]*[<,]UP[,>]'; then
+  message "${PROBLEM_COLOR}WARNING:${MESSAGE_COLOR} You are still using the old network interface naming scheme."
+  message "It is recommended to switch to the new naming scheme. Please note"
+  message "that reconfiguration of your network interfaces using the new"
+  message "device names are required!\n"
+
+  mquery NEW_NAME_SCHEME "Enable new naming scheme for network interfaces (RECOMMENDED)?" n
+fi
diff --git a/system/systemd/DEPENDS b/system/systemd/DEPENDS
@@ -8,4 +8,4 @@ depends intltool
 depends gperf
 
 optional_depends "cryptsetup" "--enable-libcryptsetup" "--disable-libcryptsetup" "for Device-mapper crypto encryption"
-optional_depends "Linux-PAM" "--with-pamlibdir=/lib/security" "--disable-pam"
+optional_depends "Linux-PAM" "--with-pamlibdir=/lib/security" "--disable-pam" "for PAM support"
diff --git a/system/systemd/DETAILS b/system/systemd/DETAILS
@@ -1,11 +1,11 @@
           MODULE=systemd
-         VERSION=196
+         VERSION=197
           SOURCE=$MODULE-$VERSION.tar.xz
       SOURCE_URL=http://www.freedesktop.org/software/systemd
-      SOURCE_VFY=sha1:65f6844c2d2a5e6b7ed1f77bb9f457b04774c74f
+      SOURCE_VFY=sha1:1b0b4e0fa97c9cf143f17838aa2da34d980d86d4
         WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd
          ENTERED=20100919
-         UPDATED=20121231
+         UPDATED=20130109
            SHORT="A system and program management daemon"
 
 cat << EOF

diff --git a/system/systemd/POST_INSTALL b/system/systemd/POST_INSTALL
@@ -1,6 +1,9 @@
 # generate the machine id
 /usr/bin/systemd-machine-id-setup
 
+# Remove obsolete 70-persistent-net.rules
+[ -f /etc/udev/rules.d/70-persistent-net.rules ] && rm /etc/udev/rules.d/70-persistent-net.rules
+
 # systemd readyness checks
 if [ ! -f /etc/machine-id ]; then
   SYSTEMD_ERROR=1