From: Daniel Baumann <daniel@debian.org>
Date: Sun, 18 Apr 2010 18:42:09 +0000 (+0200)
Subject: Adding upstream version 1.173.4.
X-Git-Tag: upstream/1.173.4^0
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=b674369056a0aef03864d89d23ed9d664d0bf41b;hp=5b7657422c1de4300e9c920361e82ff429ccbcb3;p=live-boot-grml.git

Adding upstream version 1.173.4.
---

diff --git a/scripts/live-bottom/34disable_kaboom b/scripts/live-bottom/34disable_kaboom
new file mode 100755
index 0000000..2bb474c
--- /dev/null
+++ b/scripts/live-bottom/34disable_kaboom
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+#set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Disabling kaboom"
+
+# live-initramfs script
+
+if [ -e /root/etc/kde4 ]
+then
+	mkdir -p /root/home/${USERNAME}/.local
+	touch /root/home/${USERNAME}/.local/kaboom
+fi
+
+log_end_msg
diff --git a/scripts/live-bottom/34disable_kpersonalizer b/scripts/live-bottom/34disable_kpersonalizer
index d61c879..8f6709b 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 /root/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