[SCM] debian-live/live-initramfs branch, master, updated. 1.118.2-1-3-g0a68359

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 0a683590c85e4717f60031f4777f7ae474aaa293
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Mar 9 21:12:23 2008 +0100

    Removing disabling of kwallet.

diff --git a/scripts/live b/scripts/live
index 0ed7675..6494234 100755
--- a/scripts/live
+++ b/scripts/live
@@ -234,11 +234,6 @@ Arguments ()
 				export NOKPERSONALIZER
 				;;
 
-			nokwallet)
-				NOKWALLET="Yes"
-				export NOKWALLET
-				;;
-
 			nolanguageselector)
 				NOLANGUAGESELECTOR="Yes"
 				export NOLANGUAGESELECTOR
diff --git a/scripts/live-bottom/34disable_kwallet b/scripts/live-bottom/34disable_kwallet
deleted file mode 100755
index 79c895a..0000000
--- a/scripts/live-bottom/34disable_kwallet
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-initramfs header
-
-if [ -n "${NOKWALLET}" ]
-then
-	exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Disabling kwallet..."
-
-# live-initramfs script
-
-rm -f /root/usr/share/services/kded/kwalletd.desktop
-
-log_end_msg

-- 
debian-live/live-initramfs