[oe-commits] pieterg : base-files: no longer install an empty resolv.conf

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dreambox
Commit: a72f980963c051003ed3fa6bab9eecd15410de75
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a72f980963c051003ed3fa6bab9eecd15410de75

Author: pieterg <pieterg at gmx.com>
Date:   Wed Dec  3 23:07:43 2008 +0100

base-files: no longer install an empty resolv.conf

---

 packages/base-files/base-files_3.0.14.bb |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 2d111a3..1dd661d 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r57"
+PR = "r58"
 
 LICENSE = "GPL"
 
@@ -137,7 +137,6 @@ do_install_append_netbook-pro () {
 }
 
 do_install_append_opendreambox() {
-	> ${D}/${sysconfdir}/resolv.conf
 	rm -rf ${D}/mnt
 	rm -rf ${D}/hdd
 	ln -sf media/hdd ${D}/hdd
@@ -165,13 +164,3 @@ FILES_${PN}-unslung = ""
 CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname"
 CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
 CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
-
-pkg_preinst_base-files () {
-	[ -d /proc/stb ] && [ -f /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.old
-	true
-}
-
-pkg_postinst_base-files () {
-	[ -d /proc/stb ] && [ -f /etc/resolv.conf.old ] && mv /etc/resolv.conf.old /etc/resolv.conf
-	true
-}