Don't migrate /var/run to a symlink if /run is a symlink

diff --git a/debian/changelog b/debian/changelog
index 04d12eca8b4bce9c2d1bf6ba576a1d2fb54f9764..a634146fc702c3cd4e033a9aa5724fda1f00d328 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ systemd (43-1) experimental; urgency=low
   * Install a tmpfiles.d file for the /dev/initctl → /run/initctl
     migration.  Closes: #657979
   * Disable coredump handling, it's not ready yet.
+  * If /run is a symlink, don't try to do the /var/run → /run migration.
+    Ditto for /var/lock → /run/lock.  Closes: #647495
 
   [ Michael Biebl ]
   * Add Build-Depends on liblzma-dev for journal log compression.

diff --git a/debian/debian-fixup b/debian/debian-fixup
index 399afb82c6d621e361a8a669c5ff97199f521e40..8d953e4671fc28966a4728a43ac608b98b5d7db2 100755 (executable)
--- a/debian/debian-fixup
+++ b/debian/debian-fixup
@@ -5,12 +5,22 @@ set -e
 if [ ! -L /etc/mtab ]; then
     ln -sf /proc/mounts /etc/mtab
 fi
+
+# Migrate /var/run to be a symlink to /run, unless /run is already a
+# symlink, to prevent loops.
 if [ ! -L /var/run ]; then
-    rm -rf /var/run
-    ln -s /run /var/run
+    if [ ! -L /run ]; then
+        rm -rf /var/run
+        ln -s /run /var/run
+    fi
 fi
+
+# Migrate /var/lock to be a symlink to /run/lock, unless /run/lock is
+# already a symlink, to prevent loops.
 if [ ! -L /var/lock ]; then
-    rm -rf /var/lock
-    ln -s /run/lock /var/lock
+    if [ ! -L /run/lock ]; then
+        rm -rf /var/lock
+        ln -s /run/lock /var/lock
+    fi
 fi
 exit 0