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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-21 19:18:40 +0000 (Tue, 21 Aug 2007)
New Revision: 2792

Added:
   dists/trunk/live-initramfs/scripts/live-bottom/38disable_restricted_manager
Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/docs/ChangeLog.casper
   dists/trunk/live-initramfs/scripts/live-bottom/10adduser
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-08-21 19:13:40 UTC (rev 2791)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-08-21 19:18:40 UTC (rev 2792)
@@ -1,5 +1,9 @@
 2007-08-21  Daniel Baumann  <daniel at debian.org>
 
+	* Merging changes from casper 1.96.
+
+2007-08-21  Daniel Baumann  <daniel at debian.org>
+
 	* scripts/live:
 	  - Applied patch from Jesse W. Hathaway <jesse at mbuki-mvuki.org> to
 	    not use nfsro with kernels larger than 2.6.22 (where unionfs 2.x

Modified: dists/trunk/live-initramfs/docs/ChangeLog.casper
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog.casper	2007-08-21 19:13:40 UTC (rev 2791)
+++ dists/trunk/live-initramfs/docs/ChangeLog.casper	2007-08-21 19:18:40 UTC (rev 2792)
@@ -1,3 +1,14 @@
+casper (1.96) gutsy; urgency=low
+
+  [ Colin Watson ]
+  * Fix name and executability of timezone script.
+
+  [ Jonathan Riddell ]
+  * In 10adduser add About Kubuntu document to desktop and remove
+    restricted-manager autostart files
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Tue, 07 Aug 2007 12:51:02 +0100
+
 casper (1.95) gutsy; urgency=low
 
   * Fix regex syntax error while looking for non-CD devices for driver
@@ -3,4 +14,5 @@
     updates.
   * Fix ip= boot parameter, documented but not properly merged from Debian.
+    (LP: #128689).
 
  -- Colin Watson <cjwatson at ubuntu.com>  Fri, 27 Jul 2007 15:03:41 +0100

Modified: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-08-21 19:13:40 UTC (rev 2791)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-08-21 19:18:40 UTC (rev 2792)
@@ -108,4 +108,8 @@
     mv /root/home/$USERNAME/Examples /root/home/$USERNAME/Desktop/
 fi
 
+if [ -f "/root/usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved" ]; then
+    chroot /root install -D -o $USERNAME -g $USERNAME /root/usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved /home/$USERNAME/Desktop/about-kubuntu.desktop
+fi
+
 log_end_msg

Added: dists/trunk/live-initramfs/scripts/live-bottom/38disable_restricted_manager
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/38disable_restricted_manager	                        (rev 0)
+++ dists/trunk/live-initramfs/scripts/live-bottom/38disable_restricted_manager	2007-08-21 19:18:40 UTC (rev 2792)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+PREREQ=""
+DESCRIPTION="Disabling restricted-manager..."
+
+. /scripts/casper-functions
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+log_begin_msg "$DESCRIPTION"
+
+rm -f /root/usr/share/autostart/restricted-manager.desktop
+
+rm -f /root/usr/share/autostart/restricted-manager-kde.desktop
+
+log_end_msg


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