[SCM] debian-live/live-initramfs branch, master, updated. 1.99.2-1-15-g7fbf30f
Daniel Baumann
daniel at debian.org
Thu Sep 13 07:00:16 UTC 2007
The branch, master has been updated
via 7fbf30f8b110e717260d8784348924334441dd52 (commit)
via ba448e1d11f36e19ad1cb8b9b0ef4ada520dc15a (commit)
via 8f5e698bfc5292a45196ada567758de53eaeb8cb (commit)
via 588f83250352c5d6568fe12cbd5c4a589f01c713 (commit)
from df615e599339d96d0baa25799cb6cb9316bee6db (commit)
- Shortlog ------------------------------------------------------------
7fbf30f Makefile
ba448e1 scripts/live-bottom/42disable_cups_apparmor
8f5e698 docs/ChangeLog.casper
588f832 docs/ChangeLog.casper
Summary of changes:
Makefile | 2 +-
debian/changelog | 2 +-
docs/ChangeLog.casper | 17 ++++++++++++
docs/parameters.txt | 2 +-
scripts/live-bottom/41apt_cdrom | 3 --
scripts/live-bottom/42disable_cups_apparmor | 38 +++++++++++++++++++++++++++
6 files changed, 58 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 7fbf30f8b110e717260d8784348924334441dd52
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 13 09:00:00 2007 +0200
Makefile
debian/changelog
docs/parameters.txt
* Bumping version to 1.101.1-1.
diff --git a/Makefile b/Makefile
index 3bc61d2..72184ab 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.99.3/1.99.4/' \
+ -e 's/1.101.1/1.101.2/' \
$$FILE; \
done
diff --git a/debian/changelog b/debian/changelog
index 5a882ed..2e081ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-live-initramfs (1.99.3-1) UNRELEASED; urgency=medium
+live-initramfs (1.101.1-1) UNRELEASED; urgency=medium
* New upstream release.
diff --git a/docs/parameters.txt b/docs/parameters.txt
index 27dc2ff..810a9df 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
Boot Parameters for Debian Live
-------------------------------
-Updated for live-initramfs 1.99.3-1 on 2007-09-17.
+Updated for live-initramfs 1.101.1-1 on 2007-09-17.
These options (can be combined) work from the bootloader prompt:
commit ba448e1d11f36e19ad1cb8b9b0ef4ada520dc15a
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 13 08:58:19 2007 +0200
scripts/live-bottom/42disable_cups_apparmor
* Adjusting to live-initramfs.
diff --git a/scripts/live-bottom/42disable_cups_apparmor b/scripts/live-bottom/42disable_cups_apparmor
old mode 100644
new mode 100755
index 4a53444..588214e
--- a/scripts/live-bottom/42disable_cups_apparmor
+++ b/scripts/live-bottom/42disable_cups_apparmor
@@ -1,29 +1,38 @@
#!/bin/sh
-# workaround for AppArmor bug #131976
-PREREQ=""
-DESCRIPTION="Disabling AppArmor profile for Cups..."
+#set -e
-. /scripts/casper-functions
+# initramfs-tools header
+
+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
+
+. /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
+
+if [ -e "$PROFILE" ]
+then
+ sed -i '/{/ s/{/flags=(complain) {/' $PROFILE
fi
log_end_msg
commit 8f5e698bfc5292a45196ada567758de53eaeb8cb
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 13 08:56:05 2007 +0200
docs/ChangeLog.casper
scripts/live-bottom/42disable_cups_apparmor
* Merging casper 1.101.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 159e31a..2497f33 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,12 @@
+casper (1.101) gutsy; urgency=low
+
+ * Add scripts/casper-bottom/42disable_cups_apparmor: Disable AppArmor
+ protection for cups on the live CD by switching the profiles to complain
+ mode. This is necessary until AppArmor works properly on stacked file
+ systems. (LP: #131976)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Wed, 12 Sep 2007 16:44:02 +0200
+
casper (1.100) gutsy; urgency=low
* scripts/casper-bottom/41apt_cdrom: Remove unnecessary /root/cdrom
diff --git a/scripts/live-bottom/42disable_cups_apparmor b/scripts/live-bottom/42disable_cups_apparmor
new file mode 100644
index 0000000..4a53444
--- /dev/null
+++ b/scripts/live-bottom/42disable_cups_apparmor
@@ -0,0 +1,29 @@
+#!/bin/sh
+# workaround for AppArmor bug #131976
+
+PREREQ=""
+DESCRIPTION="Disabling AppArmor profile for Cups..."
+
+. /scripts/casper-functions
+
+prereqs()
+{
+ echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+ prereqs
+ exit 0
+ ;;
+esac
+
+log_begin_msg "$DESCRIPTION"
+
+PROFILE=/root/etc/apparmor.d/usr.sbin.cupsd
+if [ -e "$PROFILE" ]; then
+ sed -i '/{/ s/{/flags=(complain) {/' $PROFILE
+fi
+
+log_end_msg
commit 588f83250352c5d6568fe12cbd5c4a589f01c713
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 13 08:53:53 2007 +0200
docs/ChangeLog.casper
scripts/live-bottom/41apt_cdrom
* Merging casper 1.100.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 5d0d286..159e31a 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,11 @@
+casper (1.100) gutsy; urgency=low
+
+ * scripts/casper-bottom/41apt_cdrom: Remove unnecessary /root/cdrom
+ mounting/unmounting code, which only serves to generate error messages
+ (scripts/casper-bottom/05mountpoints handles this already).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Tue, 11 Sep 2007 19:47:58 +0100
+
casper (1.99) gutsy; urgency=low
[ Luke Yelavich ]
diff --git a/scripts/live-bottom/41apt_cdrom b/scripts/live-bottom/41apt_cdrom
index fdde34d..63da284 100755
--- a/scripts/live-bottom/41apt_cdrom
+++ b/scripts/live-bottom/41apt_cdrom
@@ -31,9 +31,6 @@ log_begin_msg "Adding APT-CDROM source..."
# live-initramfs script
-mkdir -p /root/cdrom
-mount -n -o bind /cdrom /root/cdrom
chroot /root apt-cdrom -m add
-umount /root/cdrom
log_end_msg
--
debian-live/live-initramfs
More information about the debian-live-changes
mailing list