get rid of the /dev/shm/resolvconf workaround

diff --git a/debian/changelog b/debian/changelog
index 0b52b6f..05b11c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.7.21) unstable; urgency=low
+
+  * And finally get rid of the /dev/shm/resolvconf workaround again.
+    We have to solve it in the chroot builder.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 17 Sep 2007 22:11:48 +0200
+
 grml-autoconfig (0.7.20) unstable; urgency=low
 
   * Improve check for presence of /dev/shm/resolvconf.

diff --git a/grml-autoconfig b/grml-autoconfig
index 335244b..68961f2 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -76,15 +76,6 @@ if [ -z "$INSTALLED" -a -e /live/cow ] ; then
    fi
 fi
 
-# make sure /etc/resolv.conf points to /dev/shm/resolvconf
-# and /dev/shm/resolvconf exists:
-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
-   fi
-fi
-
 if [ -z "$SPLASH" ] ; then
   stage=5
   rundebugshell