Adding live-initramfs 1.87.5-1.

diff --git a/Makefile b/Makefile
index 7161b43..eb6910e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -117,8 +117,8 @@ uninstall:
 update:
        set -e; for MANPAGE in manpages/*.en.*; \
        do \
-               sed -i  -e 's/2007\\-05\\-14/2007\\-05\\-21/' \
-                       -e 's/1.87.3/1.87.4/' \
+               sed -i  -e 's/2007\\-05\\-21/2007\\-05\\-28/' \
+                       -e 's/1.87.4/1.87.5/' \
                $$MANPAGE; \
        done
 

diff --git a/bin/live-snapshot b/bin/live-snapshot
index 0c24f00..3f9c11c 100755 (executable)
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -154,7 +154,7 @@ Is_same_mount ()
 {
        dir1="`Base_path $1`"
        dir2="`Base_path $2`"
-       if [ "${dir1}" == "${dir2}" ]; then
+       if [ "${dir1}" = "${dir2}" ]; then
                return 0
        else
                return 1

diff --git a/conf/live.conf b/conf/live.conf
index fc85cc7..ecfcb0a 100644 (file)
--- a/conf/live.conf
+++ b/conf/live.conf
@@ -1,4 +1,4 @@
-# /etc/live.conf - configuration file for live-initramfs
+# /etc/live.conf - configuration file for live-initramfs(7)
 
 BUILD_SYSTEM="Debian"
 

diff --git a/debian/changelog b/debian/changelog
index 5e81645..a3b3592 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.87.5-1) unstable; urgency=medium
+
+  * New upstream release, replacing casper.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 28 May 2007 00:00:00 +0200
+
 live-initramfs (1.87.4-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 00b4e24..5511d40 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: live-initramfs
 Section: misc
 Priority: optional
 Maintainer: Debian Live <debian-live-devel@lists.alioth.debian.org>
-Uploaders: Daniel Baumann <daniel@debian.org>
+Uploaders: Daniel Baumann <daniel@debian.org>, Marco Amadori <marco.amadori@gmail.com>
 Build-Depends: debhelper (>= 5), lsb-release
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/debian-live/dists/trunk/live-initramfs/
@@ -12,9 +12,9 @@ Package: live-initramfs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, eject, file, initramfs-tools, sudo, user-setup
 Suggests: genext2fs, squashfs-tools
-Conflicts: casper, usplash (<< 0.4-43)
+Conflicts: casper (<< 1.87)
 Replaces: casper
-Description: Debian Live initramfs generator
+Description: Debian Live initramfs hook
  live-initramfs is a hook for the initramfs-tools, used to generate a initramfs
  capable to boot live systems, such as those created by live-helper. This
  includes the Debian Live isos, netboot tarballs, and usb stick images.
@@ -27,3 +27,13 @@ Description: Debian Live initramfs generator
   Homepage: <http://debian-live.alioth.debian.org/>
  .
  live-initramfs is a fork of casper <http://packages.ubuntu.com/casper/>.
+
+Package: casper
+Architecture: all
+Depends: live-initramfs
+Description: Debian Live initramfs hook (transitional package)
+ Package to ease upgrading from older casper package to the new live-initramfs
+ package.
+ .
+ This package can be purged at anytime once the live-initramfs package has been
+ installed.

diff --git a/debian/init b/debian/live-initramfs.init
similarity index 100%
rename from debian/init
rename to debian/live-initramfs.init

diff --git a/debian/postinst b/debian/live-initramfs.postinst
similarity index 100%
rename from debian/postinst
rename to debian/live-initramfs.postinst

diff --git a/docs/CREDITS b/docs/CREDITS
index 355eeab..00293a9 100644 (file)
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -10,6 +10,7 @@ Patches (alphabetical order):
   * Hadar Weiss <whadar@gmail.com>
   * Jason D. Clinton <me@jasonclinton.com>
   * Jonathan Hall <flimzy@flimzy.com>
+  * Kai Hendry <hendry@iki.fi>
   * Malcom Gilles <live@ouabain.org>
   * Mathieu Geli <mathieu.geli@gmail.com>
   * Oliver Osburg <o.osburg@uni-jena.de>

diff --git a/docs/ChangeLog b/docs/ChangeLog
index 8484510..53f568f 100644 (file)
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,4 +1,18 @@
-2007-06-18  Daniel Baumann  <daniel@debian.org>
+2007-05-24  Daniel Baumann  <daniel@debian.org>
+
+       * debian/control:
+         - Added casper transitional package.
+         - Removed usplash conflicts.
+       * scripts/live-bottom/42apt_upgrade:
+         - Added, idea taken from Kais webconverger.
+       * Uploaded 1.87.5-1.
+
+2007-05-23  Daniel Baumann  <daniel@debian.org>
+
+       * scripts/*:
+         - Minor code cleanup.
+
+2007-05-18  Daniel Baumann  <daniel@debian.org>
 
        * scripts/live, scripts/live-bottom/05mountpoints:
          - Replaced 'mount -o move' with 'mount --move'.
@@ -15,8 +29,9 @@
            terminal login.
        * bin/live-snapshot, scripts/live, scripts/live-helpers:
          - Also recognize ext3, but treat it like ext2.
+       * Uploaded 1.87.4-1.
 
-2007-06-12  Daniel Baumann  <daniel@debian.org>
+2007-05-12  Daniel Baumann  <daniel@debian.org>
 
        * scripts/live-bottom/*:
          - Added generic header.

diff --git a/hooks/live b/hooks/live
index 402f7ca..d47e6e9 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -47,39 +47,21 @@ copy_exec /usr/share/live-initramfs/live-preseed /bin
 cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
 cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
 
-# Handling binaries
+# Handling other stuff
 
-# losetup
-copy_exec /sbin/losetup /sbin
-
-# mount.cifs
-if [ -x /sbin/mount.cifs ]
-then
-       copy_exec /sbin/mount.cifs /sbin
-fi
-
-# eject
-copy_exec /usr/bin/eject /bin
-
-# udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+# Configuration: keymap (usefull when using encryption)
+if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
 then
-       mkdir -p "${DESTDIR}"/lib/udev
+       copy_exec /bin/loadkeys /bin
 
-       copy_exec /lib/udev/cdrom_id /lib/udev
-       copy_exec /lib/udev/path_id /lib/udev
-       copy_exec /lib/udev/vol_id /lib/udev
+       mkdir -p "${DESTDIR}"/etc
+       cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
 fi
 
-copy_exec /sbin/udevtrigger /sbin
-copy_exec /sbin/udevsettle /sbin
-copy_exec /usr/bin/udevinfo /bin
-
-# Handling kernel modules
-
 # Filesystem: cifs
 if [ -x /sbin/mount.cifs ]
 then
+       copy_exec /sbin/mount.cifs /sbin
         manual_add_modules cifs
 fi
 
@@ -87,6 +69,7 @@ fi
 manual_add_modules ext3
 
 # Filesystem: squashfs
+copy_exec /sbin/losetup /sbin
 manual_add_modules loop
 manual_add_modules squashfs
 
@@ -108,11 +91,19 @@ manual_add_modules sr_mod
 # Hardware: network
 auto_add_modules net
 
-# Custom keymap (usefull when using encryption)
-if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
+# Program: eject
+copy_exec /usr/bin/eject /bin
+
+# Program: udev
+if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
 then
-       copy_exec /bin/loadkeys /bin
+       mkdir -p "${DESTDIR}"/lib/udev
 
-       mkdir -p "${DESTDIR}"/etc
-       cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
+       copy_exec /lib/udev/cdrom_id /lib/udev
+       copy_exec /lib/udev/path_id /lib/udev
+       copy_exec /lib/udev/vol_id /lib/udev
 fi
+
+copy_exec /sbin/udevtrigger /sbin
+copy_exec /sbin/udevsettle /sbin
+copy_exec /usr/bin/udevinfo /bin

diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7
index dfe8990..8017eca 100644 (file)
--- a/manpages/live-initramfs.en.7
+++ b/manpages/live-initramfs.en.7
@@ -1,7 +1,7 @@
-.TH LIVE\-INITRAMFS 7 "2007\-05\-21" "1.87.4" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-05\-28" "1.87.5" "live\-initramfs"
 
 .SH NAME
-live\-initramfs \- Debian Live initramfs generator
+live\-initramfs \- Debian Live initramfs hook
 
 .SH SYNOPSIS
 .B BOOT=live
@@ -70,6 +70,8 @@ Adding this parameter, live\-initramfs will try to copy the whole read\-only med
 A path to a file present on the rootfs could be used to preseed debconf database.
 .IP "\fBpackage/question=\fR\fIVALUE\fR" 4
 All debian installed packages could be preseeded from command\-line that way, beware of blanks spaces, they will interfere with parsing, use a preseed file in this case.
+.IP "\fBupgrade\fR" 4
+performes a apt-get update/apt-get upgrace cycle while booting (experimental).
 .IP "\fBxdebconf\fR" 4
 uses xdebconfigurator, if present on the rootfs, to configure X instead of the standard procedure (experimental).
 .IP "\fBxvideomode=\fR\fIRESOLUTION\fR" 4

diff --git a/manpages/live-snapshot.en.1 b/manpages/live-snapshot.en.1
index daeb3d9..5f24d97 100644 (file)
--- a/manpages/live-snapshot.en.1
+++ b/manpages/live-snapshot.en.1
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-05\-21" "1.87.4" "live\-initramfs"
+.TH LIVE\-SNAPSHOT 1 "2007\-05\-28" "1.87.5" "live\-initramfs"
 
 .SH NAME
 live\-snapshot \- a simple script to ease persistence usage

diff --git a/scripts/live b/scripts/live
index 73a965e..86aaddc 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -76,7 +76,7 @@ parse_cmdline ()
                 export PERSISTENT="" ;;
             ip*)
                 STATICIP=${x#ip=}
-                if [ "${STATICIP}" == "" ]; then
+                if [ "${STATICIP}" = "" ]; then
                     STATICIP="frommedia"
                 fi
                 export STATICIP ;;
@@ -106,6 +106,8 @@ parse_cmdline ()
                 export MODULE=${x#module=} ;;
             preseed/file=*|file=*)
                 export LOCATION="${x#*=}" ;;
+           upgrade)
+               export UPGRADE="Yes" ;;
             */*=*)
                 question="${x%%=*}"
                 value="${x#*=}"
@@ -118,10 +120,10 @@ parse_cmdline ()
 
     # sort of compatibility with netboot.h from linux docs
     if [ -z "${NETBOOT}" ]; then
-        if [ "${ROOT}" == "/dev/nfs" ]; then
+        if [ "${ROOT}" = "/dev/nfs" ]; then
             NETBOOT="nfs"
             export NETBOOT
-        elif [ "${ROOT}" == "/dev/cifs" ]; then
+        elif [ "${ROOT}" = "/dev/cifs" ]; then
             NETBOOT="cifs"
             export NETBOOT
         fi

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index f4c42f8..378f016 100755 (executable)
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -26,7 +26,7 @@ log_begin_msg "Adding live session user..."
 
 # live-initramfs script
 
-if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+if [ "${BUILD_SYSTEM}" = "Debian" ]; then
     user_crypted="8Ab05sVQ4LLps" # as in `echo "live" | mkpasswd -s`
 else
     user_crypted="U6aMy0wojraho" # "ubuntu"
@@ -41,7 +41,7 @@ set passwd/username $USERNAME
 set passwd/user-uid 999
 EOF
 
-if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+if [ "${BUILD_SYSTEM}" = "Debian" ]; then
     chroot /root /usr/bin/env -i HOME="/root" \
         TERM="${TERM}" PATH="/usr/sbin:/usr/bin:/sbin:/bin" \
         /usr/lib/user-setup/user-setup-apply > /dev/null
@@ -62,7 +62,7 @@ if [ -z "${NOSUDO}" ]
 then
 
 if [ -f /root/etc/sudoers ]; then
-    if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+    if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
         grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin  ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
 
        # XXX - awful hack to stop xscreensaver locking the screen (#7150)

diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index 4f6be9d..8b47a00 100755 (executable)
--- a/scripts/live-bottom/13swap
+++ b/scripts/live-bottom/13swap
@@ -20,6 +20,11 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOSWAP}" ]
+then
+       exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Setting up swap..."
@@ -28,11 +33,6 @@ log_begin_msg "Setting up swap..."
 
 FSTAB=/root/etc/fstab
 
-if [ -n "${NOSWAP}" ]
-then
-    exit 0
-fi
-
 devices=""
 for device in /dev/[hs]d[a-z][0-9]*; do
     if ! [ -b "$device" ]; then

diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index 3fe04c7..bdb1d8b 100755 (executable)
--- a/scripts/live-bottom/14locales
+++ b/scripts/live-bottom/14locales
@@ -70,7 +70,7 @@ if [ "${set_locale}" ]; then
 
     really_export LANG
 
-    if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+    if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
         printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
         chroot /root /usr/sbin/locale-gen "${LANG}"
         live-preseed /root debian-installer/locale "${locale}"

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index b24d428..f15f033 100755 (executable)
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -36,7 +36,7 @@ else
 fi
 
 if chroot /root [ -f ${GDMCONF} ]; then
-    if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+    if [ "${BUILD_SYSTEM}" = "Debian" ]; then
         # true hack ! -- nohar
         chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
     fi

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 161215b..1105e4a 100755 (executable)
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -43,7 +43,7 @@ if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]; then
     chroot /root /usr/sbin/xdebconfigurator
 fi
 
-if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
     chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
 set xserver-xorg/autodetect_keyboard true
 fset xserver-xorg/autodetect_keyboard seen true

diff --git a/scripts/live-bottom/42apt_upgrade b/scripts/live-bottom/42apt_upgrade
new file mode 100755 (executable)
index 0000000..96ec814
--- /dev/null
+++ b/scripts/live-bottom/42apt_upgrade
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+#set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+       echo "${PREREQ}"
+}
+
+case "${1}" in
+       prereqs)
+               prereqs
+               exit 0
+               ;;
+esac
+
+# live-initramfs header
+
+if [ -z "${UPGRADE}" ]
+then
+       exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Enabling apt upgrade..."
+
+# live-initramfs script
+
+cat > /root/etc/init.d/apt-upgrade << EOF
+#!/bin/sh
+
+NOTTY="-q -y -o DPkg::Options::=--force-confdef"
+UPGRADEOPTS="dist-upgrade"
+DEBIAN_FRONTEND="noninteractive"
+export DEBIAN_FRONTEND
+
+apt-get -q=2 update && apt-get \${NOTTY} -u \${UPGRADEOPTS}
+EOF
+
+chmod 0755 /root/etc/init.d/apt-upgrade
+
+chroot /root update-rc.d apt-upgrade defaults 99
+
+log_end_msg