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
{
dir1="`Base_path $1`"
dir2="`Base_path $2`"
- if [ "${dir1}" == "${dir2}" ]; then
+ if [ "${dir1}" = "${dir2}" ]; then
return 0
else
return 1
-# /etc/live.conf - configuration file for live-initramfs
+# /etc/live.conf - configuration file for live-initramfs(7)
BUILD_SYSTEM="Debian"
* 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>
-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'.
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.
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
manual_add_modules ext3
# Filesystem: squashfs
+copy_exec /sbin/losetup /sbin
manual_add_modules loop
manual_add_modules squashfs
# 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
-.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
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
-.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
export PERSISTENT="" ;;
ip*)
STATICIP=${x#ip=}
- if [ "${STATICIP}" == "" ]; then
+ if [ "${STATICIP}" = "" ]; then
STATICIP="frommedia"
fi
export STATICIP ;;
export MODULE=${x#module=} ;;
preseed/file=*|file=*)
export LOCATION="${x#*=}" ;;
+ upgrade)
+ export UPGRADE="Yes" ;;
*/*=*)
question="${x%%=*}"
value="${x#*=}"
# 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
# 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"
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
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)
# live-initramfs header
+if [ -n "${NOSWAP}" ]
+then
+ exit 0
+fi
+
. /scripts/live-functions
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
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}"
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
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
--- /dev/null
+#!/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