r2834 - in dists/trunk/live-initramfs: docs scripts/live-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-09-05 05:44:11 +0000 (Wed, 05 Sep 2007)
New Revision: 2834

Added:
   dists/trunk/live-initramfs/scripts/live-bottom/34disable_kpersonalizer
Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/scripts/live-bottom/10adduser
   dists/trunk/live-initramfs/scripts/live-bottom/12fstab
   dists/trunk/live-initramfs/scripts/live-bottom/13swap
   dists/trunk/live-initramfs/scripts/live-bottom/15autologin
   dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-09-05 05:35:27 UTC (rev 2833)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-09-05 05:44:11 UTC (rev 2834)
@@ -3,6 +3,8 @@
 	* scripts/live, scripts/live-bottom:
 	  - Added nouser parameter to disable user creation.
 	  - Added noxautoconfig parameter to disable xorg re-configuration.
+	* scripts/live-bottom/15autologin:
+	  - Moved disabling of kpersonalizer to 34disable_kpersonalizer.
 
 2007-09-01  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-09-05 05:35:27 UTC (rev 2833)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-09-05 05:44:11 UTC (rev 2834)
@@ -20,13 +20,13 @@
 
 # live-initramfs header
 
-. /scripts/live-functions
-
-if [ "${NOUSER}" = "Yes" ]
+if [ -n "${NOUSER}" ]
 then
 	exit 0
 fi
 
+. /scripts/live-functions
+
 log_begin_msg "Adding live session user..."
 
 # live-initramfs script

Modified: dists/trunk/live-initramfs/scripts/live-bottom/12fstab
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/12fstab	2007-09-05 05:35:27 UTC (rev 2833)
+++ dists/trunk/live-initramfs/scripts/live-bottom/12fstab	2007-09-05 05:44:11 UTC (rev 2834)
@@ -22,7 +22,7 @@
 
 . /scripts/live-functions
 
-if [ "${NOFSTAB}" = "Yes" ]
+if [ -n "${NOFSTAB}" ]
 then
 	exit 0
 fi

Modified: dists/trunk/live-initramfs/scripts/live-bottom/13swap
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/13swap	2007-09-05 05:35:27 UTC (rev 2833)
+++ dists/trunk/live-initramfs/scripts/live-bottom/13swap	2007-09-05 05:44:11 UTC (rev 2834)
@@ -20,18 +20,13 @@
 
 # live-initramfs header
 
-if [ -n "${NOSWAP}" ]
+if [ -n "${NOSWAP}" ] || [ -n "${NOFSTAB}" ]
 then
 	exit 0
 fi
 
 . /scripts/live-functions
 
-if [ "${NOFSTAB}" = "Yes" ]
-then
-	exit 0
-fi
-
 log_begin_msg "Setting up swap..."
 
 # live-initramfs script

Modified: dists/trunk/live-initramfs/scripts/live-bottom/15autologin
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/15autologin	2007-09-05 05:35:27 UTC (rev 2833)
+++ dists/trunk/live-initramfs/scripts/live-bottom/15autologin	2007-09-05 05:44:11 UTC (rev 2834)
@@ -26,8 +26,10 @@
 
 # live-initramfs script
 
-if [ -z "${NOXAUTOLOGIN}" ]
+if [ -n "${NOXAUTOLOGIN}" ]
 then
+	exit 0
+fi
 
 # chroot needed to handle symlinks correctly
 if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]; then
@@ -62,19 +64,4 @@
         /root/etc/kde3/kdm/kdmrc
 fi
 
-fi
-
-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
-    fi
-fi
-
 log_end_msg

Modified: dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/20xconfig	2007-09-05 05:35:27 UTC (rev 2833)
+++ dists/trunk/live-initramfs/scripts/live-bottom/20xconfig	2007-09-05 05:44:11 UTC (rev 2834)
@@ -20,13 +20,13 @@
 
 # live-initramfs header
 
-. /scripts/live-functions
-
-if [ "${NOXAUTOCONFIG}" = "Yes" ]
+if [ -n "${NOXAUTOCONFIG}" ]
 then
 	exit 0
 fi
 
+. /scripts/live-functions
+
 log_begin_msg "Configuring X..."
 
 # live-initramfs script

Added: dists/trunk/live-initramfs/scripts/live-bottom/34disable_kpersonalizer
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/34disable_kpersonalizer	                        (rev 0)
+++ dists/trunk/live-initramfs/scripts/live-bottom/34disable_kpersonalizer	2007-09-05 05:44:11 UTC (rev 2834)
@@ -0,0 +1,42 @@
+#!/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 kpersonalizer..."
+
+# live-initramfs script
+
+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
+    fi
+fi
+
+log_end_msg


Property changes on: dists/trunk/live-initramfs/scripts/live-bottom/34disable_kpersonalizer
___________________________________________________________________
Name: svn:executable
   + *