From: Michael Prokop <mika@grml.org>
Date: Mon, 17 Sep 2007 15:39:48 +0000 (+0200)
Subject: Improve check for presence of /dev/shm/resolvconf
X-Git-Tag: 0.7.20
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=f4e274b64189cf0e000bcf71f9ce098ebce9cdea

Improve check for presence of /dev/shm/resolvconf
---

diff --git a/debian/changelog b/debian/changelog
index a45c1d8..0b52b6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.7.20) unstable; urgency=low
+
+  * Improve check for presence of /dev/shm/resolvconf.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 17 Sep 2007 17:37:34 +0200
+
 grml-autoconfig (0.7.19) unstable; urgency=low
 
   * Make sure /dev/shm/resolvconf exists.
diff --git a/grml-autoconfig b/grml-autoconfig
index 581c989..335244b 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Sep 08 12:15:12 CEST 2007 [mika]
+# Latest change: Mon Sep 17 17:39:29 CEST 2007 [mika]
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
@@ -78,7 +78,7 @@ fi
 
 # make sure /etc/resolv.conf points to /dev/shm/resolvconf
 # and /dev/shm/resolvconf exists:
-if [ -z "$INSTALLED" ] ; then
+if [ -z "$INSTALLED" ] && ! [ -d /dev/shm/resolvconf ] ; then
    if [[ $(readlink /etc/resolv.conf) == /etc/resolvconf/run/resolv.conf ]] && \
       [[ $(readlink /etc/resolvconf/run) == /dev/shm/resolvconf ]] ; then
       mkdir /dev/shm/resolvconf