Merge branch 'debian'

VERSION

@@ -1 +1 @@
-4.0~alpha19-1
+4.0~alpha21-1

components/9990-initramfs-tools.sh

@@ -31,7 +31,7 @@ panic()
 	do
 		case "${_PARAMETER}" in
 			panic=*)
-				panic="${_PARAMETER#*verify-checksums=}"
+				panic="${_PARAMETER#*panic=}"
 				;;
 		esac
 	done

components/9990-main.sh

@@ -178,10 +178,16 @@ Live ()
 		fi
 	fi
 
-	if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+	if [ -L /root/etc/resolv.conf ] ; then
+		# assume we have resolvconf
+		DNSFILE="${rootmnt}/etc/resolvconf/resolv.conf.d/base"
+	else
+		DNSFILE="${rootmnt}/etc/resolv.conf"
+	fi
+	if [ -f /etc/resolv.conf ] && [ ! -s ${DNSFILE} ]
 	then
-		log_begin_msg "Copying /etc/resolv.conf to ${rootmnt}/etc/resolv.conf"
-		cp -v /etc/resolv.conf ${rootmnt}/etc/resolv.conf
+		log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
+		cp -v /etc/resolv.conf ${DNSFILE}
 		log_end_msg
 	fi
 

components/9990-misc-helpers.sh

@@ -1422,7 +1422,7 @@ get_custom_mounts ()
 	prev_dest=""
 	# This sort will ensure that a source /a comes right before a source
 	# /a/b so we only need to look at the previous source
-	sort -k2 -b ${custom_mounts} |
+	[ -e ${custom_mounts} ] && sort -k2 -b ${custom_mounts} |
 	while read device source dest options
 	do
 		if echo ${source} | grep -qe "^${prev_source}\(/.*\)\?$"

components/9990-netbase.sh

@@ -16,7 +16,12 @@ Netbase ()
 	log_begin_msg "Preconfiguring networking"
 
 	IFFILE="/root/etc/network/interfaces"
-	DNSFILE="/root/etc/resolv.conf"
+	if [ -L /root/etc/resolv.conf ] ; then
+		# assume we have resolvconf
+		DNSFILE="/root/etc/resolvconf/resolv.conf.d/base"
+	else
+		DNSFILE="/root/etc/resolv.conf"
+	fi
 
 	if [ "${STATICIP}" = "frommedia" ] && [ -e "${IFFILE}" ]
 	then
@@ -102,7 +107,7 @@ EOF
 			done
 		fi
 
-		if [ ! -f /root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf)" ]
+		if [ ! -f "${DNSFILE}" ] || [ -z "$(cat ${DNSFILE})" ]
 		then
 			if [ -f /netboot.config ]
 			then
@@ -112,20 +117,20 @@ EOF
 				rc_search=$(cat netboot.config | awk '/domain/ { print $3 }')
 				rc_server0="$(cat netboot.config | awk '/dns0/ { print $5 }')"
 
-cat > /root/etc/resolv.conf << EOF
+cat > $DNSFILE << EOF
 search ${rc_search}
 domain ${rc_search}
 nameserver ${rc_server0}
 EOF
 
 				rc_server1=$(cat netboot.config | awk '/dns0/ { print $8 }')
 
-				if [ "${rc_server1}" ! = "0.0.0.0" ]
+				if [ "${rc_server1}" != "0.0.0.0" ]
 				then
-					echo "nameserver ${rc_server1}" >> /root/etc/resolv.conf
+					echo "nameserver ${rc_server1}" >> $DNSFILE
 				fi
 
-				cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+				cat $DNSFILE >> /root/var/log/netboot.config
 			fi
 		fi
 	fi

components/9990-overlay.sh

@@ -376,7 +376,7 @@ setup_unionfs ()
 	then
 		local custom_mounts
 		custom_mounts="/tmp/custom_mounts.list"
-		rm -rf ${custom_mounts} 2> /dev/null
+		rm -f ${custom_mounts}
 
 		# Gather information about custom mounts from devies detected as overlays
 		get_custom_mounts ${custom_mounts} ${overlay_devices}
@@ -387,7 +387,7 @@ setup_unionfs ()
 		local used_overlays
 		used_overlays=""
 		used_overlays=$(activate_custom_mounts ${custom_mounts})
-		rm ${custom_mounts}
+		rm -f ${custom_mounts}
 
 		# Close unused overlays (e.g. due to missing $persistence_list)
 		for overlay in ${overlay_devices}

debian/changelog

@@ -1,3 +1,21 @@
+live-boot (4.0~alpha21-1) unstable; urgency=low
+
+  * Building with dh --parallel.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 31 Mar 2014 21:55:30 +0200
+
+live-boot (4.0~alpha20-1) unstable; urgency=low
+
+  [ Trent W. Buck ]
+  * Fix cut-and-paste typo verify-checksums -> panic.
+
+  [ Evgeni Golov ]
+  * Properly check if $rc_server1 is not "0.0.0.0".
+  * Supporting resolvconf in the squashfs.
+  * Do not throw warnings when /tmp/custom_mounts.list does not exist.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 31 Mar 2014 21:38:22 +0200
+
 live-boot (4.0~alpha19-1+grml.3) unstable; urgency=medium
 
   * [8acc928] try to be smarter when booting a squashfs image from

debian/rules

@@ -5,7 +5,7 @@ build:
 	dh build
 
 %:
-	dh ${@} --with quilt
+	dh ${@} --with quilt --parallel
 
 override_dh_auto_install:
 	dh_auto_install -- DESTDIR=debian/tmp

manpages/de/live-boot.de.7

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-02\-08 4.0~alpha19\-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2014\-03\-31 4.0~alpha21\-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Components

manpages/de/persistence.conf.de.5

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-02\-08 4.0~alpha19\-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2014\-03\-31 4.0~alpha21\-1 "Live Systems Project"
 
 .SH NAME
 \fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot

manpages/en/live-boot.7

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2014\-02\-08 4.0~alpha19-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2014\-03\-31 4.0~alpha21-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Components

manpages/en/persistence.conf.5

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2014\-02\-08 4.0~alpha19-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2014\-03\-31 4.0~alpha21-1 "Live Systems Project"
 
 .SH NAME
 \fBpersistence.conf\fR \- Configuration file for persistence media in

manpages/es/live-boot.es.7

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-02\-08 4.0~alpha19\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT 7 2014\-03\-31 4.0~alpha21\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Componentes de Arranque del Sistema

manpages/es/persistence.conf.es.5

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-02\-08 4.0~alpha19\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT conf 2014\-03\-31 4.0~alpha21\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con

manpages/ja/live-boot.ja.7

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-02\-08 4.0~alpha19\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT 7 2014\-03\-31 4.0~alpha21\-1 "Live システムプロジェクト"
 
 .SH 名前
 \fBlive\-boot\fP \- システム起動構成要素

manpages/ja/persistence.conf.ja.5

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-02\-08 4.0~alpha19\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT conf 2014\-03\-31 4.0~alpha21\-1 "Live システムプロジェクト"
 
 .SH 名前
 \fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル

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

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha19-1\n"
-"POT-Creation-Date: 2014-02-08 17:31+0100\n"
+"Project-Id-Version: live-boot 4.0~alpha21-1\n"
+"POT-Creation-Date: 2014-03-31 21:55+0200\n"
 "PO-Revision-Date: 2013-11-10 20:10+0900\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-02-08"
+msgid "2014-03-31"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~alpha19-1"
-msgstr "4.0~alpha19-1"
+msgid "4.0~alpha21-1"
+msgstr "4.0~alpha21-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

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

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha19-1\n"
-"POT-Creation-Date: 2014-02-08 17:31+0100\n"
+"Project-Id-Version: live-boot 4.0~alpha21-1\n"
+"POT-Creation-Date: 2014-03-31 21:55+0200\n"
 "PO-Revision-Date: 2013-11-10 20:10+0900\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-02-08"
+msgid "2014-03-31"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~alpha19-1"
-msgstr "4.0~alpha19-1"
+msgid "4.0~alpha21-1"
+msgstr "4.0~alpha21-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

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

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha19-1\n"
-"POT-Creation-Date: 2014-02-08 17:31+0100\n"
+"Project-Id-Version: live-boot 4.0~alpha21-1\n"
+"POT-Creation-Date: 2014-03-31 21:55+0200\n"
 "PO-Revision-Date: 2013-11-10 20:10+0900\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-02-08"
+msgid "2014-03-31"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~alpha19-1"
-msgstr "4.0~alpha19-1"
+msgid "4.0~alpha21-1"
+msgstr "4.0~alpha21-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -75,9 +75,9 @@ msgid ""
 "This includes the Live systems ISOs, netboot tarballs, and usb stick images."
 msgstr ""
 "live-boot es un hook para initramfs-tools, usado para generar un initramfs "
-"capaz de arrancar sistemas en vivo, tales como los creados por I<live-helper>"
-"(7). Esto incluye las ISOs de Live Systems, netboot tarballs y las imágenes "
-"para llaves usb. "
+"capaz de arrancar sistemas en vivo, tales como los creados por I<live-"
+"helper>(7). Esto incluye las ISOs de Live Systems, netboot tarballs y las "
+"imágenes para llaves usb. "
 
 #.  FIXME
 #. type: Plain text

manpages/po/es/persistence.conf.5.po

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha19-1\n"
-"POT-Creation-Date: 2014-02-08 17:31+0100\n"
+"Project-Id-Version: live-boot 4.0~alpha21-1\n"
+"POT-Creation-Date: 2014-03-31 21:55+0200\n"
 "PO-Revision-Date: 2013-11-10 20:10+0900\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-02-08"
+msgid "2014-03-31"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~alpha19-1"
-msgstr "4.0~alpha19-1"
+msgid "4.0~alpha21-1"
+msgstr "4.0~alpha21-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

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

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha19-1\n"
-"POT-Creation-Date: 2014-02-08 17:31+0100\n"
+"Project-Id-Version: live-boot 4.0~alpha21-1\n"
+"POT-Creation-Date: 2014-03-31 21:55+0200\n"
 "PO-Revision-Date: 2013-11-10 20:10+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-02-08"
+msgid "2014-03-31"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~alpha19-1"
-msgstr "4.0~alpha19-1"
+msgid "4.0~alpha21-1"
+msgstr "4.0~alpha21-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

manpages/po/ja/persistence.conf.5.po

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha19-1\n"
-"POT-Creation-Date: 2014-02-08 17:31+0100\n"
+"Project-Id-Version: live-boot 4.0~alpha21-1\n"
+"POT-Creation-Date: 2014-03-31 21:55+0200\n"
 "PO-Revision-Date: 2013-11-06 04:30+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-02-08"
+msgid "2014-03-31"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~alpha19-1"
-msgstr "4.0~alpha19-1"
+msgid "4.0~alpha21-1"
+msgstr "4.0~alpha21-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1