[Debian-live-changes] r1072 - in dists/trunk/live-helper: doc helpers hooks

[Daniel Baumann]

Author: daniel
Date: 2007-04-17 13:19:26 +0000 (Tue, 17 Apr 2007)
New Revision: 1072

Added:
   dists/trunk/live-helper/hooks/kde-desktop
Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/helpers/lh_chroot_hooks
   dists/trunk/live-helper/helpers/lh_chroot_proc
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-17 09:46:21 UTC (rev 1071)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-17 13:19:26 UTC (rev 1072)
@@ -1,3 +1,10 @@
+2007-04-17  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_chroot_hooks:
+	  - Also check for tasks specific hooks, not just for package lists.
+	* hooks/kde-desktop:
+	  - Added.
+
 2007-04-16  Daniel Baumann  <daniel at debian.org>
 
 	* functions/defaults.sh:

Modified: dists/trunk/live-helper/helpers/lh_chroot_hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-04-17 09:46:21 UTC (rev 1071)
+++ dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-04-17 13:19:26 UTC (rev 1072)
@@ -46,27 +46,30 @@
 Create_lockfile .lock
 
 # Processing hooks
-if [ -n "${LIVE_PACKAGES_LISTS}" ] && [ -f /usr/share/live-helper/hooks/"${LIVE_PACKAGES_LISTS}" ]
-then
-	# Copying hook
-	cp /usr/share/live-helper/hooks/"${LIVE_PACKAGES_LISTS}" chroot/root
-
-	# Making hook executable
-	if [ ! -x chroot/root/${LIVE_PACKAGES_LISTS} ]
+for HOOK in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
+do
+	if [ -f /usr/share/live-helper/hooks/"${HOOK}" ]
 	then
-		chmod +x chroot/root/${LIVE_PACKAGES_LISTS}
-	fi
+		# Copying hook
+		cp /usr/share/live-helper/hooks/"${HOOK}" chroot/root
 
-	# Executing hook
-	Chroot "/root/${LIVE_PACKAGES_LISTS}"
+		# Making hook executable
+		if [ ! -x chroot/root/${HOOK} ]
+		then
+			chmod +x chroot/root/${HOOK}
+		fi
 
-	# Removing hook
-	rm -f chroot/root/"${LIVE_PACKAGE_LIST}"
+		# Executing hook
+		Chroot "/root/${LIVE_HOOK}"
 
-	# Creating stage file
-	Create_stagefile .stage/chroot_hooks
-fi
+		# Removing hook
+		rm -f chroot/root/"${HOOK}"
 
+		# Creating stage file
+		Create_stagefile .stage/chroot_hooks
+	fi
+done
+
 if [ -n "${LIVE_HOOKS}" ]
 then
 	LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" LIVE_DEBCONF_NOWARNINGS="no" Chroot "${LIVE_HOOKS}"

Modified: dists/trunk/live-helper/helpers/lh_chroot_proc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_proc	2007-04-17 09:46:21 UTC (rev 1071)
+++ dists/trunk/live-helper/helpers/lh_chroot_proc	2007-04-17 13:19:26 UTC (rev 1072)
@@ -71,7 +71,7 @@
 		Create_lockfile .lock
 
 		# Workaround binfmt-support /proc locking
-		if [ -e chroot/proc/sys/fs/binftm_misc/status ]
+		if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
 		then
 			umount chroot/proc/sys/fs/binfmt_misc
 		fi

Added: dists/trunk/live-helper/hooks/kde-desktop
===================================================================
--- dists/trunk/live-helper/hooks/kde-desktop	2007-04-17 09:46:21 UTC (rev 1071)
+++ dists/trunk/live-helper/hooks/kde-desktop	2007-04-17 13:19:26 UTC (rev 1072)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# /usr/share/live-helper/hooks/kde-desktop - hook list for live-helper(7)
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+apt-get remove --purge --yes gdm
+update-alternatives --set x-session-manager /usr/bin/startkde


Property changes on: dists/trunk/live-helper/hooks/kde-desktop
___________________________________________________________________
Name: svn:executable
   + *