[ostree] gnomeos: Install libuuid and libblkid

[Colin Walters <walters src gnome org>]

commit 82aae2e57f3d737740f76eef4dd6110d38db0134
Author: Colin Walters <walters verbum org>
Date:   Thu Jan 12 10:46:42 2012 -0500

    gnomeos: Install libuuid and libblkid
    
    So NetworkManager can use them.

 gnomeos/yocto/classes/gnomeos-contents.bbclass |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
index 133a2c8..fd04d95 100644
--- a/gnomeos/yocto/classes/gnomeos-contents.bbclass
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit rootfs_${IMAGE_PKGTYPE}
 
-IMAGE_INSTALL = ""
+IMAGE_INSTALL = "libuuid1 libblkid1"
 
 RECIPE_PACKAGES = "task-core-boot \
 		   coreutils \
@@ -60,9 +60,19 @@ sysfs                   /sys                    sysfs   defaults        0 0
 proc                    /proc                   proc    defaults        0 0
 EOF
 
+	# Kill the Debian netbase stuff - we use NetworkManager
+	rm -rf ${IMAGE_ROOTFS}/etc/network
+	rm -f ${IMAGE_ROOTFS}/etc/init.d/networking
 
 	ln -sf /var/run/resolv.conf ${IMAGE_ROOTFS}/etc/resolv.conf
 
+	# Override base-passwd...it has lots of crap in it we don't
+	# want, and we do want dbus.
+	cat >${IMAGE_ROOTFS}/var/passwd << EOF
+root::0:0:root:/:/bin/sh
+dbus:*:1:1:dbus:/:/bin/false
+EOF
+
 	TOPROOT_BIND_MOUNTS="home root tmp"
 	OSTREE_BIND_MOUNTS="var"
 	OSDIRS="dev proc mnt media sys sysroot"