[SCM] live-initramfs branch, master, updated. debian/1.173.3-1-1-g2fa2d31

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 2fa2d319ef93674b998fa94ccbb057d596130754
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Mar 12 15:27:23 2010 +0100

    Only disabling kpersonalizer when using kde3, kde4 doesn't need that hack.

diff --git a/scripts/live-bottom/34disable_kpersonalizer b/scripts/live-bottom/34disable_kpersonalizer
index d61c879..1dc4545 100755
--- a/scripts/live-bottom/34disable_kpersonalizer
+++ b/scripts/live-bottom/34disable_kpersonalizer
@@ -31,20 +31,23 @@ log_begin_msg "Disabling kpersonalizer"
 
 # live-initramfs script
 
-if chroot /root /usr/bin/which kpersonalizer >/dev/null
+if [ -e /etc/kde3 ]
 then
-	# Disable first-login wizard for KDE
-	if [ ! -f /root/etc/kde3/kpersonalizerrc ]
+	if chroot /root /usr/bin/which kpersonalizer >/dev/null
 	then
+		# Disable first-login wizard for KDE
+		if [ ! -f /root/etc/kde3/kpersonalizerrc ]
+		then
 
 cat > /root/etc/kde3/kpersonalizerrc << EOF
 [General]
 FirstLogin=false
 EOF
 
-	else
-		echo "I'm not smart enough to disable kpersonalizer startup" >&2
-		echo "Because kpersonalizerrc already exists" >&2
+		else
+			echo "I'm not smart enough to disable kpersonalizer startup" >&2
+			echo "Because kpersonalizerrc already exists" >&2
+		fi
 	fi
 fi
 

-- 
live-initramfs