Adding upstream version 3.0~a29.

Makefile

@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
+SCRIPTS = bin/* initramfs-tools/hooks/* initramfs-tools/scripts/live initramfs-tools/scripts/*/* scripts/*.sh scripts/*/*
 
 all: build
 
@@ -41,6 +41,10 @@ build:
 	@echo "Nothing to build."
 
 install:
+	# Installing scripts
+	mkdir -p $(DESTDIR)/lib/live
+	cp -r scripts/boot.sh scripts/boot $(DESTDIR)/lib/live
+
 	# Installing executables
 	mkdir -p $(DESTDIR)/sbin
 	cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
@@ -49,7 +53,7 @@ install:
 	cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
 
 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools
-	cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
+	cp -r initramfs-tools/* $(DESTDIR)/usr/share/initramfs-tools
 
 	# Installing docs
 	mkdir -p $(DESTDIR)/usr/share/doc/live-boot

VERSION

@@ -1 +1 @@
-3.0~a28-1
+3.0~a29-1

bin/live-snapshot

@@ -37,7 +37,39 @@ else
 	set -e
 fi
 
-. /usr/share/initramfs-tools/scripts/live-helpers
+## Begin FIXME: this is an embedded copy of the old 'live-helpers' initramfs script
+if [ ! -x "/bin/fstype" ]
+then
+	# klibc not in path -> not in initramfs
+	export PATH="${PATH}:/usr/lib/klibc/bin"
+fi
+
+# handle upgrade path from old udev (using udevinfo) to
+# recent versions of udev (using udevadm info)
+if [ -x /sbin/udevadm ]
+then
+	udevinfo='/sbin/udevadm info'
+else
+	udevinfo='udevinfo'
+fi
+
+old_root_overlay_label="live-rw"
+old_home_overlay_label="home-rw"
+custom_overlay_label="custom-ov"
+root_snapshot_label="live-sn"
+old_root_snapshot_label="live-sn"
+home_snapshot_label="home-sn"
+persistence_list="live-persistence.conf"
+
+# include all scripts for the time being until snapshots are either dropped or cleaned up
+for _SCRIPT in /lib/live/boot/*
+do
+	if [ -e "${_SCRIPT}" ]
+	then
+		. ${_SCRIPT}
+	fi
+done
+## End FIXME: this is an embedded copy of the old 'live-helpers' initramfs script
 
 LIVE_CONF="/etc/live/boot.d/snapshot.conf"
 

hooks/live → initramfs-tools/hooks/live

@@ -50,6 +50,10 @@ then
 fi
 
 [ "${QUIET}" ] || echo -n " "core
+
+mkdir -p "${DESTDIR}/lib/live"
+cp -a /lib/live/boot.sh /lib/live/boot "${DESTDIR}/lib/live"
+
 # Configuration
 if [ -e /usr/share/live-boot/languagelist ]
 then
@@ -64,10 +68,6 @@ mkdir -p "${DESTDIR}"/lib/live-boot
 copy_exec /usr/share/live-boot/live-reconfigure /bin
 copy_exec /usr/share/live-boot/live-preseed /bin
 
-# Scripts
-cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
-cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
-
 # klibc dependencies
 for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do

initramfs-tools/scripts/live

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+#set -e
+
+if [ -e /lib/live/boot.sh ]
+then
+	/lib/live/boot.sh ${@}
+fi

scripts/live-bottom/08persistence_excludes → initramfs-tools/scripts/live-bottom/08persistence_excludes

@@ -31,7 +31,9 @@ then
 	exit 0
 fi
 
-. /scripts/live-functions
+# FIXME: stop hardcoding overloading of initramfs-tools functions
+. /scripts/functions
+. /lib/live/boot/initramfs-tools.sh
 
 # live-boot script
 

scripts/live-bottom/10validateroot → initramfs-tools/scripts/live-bottom/10validateroot

@@ -20,8 +20,9 @@ case "${1}" in
 		;;
 esac
 
-. /scripts/live-functions
-. /scripts/live-helpers
+# FIXME: stop hardcoding overloading of initramfs-tools functions
+. /scripts/functions
+. /lib/live/boot/initramfs-tools.sh
 
 if ! [ -d "/root/usr/share/live-boot" ]
 then

scripts/live-bottom/12fstab → initramfs-tools/scripts/live-bottom/12fstab

@@ -21,7 +21,9 @@ esac
 
 # live-boot header
 
-. /scripts/live-functions
+# FIXME: stop hardcoding overloading of initramfs-tools functions
+. /scripts/functions
+. /lib/live/boot/initramfs-tools.sh
 
 if [ -n "${NOFSTAB}" ]
 then

scripts/live-bottom/23networking → initramfs-tools/scripts/live-bottom/23networking

@@ -25,7 +25,9 @@ then
 	exit 0
 fi
 
-. /scripts/live-functions
+# FIXME: stop hardcoding overloading of initramfs-tools functions
+. /scripts/functions
+. /lib/live/boot/initramfs-tools.sh
 
 log_begin_msg "Preconfiguring networking"
 

manpages/bin/update-version.sh

@@ -1,11 +1,24 @@
 #!/bin/sh
 
+## live-boot(7) - System Boot Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+##
+## live-boot comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
 set -e
 
-DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)"
 PROGRAM="LIVE\\\-BOOT"
 VERSION="$(cat ../VERSION)"
 
+DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)"
+
+DAY="$(LC_ALL=C date +%d)"
+MONTH="$(LC_ALL=C date +%m)"
+YEAR="$(LC_ALL=C date +%Y)"
+
 echo "Updating version headers..."
 
 for MANPAGE in en/*
@@ -14,3 +27,24 @@ do
 
 	sed -i -e "s|^.TH.*$|.TH ${PROGRAM} ${SECTION} ${DATE} ${VERSION} \"Debian Live Project\"|" ${MANPAGE}
 done
+
+# European date format
+for _LANGUAGE in de es fr it
+do
+	if ls po/${_LANGUAGE}/*.po > /dev/null 2>&1
+	then
+		for _FILE in po/${_LANGUAGE}/*.po
+		do
+			sed -i -e "s|^msgstr .*.2012\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
+		done
+	fi
+done
+
+# Brazilian date format
+if ls po/pt_BR/*.po > /dev/null 2>&1
+then
+	for _FILE in po/pt_BR/*.po
+	do
+		sed -i -e "s|^msgstr .*-2012\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
+	done
+fi

manpages/de/live-boot.de.7

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2012\-06\-04 3.0~a28\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 05.06.2012 3.0~a29\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts

manpages/de/live-persistence.conf.de.5

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 2012\-06\-04 3.0~a28\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 05.06.2012 3.0~a29\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-persistence.conf\fP \- Configuration file for persistence media in

manpages/de/live-snapshot.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 1 2012\-06\-04 3.0~a28\-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 05.06.2012 3.0~a29\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-snapshot\fP \- simple script to ease persistence usage

manpages/en/live-boot.7

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-06\-04 3.0~a28-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-06\-05 3.0~a29-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts

manpages/en/live-persistence.conf.5

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-06\-04 3.0~a28-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-06\-05 3.0~a29-1 "Debian Live Project"
 
 .SH NAME
 \fBlive-persistence.conf\fR \- Configuration file for persistence media in

manpages/en/live-snapshot.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2012\-06\-04 3.0~a28-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-06\-05 3.0~a29-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-snapshot\fR \- simple script to ease persistence usage

manpages/es/live-boot.es.7

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 04.06.2012 3.0~a28\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 05.06.2012 3.0~a29\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema

manpages/es/live-persistence.conf.es.5

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 04.06.2012 3.0~a28\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 05.06.2012 3.0~a29\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-persistence.conf\fP \- Fichero para configurar medios de almacenamiento

manpages/es/live-snapshot.es.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 1 04.06.2012 3.0~a28\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 1 05.06.2012 3.0~a29\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-snapshot\fP \- sencillo script para facilitar el uso de la persistencia

manpages/po/de/live-boot.7.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a28-1\n"
-"POT-Creation-Date: 2012-06-04 17:31+0300\n"
+"POT-Creation-Date: 2012-06-05 16:01+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2012-06-04"
-msgstr ""
+msgid "2012-06-05"
+msgstr "05.06.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a28-1"
+msgid "3.0~a29-1"
 msgstr ""
 
 #. type: TH

manpages/po/de/live-persistence.conf.5.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a28-1\n"
-"POT-Creation-Date: 2012-06-04 17:31+0300\n"
+"POT-Creation-Date: 2012-06-05 16:01+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2012-06-04"
-msgstr ""
+msgid "2012-06-05"
+msgstr "05.06.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a28-1"
+msgid "3.0~a29-1"
 msgstr ""
 
 #. type: TH

manpages/po/de/live-snapshot.1.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a28-1\n"
-"POT-Creation-Date: 2012-06-04 17:31+0300\n"
+"POT-Creation-Date: 2012-06-05 16:01+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2012-06-04"
-msgstr ""
+msgid "2012-06-05"
+msgstr "05.06.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a28-1"
+msgid "3.0~a29-1"
 msgstr ""
 
 #. type: TH

manpages/po/es/live-boot.7.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a28-1\n"
-"POT-Creation-Date: 2012-06-04 17:31+0300\n"
+"POT-Creation-Date: 2012-06-05 16:01+0300\n"
 "PO-Revision-Date: 2012-05-13 18:30+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -24,13 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2012-06-04"
-msgstr "04.06.2012"
+msgid "2012-06-05"
+msgstr "05.06.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "3.0~a28-1"
+#, fuzzy, no-wrap
+#| msgid "3.0~a28-1"
+msgid "3.0~a29-1"
 msgstr "3.0~a28-1"
 
 #. type: TH