From c787948c5c204d1e02cb87c6d2f556939e3ffc4f Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 17 Sep 2007 22:12:19 +0200 Subject: [PATCH 1/1] get rid of the /dev/shm/resolvconf workaround --- debian/changelog | 7 +++++++ grml-autoconfig | 9 --------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0b52b6f..05b11c8 100644 --- 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 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 --- 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 -- 2.1.4