From 7e8b00c9be2d4a7cda96fd367210c3d101f367c7 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 2 Dec 2010 00:18:55 +0100 Subject: [PATCH] Provide debian/patches/disabled/09_fix_resolvconf_pxeboot.dpatch as 15_remove_resolv_conf_symlink.dpatch --- debian/patches/00list | 1 + ...onf_pxeboot.dpatch => 15_remove_resolv_conf_symlink.dpatch} | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) rename debian/patches/{disabled/09_fix_resolvconf_pxeboot.dpatch => 15_remove_resolv_conf_symlink.dpatch} (82%) diff --git a/debian/patches/00list b/debian/patches/00list index fa78059..8115311 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -8,3 +8,4 @@ 12_uuid_support.dpatch 13_always_display_warnings_and_failures.dpatch 14_no_blkid_on_lenny.dpatch +15_remove_resolv_conf_symlink.dpatch diff --git a/debian/patches/disabled/09_fix_resolvconf_pxeboot.dpatch b/debian/patches/15_remove_resolv_conf_symlink.dpatch similarity index 82% rename from debian/patches/disabled/09_fix_resolvconf_pxeboot.dpatch rename to debian/patches/15_remove_resolv_conf_symlink.dpatch index 89bda0d..3bd9bac 100755 --- a/debian/patches/disabled/09_fix_resolvconf_pxeboot.dpatch +++ b/debian/patches/15_remove_resolv_conf_symlink.dpatch @@ -1,5 +1,5 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 09_fix_resolvconf_pxeboot.dpatch by Michael Prokop +## 15_remove_resolv_conf_symlink.dpatch by Michael Prokop ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: fix resolvconf handling when booting via PXE @@ -18,16 +18,16 @@ @DPATCH@ diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking -index 72aaf12..244eeca 100755 ---- a/grml/23networking -+++ b/grml/23networking +index 9554b77..70ea6e7 100755 +--- a/scripts/live-bottom/23networking ++++ b/scripts/live-bottom/23networking @@ -110,6 +110,11 @@ EOF then if [ -f /netboot.config ] then + if [ -h /root/etc/resolv.conf ] + then -+ rm /root/etc/resolv.conf ++ rm /root/etc/resolv.conf + fi + # create a resolv.conf if it is not present or empty -- 2.1.4