[Lunar-commits] <moonbase-other> resolvconf: move run folder to /var/run

[v4hn]

commit e3492bb23a05814afcbe4e912b58060aa145786e
Author: v4hn <me at v4hn.de>
Date: Fri, 24 Aug 2012 09:58:43 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/e3492bb23a05814afcbe4e912b58060aa145786e

resolvconf: move run folder to /var/run
---
  utils/resolvconf/BUILD                                       +1/-1     
  utils/resolvconf/PRE_REMOVE                                  +1/-1     
  utils/resolvconf/tmpfiles.d/resolvconf.conf                  +3/-3     
  3 files changed, 5 insertions (+), 5 deletions (-)

--- a/utils/resolvconf/BUILD
+++ b/utils/resolvconf/BUILD
@@ -11,7 +11,7 @@
   install -Dm0755 bin/list-records /usr/lib/resolvconf/list-records &&
 
   cp -rv etc/resolvconf /etc/ &&
-  ln -sf /run/resolvconf/ /etc/resolvconf/run &&
+  ln -sf /var/run/resolvconf/ /etc/resolvconf/run &&
 
   # backup original resolv.conf
   if [ ! -e /etc/resolv.conf ] || [ ! -L /etc/resolv.conf ]; then
--- a/utils/resolvconf/PRE_REMOVE
+++ b/utils/resolvconf/PRE_REMOVE
@@ -1,5 +1,5 @@
 resolvconf --wipe-runtime-directories &&
-rmdir /run/resolvconf &&
+rmdir "`readlink /etc/resolvconf/run`" &&
 
 if [ -L /etc/resolv.conf ] && [ "`readlink /etc/resolv.conf`" = "/etc/resolvconf/run/resolv.conf" ]; then
    rm /etc/resolv.conf
--- a/utils/resolvconf/tmpfiles.d/resolvconf.conf
+++ b/utils/resolvconf/tmpfiles.d/resolvconf.conf
@@ -1,3 +1,3 @@
-d /run/resolvconf           0755 root root
-d /run/resolvconf/interface 0755 root root
-f /run/resolvconf/enable-updates 0644 root root
+d /var/run/resolvconf           0755 root root
+d /var/run/resolvconf/interface 0755 root root
+f /var/run/resolvconf/enable-updates 0644 root root