[SCM] debian-live branch, master, updated. afa417ff0cd1b125453963d62bf9e842b26d3a64
Daniel Baumann
daniel at debian.org
Wed Jun 25 06:42:01 UTC 2008
The following commit has been merged in the master branch:
commit afa417ff0cd1b125453963d62bf9e842b26d3a64
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jun 25 08:36:54 2008 +0200
Updating.
diff --git a/scripts/apt-upgrade b/scripts/apt-upgrade
index fe9012d..86dd8ca 100755
--- a/scripts/apt-upgrade
+++ b/scripts/apt-upgrade
@@ -3,7 +3,7 @@
set -e
grep -qs boot=live /proc/cmdline || exit 0
-grep -qs upgrade /proc/cmdline || exit 0
+grep -qs " upgrade" /proc/cmdline || exit 0
case "${1}" in
start)
@@ -12,6 +12,7 @@ case "${1}" in
DEBIAN_FRONTEND="noninteractive"
export DEBIAN_FRONTEND
+ logger "Setting up upgrade"
apt-get -q=2 update && apt-get ${NOTTY} -u ${UPGRADEOPTS}
;;
esac
diff --git a/scripts/iptables b/scripts/iptables
index 9b70f4d..f379751 100755
--- a/scripts/iptables
+++ b/scripts/iptables
@@ -3,10 +3,11 @@
set -e
grep -qs boot=live /proc/cmdline || exit 0
-grep -qs iptables /proc/cmdline || exit 0
+grep -qs " firewall" /proc/cmdline || exit 0
case "${1}" in
start)
+ logger "Setting up iptables"
echo 1 > /proc/sys/net/ipv4/ip_forward
iptables -N block
--
debian-live
More information about the debian-live-changes
mailing list