[SCM] debian-live/live-initramfs branch, master, updated. 1.99.2-1-19-g15f50dd

[Daniel Baumann]

The branch, master has been updated
       via  15f50dd4f009afb5f6ea7fa4b3c67d4bafe882aa (commit)
       via  70e4f061298282c026bf018ce93314a0da5e5311 (commit)
      from  57f2af1f2f32b4ac8ab96fa937ac4fa74673acce (commit)


- Shortlog ------------------------------------------------------------
15f50dd Makefile
70e4f06 docs/ChangeLog.casper

Summary of changes:
 Makefile                                    |    2 +-
 debian/changelog                            |    2 +-
 docs/ChangeLog.casper                       |   10 ++++++
 docs/parameters.txt                         |    2 +-
 scripts/live-bottom/42disable_apparmor      |   36 ++++++++++++++++++++++
 scripts/live-bottom/42disable_cups_apparmor |   43 ---------------------------
 6 files changed, 49 insertions(+), 46 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 15f50dd4f009afb5f6ea7fa4b3c67d4bafe882aa
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Sep 14 18:06:22 2007 +0200

    Makefile
    debian/changelog
    docs/parameters.txt
    
      * Bumping version to 1.102.1-1.

diff --git a/Makefile b/Makefile
index 72184ab..8e7c33c 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ update:
 		sed -i	-e 's/2007\\-09\\-17/2007\\-09\\-24/' \
 			-e 's/2007-09-17/2007-09-24/' \
 			-e 's/17.09.2007/24.09.2007/' \
-			-e 's/1.101.1/1.101.2/' \
+			-e 's/1.102.1/1.102.2/' \
 		$$FILE; \
 	done
 
diff --git a/debian/changelog b/debian/changelog
index 2e081ea..a59f2b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-live-initramfs (1.101.1-1) UNRELEASED; urgency=medium
+live-initramfs (1.102.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 
diff --git a/docs/parameters.txt b/docs/parameters.txt
index 810a9df..af5b200 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.101.1-1 on 2007-09-17.
+Updated for live-initramfs 1.102.1-1 on 2007-09-17.
 
 These options (can be combined) work from the bootloader prompt:
 

commit 70e4f061298282c026bf018ce93314a0da5e5311
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Sep 14 18:05:25 2007 +0200

    docs/ChangeLog.casper
    scripts/live-bottom/42disable_apparmor
    
      * Merging casper 1.102.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 2497f33..1db8326 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,13 @@
+casper (1.102) gutsy; urgency=low
+
+  * Rename 42disable_cups_apparmor to 42disable_apparmor and remove AppArmor's
+    rc.d startup links instead of just disabling the cups profile. AA profiles
+    will not generally work on the live system, so disabling it completely
+    allows us to ship more profiles without worrying any further.
+    (LP: #131976)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Fri, 14 Sep 2007 08:37:50 +0200
+
 casper (1.101) gutsy; urgency=low
 
   * Add scripts/casper-bottom/42disable_cups_apparmor: Disable AppArmor
diff --git a/scripts/live-bottom/34disable_kwallet b/scripts/live-bottom/42disable_apparmor
similarity index 63%
copy from scripts/live-bottom/34disable_kwallet
copy to scripts/live-bottom/42disable_apparmor
index 79c895a..d325ddb 100755
--- a/scripts/live-bottom/34disable_kwallet
+++ b/scripts/live-bottom/42disable_apparmor
@@ -20,17 +20,17 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOKWALLET}" ]
+if [ -n "${NOAPPARMOR}" ]
 then
 	exit 0
 fi
 
 . /scripts/live-functions
 
-log_begin_msg "Disabling kwallet..."
+log_begin_msg "Disabling AppArmor (does not work with stacked file systems)..."
 
 # live-initramfs script
 
-rm -f /root/usr/share/services/kded/kwalletd.desktop
+chroot /root update-rc.d -f apparmor remove
 
 log_end_msg
diff --git a/scripts/live-bottom/42disable_cups_apparmor b/scripts/live-bottom/42disable_cups_apparmor
deleted file mode 100755
index 09d1869..0000000
--- a/scripts/live-bottom/42disable_cups_apparmor
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-initramfs header
-
-if [ -n "${NOAPPARMOR}" ]
-then
-	exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Disabling AppArmor profile for Cups..."
-
-# live-initramfs script
-
-# workaround for AppArmor bug #131976
-
-PROFILE=/root/etc/apparmor.d/usr.sbin.cupsd
-
-if [ -e "$PROFILE" ]
-then
-	sed -i '/{/ s/{/flags=(complain) {/' $PROFILE
-fi
-
-log_end_msg

-- 
debian-live/live-initramfs