Adding upstream version 1.104.1.

diff --git a/Makefile b/Makefile
index 8e7c33c..d2381f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -106,12 +106,12 @@ uninstall:
        rm -f $(DESTDIR)/usr/share/man/man7/live-login.7.gz
 
 update:
-       set -e; for FILE in docs/parameters.txt manpages/*.en.*; \
+       set -e; for FILE in docs/parameters.txt; \
        do \
-               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.102.1/1.102.2/' \
+               sed -i  -e 's/2007\\-09\\-24/2007\\-10\\-01/' \
+                       -e 's/2007-09-24/2007-10-01/' \
+                       -e 's/24.09.2007/01.10.2007/' \
+                       -e 's/1.104.1/1.104.2/' \
                $$FILE; \
        done
 

diff --git a/docs/ChangeLog b/docs/ChangeLog
index d10e3ee..4d0e52a 100644 (file)
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,197 +1,238 @@
-commit 52da405cf94972bd036065b10be99bb414541dcb
+commit 96aa9285ee39f4d3d4245acd8c78accdf73c1fa8
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Sun Sep 16 23:39:42 2007 +0200
 
-    debian/control
-    
-      * Sorting Depends.
+    Bumping version to 1.104.1-1.
 
-commit 3cd5081adeeb14a7d380744f81cd2180276f0365
-Author: Michael Prokop <mika@grml.org>
-Date:   Sun Sep 16 22:46:41 2007 +0200
+ Makefile            |    2 +-
+ debian/changelog    |    2 +-
+ docs/parameters.txt |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
 
-    Depend on busybox.
-    
-    live-initramfs uses touch(1) which does not seem to be available
-    using klibc-utils. initramfs-tools version 0.91a (current
-    Debian/unstable) just depends on klibc-utils now and busybox is
-    in recommends only. If busybox isn't installed the generated
-    initramfs might not work due to lack of the touch command'
+commit 1a226e19e03be8ff90aaa50a7b5b9f202f65b8a4
+Author: Daniel Baumann <daniel@debian.org>
+
+    Merging casper 1.104.
+
+ docs/ChangeLog.casper |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
 
-commit 15f50dd4f009afb5f6ea7fa4b3c67d4bafe882aa
+commit bb97432f7c5eeb330d108be6607edfe0de85bfa7
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Fri Sep 14 18:06:22 2007 +0200
 
-    Makefile
-    debian/changelog
-    docs/parameters.txt
-    
-      * Bumping version to 1.102.1-1.
+    Bumping version to 1.103.1-1.
 
-commit 70e4f061298282c026bf018ce93314a0da5e5311
+ Makefile            |    2 +-
+ debian/changelog    |    2 +-
+ docs/parameters.txt |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 29c11f22032ccdb71aaccd5f6eb4a9be3efa5741
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Fri Sep 14 18:05:25 2007 +0200
 
-    docs/ChangeLog.casper
-    scripts/live-bottom/42disable_apparmor
-    
-      * Merging casper 1.102.
+    Merging casper 1.103.
+
+ docs/ChangeLog.casper                |    8 ++++++++
+ scripts/live-bottom/23networking     |   24 +++++++++++++++---------
+ scripts/live-bottom/25configure_init |    8 +++-----
+ 3 files changed, 26 insertions(+), 14 deletions(-)
 
-commit 57f2af1f2f32b4ac8ab96fa937ac4fa74673acce
+commit 66a175b6255aa061dc78fbd301c9844489c42fc8
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Thu Sep 13 09:06:27 2007 +0200
 
-    manpages/live-initramfs.en.7.txt
-    
-      * Removing Marco Amadori <marco.amadori@gmail.com>.
+    Preparing live-initramfs 1.102.2-1.
+
+ Makefile            |   10 +++++-----
+ debian/changelog    |    6 ++++++
+ docs/parameters.txt |    2 +-
+ 3 files changed, 12 insertions(+), 6 deletions(-)
 
-commit e823a3bea161604ca9fc610a972bcd209eb8a318
+commit 0b8cf3f17ed46e96fb5efd658c8e308ba1a2dd1a
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Thu Sep 13 09:05:12 2007 +0200
 
-    scripts/live
-    scripts/live-bottom/42disable_cups_apparmor
-    
-      * Adding noapparmor boot parameter.
+    Releasing live-initramfs 1.102.1-1.
 
-commit 7fbf30f8b110e717260d8784348924334441dd52
+ debian/changelog |    2 +-
+ docs/ChangeLog   |  195 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 196 insertions(+), 1 deletions(-)
+
+commit b782261bbdf33ff5c69780cc4c788c339d707f9b
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Thu Sep 13 09:00:00 2007 +0200
 
-    Makefile
-    debian/changelog
-    docs/parameters.txt
-    
-      * Bumping version to 1.101.1-1.
+    Sorting Depends.
+
+ debian/control |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
-commit ba448e1d11f36e19ad1cb8b9b0ef4ada520dc15a
+commit 17b3b36ef3c1fa5cbe5b11c9690a2b0a403db693
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Thu Sep 13 08:58:19 2007 +0200
 
-    scripts/live-bottom/42disable_cups_apparmor
-    
-      * Adjusting to live-initramfs.
+    Applied patch from Michael Prokop <mika@grml.org> to depend on busybox.
+
+ debian/control |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
-commit 8f5e698bfc5292a45196ada567758de53eaeb8cb
+commit 27cc7504bc8310e2836014d64576be7d9c974be2
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Thu Sep 13 08:56:05 2007 +0200
 
-    docs/ChangeLog.casper
-    scripts/live-bottom/42disable_cups_apparmor
-    
-      * Merging casper 1.101.
+    Bumping version to 1.102.1-1.
 
-commit 588f83250352c5d6568fe12cbd5c4a589f01c713
+ Makefile            |    2 +-
+ debian/changelog    |    2 +-
+ docs/parameters.txt |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 9e5b3c1cbeb80a472ba4387ef7e59b5e6bce913b
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Thu Sep 13 08:53:53 2007 +0200
 
-    docs/ChangeLog.casper
-    scripts/live-bottom/41apt_cdrom
-    
-      * Merging casper 1.100.
+    Merging casper 1.102.
+
+ docs/ChangeLog.casper                       |   10 ++++++
+ scripts/live-bottom/42disable_apparmor      |   36 ++++++++++++++++++++++
+ scripts/live-bottom/42disable_cups_apparmor |   43 ---------------------------
+ 3 files changed, 46 insertions(+), 43 deletions(-)
 
-commit df615e599339d96d0baa25799cb6cb9316bee6db
+commit 7b5c1e3232d0e02e712a4f984cd1e5009c9e4e9c
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:55:21 2007 +0200
 
-    debian/control
-    
-      * Using new Homepage field now.
+    Adding noapparmor boot parameter.
+
+ scripts/live                                |    5 +++++
+ scripts/live-bottom/42disable_cups_apparmor |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
 
-commit 1ec08c8bd0541df14e544d368adf55bbe1b615d6
+commit ea5fee194ea66ab0f41a0a973034db201651e09a
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:54:32 2007 +0200
 
-    scripts/live
-    
-      [ Frederic Boiteux <fboiteux@calistel.com> ]
-      * Patch for live-initramfs with NFSROOT=auto:
-        <http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-September/002173.html>
+    Bumping version to 1.101.1-1.
 
-commit 7dc88b8ee5316f0c057f99ccd87af126fb6a6177
+ Makefile            |    2 +-
+ debian/changelog    |    2 +-
+ docs/parameters.txt |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit b525502a2fdf073f4e326c1ca4dd8c89258ef65d
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:53:43 2007 +0200
-
-    manpages/Makefile
-    manpages/live-snapshot.en.1
-    manpages/live-snapshot.en.1.txt
-    manpages/live-snapshot.it.1
-    manpages/live-snapshot.it.1.txt
-    
-      [ Michael Prokop <mika@grml.org> ]
-      * Migrate live-snapshot.en.1 and live-snapshot.it.1 to asciidoc as well.
-
-commit e877a84275ea002afad615ee8c733a2949789465
+
+    Adjusting to live-initramfs.
+
+ scripts/live-bottom/42disable_cups_apparmor |   37 ++++++++++++++++----------
+ 1 files changed, 23 insertions(+), 14 deletions(-)
+
+commit 9b2894eaf50ce542d03329a0b49bf8df7d633371
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:50:53 2007 +0200
 
-    docs/CREDITS
-    
-      * Adding Marco Amadori <marco.amadori@gmail.com>.
+    Merging casper 1.101.
+
+ docs/ChangeLog.casper                       |    9 ++++++++
+ scripts/live-bottom/42disable_cups_apparmor |   29 +++++++++++++++++++++++++++
+ 2 files changed, 38 insertions(+), 0 deletions(-)
 
-commit 342a640d73b0556fe8e5b61eea2df860be606259
+commit f1e9fafee6e04a269a506edd31c62abd6917ecee
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:50:22 2007 +0200
 
-    debian/control
-    
-      * Sorting Build-Depends.
+    Merging casper 1.100.
+
+ docs/ChangeLog.casper           |    8 ++++++++
+ scripts/live-bottom/41apt_cdrom |    3 ---
+ 2 files changed, 8 insertions(+), 3 deletions(-)
 
-commit 693d13515d462a50e90ff9b9a6ad5a34ea5f6a2f
+commit 2df075f459f0a232a084ca6ad037d89764727d5f
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:50:04 2007 +0200
 
-    debian/rules
-    
-      * Simplifying make calls.
+    Using new Homepage field now.
 
-commit a91b809bc489027b2f0539d96b9de6a2adcb69fb
+ debian/control |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit d29346c7b4c7a67fed080ea46be15421dec12fe7
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:49:40 2007 +0200
 
-    manpages/live-initramfs.en.7
-    
-      [ Michael Prokop <mika@grml.org> ]
-      * Remove deprecated manpages/live-initramfs.en.7 (switched to asiidoc).
+    Applied patch from Frederic Boiteux <fboiteux@calistel.com> about NFSROOT=auto, <http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-September/002173.html>.
+
+ scripts/live |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
 
-commit 26fcf5653d0c326406d039fe4e3666fcf295d75c
+commit 4f4c8e22af7a539cfa8bc9ba371c6a57b8e7cb0c
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:49:16 2007 +0200
 
-    debian/control
-    debian/rules
-    
-      [ Michael Prokop <mika@grml.org> ]
-      * Update debian/control and debian/rules for use of asciidoc.
+    Applied patch from Michael Prokop <mika@grml.org> to migrate live-snapshot.en.1 and live-snapshot.it.1 to asciidoc as well.
+
+ manpages/Makefile               |   17 ++++--
+ manpages/live-snapshot.en.1     |   71 --------------------------
+ manpages/live-snapshot.en.1.txt |  100 ++++++++++++++++++++++++++++++++++++
+ manpages/live-snapshot.it.1     |   70 -------------------------
+ manpages/live-snapshot.it.1.txt |  107 +++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 219 insertions(+), 146 deletions(-)
 
-commit a3ac04f2e4eee9d4a489641d150e1256ce1366f3
+commit 3226d2bfd4e2463c9aa7a691f7e9ea132e258af6
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:48:51 2007 +0200
 
-    manpages/Makefile
-    manpages/live-initramfs.en.7.txt
-    
-      [ Michael Prokop <mika@grml.org> ]
-      * Switch to asciidoc for documentation.
+    Adding Marco Amadori <marco.amadori@gmail.com>.
 
-commit 993133a8c47a512d075b439598bba9806ddc0514
+ docs/CREDITS |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 757b214139daa0f7f312434ed0f77961ea380c4e
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:47:33 2007 +0200
 
-    debian/control
-    
-      * Fixing typing error.
+    Sorting Build-Depends.
+
+ debian/control |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
-commit 4b09e99f0118b0aad6610469db1cf37896df7a6c
+commit 8d6e39ce90ed0be835514a15fbf3a007a2b9f3fa
 Author: Daniel Baumann <daniel@debian.org>
-Date:   Wed Sep 12 20:47:20 2007 +0200
-
-    Makefile
-    debian/changelog
-    docs/parameters.txt
-    manpages/*
-    
-      * Preparing live-initramfs 1.99.3-1.
+
+    Simplifying make calls.
+
+ debian/rules |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit bef37dff239b6c28fef89679537bea8643628fe1
+Author: Daniel Baumann <daniel@debian.org>
+
+    Applied patch from Michael Prokop <mika@grml.org> to remove deprecated manpages/live-initramfs.en.7 (switched to asiidoc).
+
+ manpages/live-initramfs.en.7 |  127 ------------------------------------------
+ 1 files changed, 0 insertions(+), 127 deletions(-)
+
+commit 6a86b38986ab23d5cda24b38dca27c4a659bdfbd
+Author: Daniel Baumann <daniel@debian.org>
+
+    Applied patch from Michael Prokop <mika@grml.org> to update debian/control and debian/rules for use of asciidoc.
+
+ debian/control |    2 +-
+ debian/rules   |    2 ++
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 6685b97a4041477b2ccbfc9683e35c022cbe9ce7
+Author: Daniel Baumann <daniel@debian.org>
+
+    Applied patch from Michael Prokop <mika@grml.org> to switch to asciidoc for documentation.
+
+ manpages/Makefile                |   21 +++
+ manpages/live-initramfs.en.7.txt |  304 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 325 insertions(+), 0 deletions(-)
+
+commit 3b545dfb73b7ce99c3fd6e107d6843891f005ab1
+Author: Daniel Baumann <daniel@debian.org>
+
+    Fixing typing error.
+
+ debian/control |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ab933503a8204649724c525facbc14f734f1cd4e
+Author: Daniel Baumann <daniel@debian.org>
+
+    Preparing live-initramfs 1.99.3-1.
+
+ Makefile                     |    8 ++++----
+ debian/changelog             |    6 ++++++
+ docs/parameters.txt          |    2 +-
+ manpages/live-initramfs.en.7 |    2 +-
+ manpages/live-snapshot.en.1  |    2 +-
+ 5 files changed, 13 insertions(+), 7 deletions(-)
 
 2007-09-09  Daniel Baumann  <daniel@debian.org>
 

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 1db8326..cfba971 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,18 @@
+casper (1.104) gutsy; urgency=low
+
+  * casper-md5check: Fall back to text output if opening the usplash FIFO
+    fails (LP: #131209).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 20 Sep 2007 01:07:45 +0100
+
+casper (1.103) gutsy; urgency=low
+
+  * Disable anacron harder so that it doesn't get started by battery events.
+  * Don't write out DHCP network interface stanzas if network-manager is
+    installed (LP: #139403).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 19 Sep 2007 12:52:21 +0100
+
 casper (1.102) gutsy; urgency=low
 
   * Rename 42disable_cups_apparmor to 42disable_apparmor and remove AppArmor's

diff --git a/docs/parameters.txt b/docs/parameters.txt
index af5b200..07ef731 100644 (file)
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.102.1-1 on 2007-09-17.
+Updated for live-initramfs 1.104.1-1 on 2007-09-24.
 
 These options (can be combined) work from the bootloader prompt:
 

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index c6ec9cc..aeff351 100755 (executable)
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -82,10 +82,12 @@ else
        fi
 
        # iterate the physical interfaces and add them to the interfaces list
-       for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
-       do
-               [ -e $interface ] || continue
-               i="$(basename $interface)"
+       if [ "$method" != dhcp ] || [ ! -x /root/usr/sbin/NetworkManager ]
+       then
+               for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
+               do
+                       [ -e $interface ] || continue
+                       i="$(basename $interface)"
 
 cat >> "$IFFILE" << EOF
 auto $i
@@ -93,7 +95,8 @@ iface $i inet $method
 
 EOF
 
-       done
+               done
+       fi
 
        if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ]
        then
@@ -125,9 +128,11 @@ EOF
        fi
 fi
 
-#for i in eth0 eth1 eth2 ath0 wlan0
-#do
-#      grep -q "iface $i" $IFFILE && continue
+#if [ ! -x /root/usr/sbin/NetworkManager ]
+#then
+#      for i in eth0 eth1 eth2 ath0 wlan0
+#      do
+#              grep -q "iface $i" $IFFILE && continue
 #
 #cat >> "$IFFILE" << EOF
 #auto $i
@@ -135,6 +140,7 @@ fi
 #
 #EOF
 #
-#done
+#      done
+#fi
 
 log_end_msg

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index 1ed4445..e30261a 100755 (executable)
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -108,12 +108,10 @@ if [ -d /etc/rc0.d ]
 then
        # This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
        # /etc/crontab remaining disabled, yet also not run by anacron
-       if [ -x /root/etc/init.d/anacron ]
+       if [ -x /root/usr/sbin/anacron ]
        then
-               for f in /root/etc/rc?.d/S??anacron
-               do
-                       mv ${f} ${f%/*}/K00anacron
-               done
+               chroot /root dpkg-divert --add --rename --quiet /usr/sbin/anacron
+               ln -s /bin/true /usr/sbin/anacron
        fi
 
        # No point, really