From be61b7f85be1eb14eb585f28d15713bf2c923aa7 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Mon, 10 Sep 2012 04:34:50 +0000
Subject: [PATCH] =?utf8?q?-Ajout=20shared=20libraries=20Python=20(stage3).?=
 =?utf8?q?=20-Emp=C3=AAche=20dhclient=20de=20modifier=20/etc/resolv.conf?=
 =?utf8?q?=20car=20on=20installe=20Bind.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 stage2/hv-install-1         | 2 +-
 stage2/install-hv-utilities | 2 +-
 stage2/pkg/dhcp             | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 6e576b2..65f9a7d 100755
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -38,7 +38,7 @@ ipkg ${GCC}
 rscr mult "Testing toolchain" toolchain-test
 ipkg ${SED} "--bindir=/bin"
 ipkg ${LIBFFI}
-ipkg ${PYTHON}
+ipkg ${PYTHON} "--enable-shared"
 # Specify LIBFFI flags because pkg-config is not yet installed:
 LIBFFI_CFLAGS="-I/usr/include" LIBFFI_LIBS="-L/usr/lib -lffi" ipkg ${GLIB}
 ipkg ${PKG_CONFIG}
diff --git a/stage2/install-hv-utilities b/stage2/install-hv-utilities
index 55180b6..2156077 100755
--- a/stage2/install-hv-utilities
+++ b/stage2/install-hv-utilities
@@ -11,7 +11,7 @@ BIN_UTILITIES="camera-download cd-erase cd-copy cgrep pstopdf distro-backup \
                dos2unix dvd-ram-format fix-avi gztobz2 hv-backup hv-video-dvd \
                mail-files mail-if-fail mail-statistics media-write pstopdf \
                replace.pl rotatelogs setdate strip-debug-symbols tarbz2 \
-               tildes-clean vd vs flac2ogg flac2mp3"
+               tildes-clean vd vs vlog flac2ogg flac2mp3"
 
 for program in ${BIN_UTILITIES}; do
     install -v ${SRCDIR}/${program} ${BINDIR}
diff --git a/stage2/pkg/dhcp b/stage2/pkg/dhcp
index 5f640d4..1cb301a 100644
--- a/stage2/pkg/dhcp
+++ b/stage2/pkg/dhcp
@@ -41,6 +41,15 @@ EOF
 
     sed -i -e "s!_DOMAIN_!${DOMAIN}!g" /etc/dhclient.conf
 
+    cat > /etc/dhclient-enter-hooks << "EOF"
+# If named is running, do not let dhclient create or modify resolv.conf
+# by specifyng an empty function hook:
+make_resolv_conf(){
+	:
+}
+EOF
+    chmod u+x /etc/dhclient-enter-hooks
+
     cat > /etc/sysconfig/network/dhcp-client << "EOF"
 # dhcp-client
 # DHCP client program informations
-- 
2.20.1