[SCM] live-initramfs branch, debian-next, updated. debian/1.236.1-1-21-gc7abb14

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit c7abb147b14d994996c94fc51e71338810398e4b
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun May 16 22:46:40 2010 +0200

    Moving 22sslcert to live-sysinit.

diff --git a/scripts/live b/scripts/live
index 46d0a9e..db422f5 100755
--- a/scripts/live
+++ b/scripts/live
@@ -53,31 +53,19 @@ Arguments ()
 		case "${ARGUMENT}" in
 			skipconfig)
 				NOACCESSIBILITY="Yes"
-				NOAPPARMOR="Yes"
 				NOAPTCDROM="Yes"
 				NOAUTOLOGIN="Yes"
 				NOCONSOLEKEYBOARD="Yes"
 				NOFASTBOOT="Yes"
 				NOFSTAB="Yes"
-				NOGNOMEPANEL="Yes"
 				NOHOSTS="Yes"
-				NOJOCKEY="Yes"
-				NOKPERSONALIZER="Yes"
-				NOLANGUAGESELECTOR="Yes"
 				NOLOCALES="Yes"
 				NONETWORKING="Yes"
-				NOPOLKITCONF="Yes"
-				NOPOWERMANAGEMENT="Yes"
-				NOPROGRAMCRASHES="Yes"
-				NOSUDO="Yes"
 				NOTIMEZONE="Yes"
-				NOUPDATENOTIFIER="Yes"
-				NOUSER="Yes"
 				NOXAUTOCONFIG="Yes"
 				NOXAUTOLOGIN="Yes"
-				NOXSCREENSAVER="Yes"
 
-				export NOACCESSIBILITY NOAPPARMOR NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOGNOMEPANEL NOHOSTS NOJOCKEY NOKPERSONALIZER NOLANGUAGESELECTOR NOLOCALES NONETWORKING NOPOLKITCONF NOPOWERMANAGEMENT NOPROGRAMCRASHES NOSUDO NOTIMEZONE NOUPDATENOTIFIER NOUSER NOXAUTOCONFIG NOXAUTOLOGIN NOXSCREENSAVER
+				export NOACCESSIBILITY NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOHOSTS NOLOCALES NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN
 				;;
 
 			access=*)
@@ -272,11 +260,6 @@ Arguments ()
 				export NOACCESSIBILITY
 				;;
 
-			noapparmor)
-				NOAPPARMOR="Yes"
-				export NOAPPARMOR
-				;;
-
 			noaptcdrom)
 				NOAPTCDROM="Yes"
 				export NOAPTCDROM
@@ -307,26 +290,11 @@ Arguments ()
 				export NOFSTAB
 				;;
 
-			nognomepanel)
-				NOGNOMEPANEL="Yes"
-				export NOGNOMEPANEL
-				;;
-
 			nohosts)
 				NOHOSTS="Yes"
 				export NOHOSTS
 				;;
 
-			nokpersonalizer)
-				NOKPERSONALIZER="Yes"
-				export NOKPERSONALIZER
-				;;
-
-			nolanguageselector)
-				NOLANGUAGESELECTOR="Yes"
-				export NOLANGUAGESELECTOR
-				;;
-
 			nolocales)
 				NOLOCALES="Yes"
 				export NOLOCALES
@@ -337,41 +305,11 @@ Arguments ()
 				export NONETWORKING
 				;;
 
-			nopowermanagement)
-				NOPOWERMANAGEMENT="Yes"
-				export NOPOWERMANAGEMENT
-				;;
-
-			noprogramcrashes)
-				NOPROGRAMCRASHES="Yes"
-				export NOPROGRAMCRASHES
-				;;
-
-			nojockey)
-				NOJOCKEY="Yes"
-				export NOJOCKEY
-				;;
-
-			nosudo)
-				NOSUDO="Yes"
-				export NOSUDO
-				;;
-
 			swapon)
 				SWAPON="Yes"
 				export SWAPON
 				;;
 
-			noupdatenotifier)
-				NOUPDATENOTIFIER="Yes"
-				export NOUPDATENOTIFIER
-				;;
-
-			nouser)
-				NOUSER="Yes"
-				export NOUSER
-				;;
-
 			noxautoconfig)
 				NOXAUTOCONFIG="Yes"
 				export NOXAUTOCONFIG
diff --git a/scripts/live-bottom/22sslcert b/scripts/live-bottom/22sslcert
deleted file mode 100755
index 1950eef..0000000
--- a/scripts/live-bottom/22sslcert
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/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 "Regenerating SSL certificate..."
-
-# live-initramfs script
-
-if [ -x /root/usr/sbin/make-ssl-cert ]
-then
-	chroot /root /usr/sbin/make-ssl-cert generate-default-snakeoil --force-overwrite
-fi
-
-log_end_msg

-- 
live-initramfs