[SCM] debian-live/live-initramfs branch, master, updated. 1.99.2-1-34-ge5ab5d7

[Daniel Baumann]

The branch, master has been updated
       via  e5ab5d7301cba88c9181eb7bdb225ef2c27253fe (commit)
       via  28ee24ce226e27dfd0a9a3fe17b12e3668c7206b (commit)
       via  7072460d5d683bf5007c4fbf86771f7e49dd9669 (commit)
      from  2607a34924d4108313d1f8662596dc3c00f87193 (commit)


- Shortlog ------------------------------------------------------------
e5ab5d7 Bumping version to 1.105.1-1.
28ee24c Adjusting to live-initramfs.
7072460 Merging casper 1.105.

Summary of changes:
 Makefile                               |    2 +-
 debian/changelog                       |    2 +-
 docs/ChangeLog.casper                  |    8 +++++++
 docs/parameters.txt                    |    2 +-
 scripts/live-bottom/36disable_trackerd |   37 ++++++++++++++++++++++++++++++++
 5 files changed, 48 insertions(+), 3 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit e5ab5d7301cba88c9181eb7bdb225ef2c27253fe
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 27 13:01:51 2007 +0200

    Bumping version to 1.105.1-1.

diff --git a/Makefile b/Makefile
index 8575043..052d9ba 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ update:
 		sed -i	-e 's/2007\\-10\\-01/2007\\-10\\-08/' \
 			-e 's/2007-10-01/2007-10-08/' \
 			-e 's/01.10.2007/08.10.2007/' \
-			-e 's/1.104.2/1.104.3/' \
+			-e 's/1.105.1/1.105.2/' \
 		$$FILE; \
 	done
 
diff --git a/debian/changelog b/debian/changelog
index 0908c63..526a7a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-live-initramfs (1.104.2-1) UNRELEASED; urgency=medium
+live-initramfs (1.105.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 
diff --git a/docs/parameters.txt b/docs/parameters.txt
index fa55064..c4cbe88 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.104.2-1 on 2007-10-01.
+Updated for live-initramfs 1.105.1-1 on 2007-10-01.
 
 These options (can be combined) work from the bootloader prompt:
 

commit 28ee24ce226e27dfd0a9a3fe17b12e3668c7206b
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 27 13:00:42 2007 +0200

    Adjusting to live-initramfs.

diff --git a/scripts/live-bottom/36disable_trackerd b/scripts/live-bottom/36disable_trackerd
old mode 100644
new mode 100755
index 2ac3e05..24a43d8
--- a/scripts/live-bottom/36disable_trackerd
+++ b/scripts/live-bottom/36disable_trackerd
@@ -1,24 +1,35 @@
-#! /bin/sh
+#!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Disabling trackerd..."
+#set -e
+
+# initramfs-tools header
 
-. /scripts/casper-functions
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+if [ -n "${NOTIMEZONE}" ]
+then
+	exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Disabling trackerd..."
+
+# live-initramfs script
 
 rm -f /root/etc/xdg/autostart/trackerd.desktop \
       /root/usr/share/autostart/trackerd.desktop

commit 7072460d5d683bf5007c4fbf86771f7e49dd9669
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 27 12:58:30 2007 +0200

    Merging casper 1.105.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index cfba971..f4f8cfd 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,11 @@
+casper (1.105) gutsy; urgency=low
+
+  * scripts/casper-bottom/36disable_trackerd: Disable trackerd in the live
+    session; it's not very useful in this context and it uses a fair bit of
+    memory.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Mon, 24 Sep 2007 17:25:50 +0100
+
 casper (1.104) gutsy; urgency=low
 
   * casper-md5check: Fall back to text output if opening the usplash FIFO
diff --git a/scripts/live-bottom/36disable_trackerd b/scripts/live-bottom/36disable_trackerd
new file mode 100644
index 0000000..2ac3e05
--- /dev/null
+++ b/scripts/live-bottom/36disable_trackerd
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+PREREQ=""
+DESCRIPTION="Disabling trackerd..."
+
+. /scripts/casper-functions
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+log_begin_msg "$DESCRIPTION"
+
+rm -f /root/etc/xdg/autostart/trackerd.desktop \
+      /root/usr/share/autostart/trackerd.desktop
+
+log_end_msg

-- 
debian-live/live-initramfs