[SCM] debian-live/live-initramfs branch, master, updated. 1.99.2-1-17-g57f2af1

[Daniel Baumann]

The branch, master has been updated
       via  57f2af1f2f32b4ac8ab96fa937ac4fa74673acce (commit)
       via  e823a3bea161604ca9fc610a972bcd209eb8a318 (commit)
      from  7fbf30f8b110e717260d8784348924334441dd52 (commit)


- Shortlog ------------------------------------------------------------
57f2af1 manpages/live-initramfs.en.7.txt
e823a3b scripts/live

Summary of changes:
 manpages/live-initramfs.en.7.txt            |    4 ++--
 scripts/live                                |    5 +++++
 scripts/live-bottom/42disable_cups_apparmor |    5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 57f2af1f2f32b4ac8ab96fa937ac4fa74673acce
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 13 09:06:27 2007 +0200

    manpages/live-initramfs.en.7.txt
    
      * Removing Marco Amadori <marco.amadori at gmail.com>.

diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index 03f5239..a52f025 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -296,8 +296,8 @@ link:http://wiki.debian.org/DebianLive/[http://wiki.debian.org/DebianLive/].
 Authors
 -------
 
-live-initramfs is maintained by Daniel Baumann <daniel at debian.org> and
-Marco Amadori <marco.amadori at gmail.com> for the Debian project.
+live-initramfs is maintained by Daniel Baumann <daniel at debian.org>
+for the Debian project.
 
 live-initramfs is a fork of link:http://packages.ubuntu.com/casper/[casper].
 casper was originally written by Tollef Fog Heen <tfheen at canonical.com>

commit e823a3bea161604ca9fc610a972bcd209eb8a318
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 13 09:05:12 2007 +0200

    scripts/live
    scripts/live-bottom/42disable_cups_apparmor
    
      * Adding noapparmor boot parameter.

diff --git a/scripts/live b/scripts/live
index 15d5dc8..b883c92 100755
--- a/scripts/live
+++ b/scripts/live
@@ -170,6 +170,11 @@ Arguments ()
 				export NOACCESSIBILITY
 				;;
 
+			noapparmor)
+				NOAPPARMOR="Yes"
+				export NOAPPARMOR
+				;;
+
 			noaptcdrom)
 				NOAPTCDROM="Yes"
 				export NOAPTCDROM
diff --git a/scripts/live-bottom/42disable_cups_apparmor b/scripts/live-bottom/42disable_cups_apparmor
index 588214e..09d1869 100755
--- a/scripts/live-bottom/42disable_cups_apparmor
+++ b/scripts/live-bottom/42disable_cups_apparmor
@@ -20,6 +20,11 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOAPPARMOR}" ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Disabling AppArmor profile for Cups..."

-- 
debian-live/live-initramfs