From ceb3c54235dabddfa7c6ae7f4eec123685b5615d Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Mon, 8 Apr 2013 15:03:44 +0000
Subject: [PATCH] integrate-distro.sh: Ongoing improvements

  - Use kernel flavour desktop
  - Beautify reset_host_files()
  - Use host /etc/group and /etc/passwd

Signed-off-by: Jan Lindemann <jan@jannet.de>
---
 scripts/integrate-distro.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 7e3cf7bf..823bee2f 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -44,7 +44,7 @@ initrd_modules="
 	hid-generic
 "
 
-kernel_flavour=-default
+kernel_flavour=-desktop
 
 case $suse_version in
 11.4)
@@ -702,8 +702,10 @@ use_host_files()
 
 reset_host_files()
 {
-	local f e h
+	local f e h p
 	for f in $host_files; do
+		p=$root/$f.diff
+		diff -u $f $root/$f > $p
 		for e in $myname rpmnew; do
 			h="$root/$f.$e"
 			[ -e "$h" ] && {
@@ -712,6 +714,13 @@ reset_host_files()
 				break
 			}
 		done
+		if [ -s $p ]; then
+			echo "+ $f and host file differ:"
+			cat $p
+		else
+			echo "+ no difference between $f and host file"
+			rm -f $p
+		fi
 	done
 	host_files=""
 }
@@ -881,7 +890,8 @@ cmd_install()
 
 	setup_root_directory
 	setup_bind_mounts
-	use_host_files /etc/hosts /etc/resolv.conf /etc/sysconfig/security /etc/nsswitch.conf
+	use_host_files /etc/hosts /etc/resolv.conf /etc/sysconfig/security /etc/nsswitch.conf \
+		/etc/passwd /etc/group
 
 	mkdir -p -m 755 $root/etc
 	for c in \