diff options
| author | Tollef Fog Heen <tfheen@err.no> | 2012-03-07 08:50:15 +0100 |
|---|---|---|
| committer | Tollef Fog Heen <tfheen@err.no> | 2012-03-07 08:50:15 +0100 |
| commit | e194a7a7ba9812062a41c93221dc9ff302665921 (patch) | |
| tree | 5ad4f207f80859322cc2b20138d782c6589489fe | |
| parent | 06ac2c47636b791e25310f530a290c3562f4065d (diff) | |
| download | systemd-e194a7a7ba9812062a41c93221dc9ff302665921.tar.gz | |
Don't migrate /var/run to a symlink if /run is a symlink
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/debian-fixup | 18 |
2 files changed, 16 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 04d12eca8b..a634146fc7 100644 --- 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 399afb82c6..8d953e4671 100755 --- 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 |