Merge branch 'debian'

VERSION

@@ -1 +1 @@
-5.0~a3-1
+5.0~a5-1

components/9990-misc-helpers.sh

@@ -150,7 +150,7 @@ check_dev ()
 				ISO_DEVICE=$(dirname ${ISO_DEVICE})
 				[ -b "$ISO_DEVICE" ] && break
 				i=$(($i -1))
-		        done
+			done
 		fi
 
 		if [ "$ISO_DEVICE" = "/" ]
@@ -1103,18 +1103,18 @@ find_persistence_media ()
 			result=$(probe_for_file_name "${overlays}" ${dev})
 			if [ -n "${result}" ]
 			then
-			        local loopdevice
+				local loopdevice
 				loopdevice=${result##*=}
-			        if is_in_comma_sep_list luks ${PERSISTENCE_ENCRYPTION} && is_luks_partition ${loopdevice}
+				if is_in_comma_sep_list luks ${PERSISTENCE_ENCRYPTION} && is_luks_partition ${loopdevice}
 				then
-				        local luksfile
+					local luksfile
 					luksfile=""
 					if luksfile=$(open_luks_device "${loopdevice}")
 					then
-					        result=${result%%=*}
+						result=${result%%=*}
 						result="${result}=${luksfile}"
 					else
-					        losetup -d $loopdevice
+						losetup -d $loopdevice
 						result=""
 					fi
 				fi

components/9990-mount-http.sh

@@ -83,7 +83,7 @@ do_httpmount ()
 	then
 		if [ -d "${alt_mountpoint}" ]
 		then
-		        umount "${alt_mountpoint}"
+			umount "${alt_mountpoint}"
 			rmdir "${alt_mountpoint}"
 		fi
 		umount "${mountpoint}"

components/9990-netbase.sh

@@ -81,7 +81,7 @@ EOF
 		# iterate the physical interfaces and add them to the interfaces list and also add when ethdevice= called on cmdline
 		if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ]) || [ ! -z "${ETHDEVICE}" ]
 		then
-			for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
+			for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan* /sys/class/net/en*
 			do
 				[ -e ${interface} ] || continue
 				i="$(basename ${interface})"

components/9990-overlay.sh

@@ -374,8 +374,8 @@ setup_unionfs ()
 		done
 	fi
 
-        # ensure that a potentially stray tmpfs gets removed
-        # otherways, initramfs-tools is unable to remove /live
-        # and fails to boot
-        umount /live/overlay > /dev/null 2>&1 || true
+	# ensure that a potentially stray tmpfs gets removed
+	# otherways, initramfs-tools is unable to remove /live
+	# and fails to boot
+	umount /live/overlay > /dev/null 2>&1 || true
 }

components/9990-select-eth-device.sh

@@ -39,7 +39,7 @@ Select_eth_device ()
 		echo "Waiting for ethernet card(s) up... If this fails, maybe the ethernet card is not supported by the kernel `uname -r`?"
 		while [ -z "$l_interfaces" ]
 		do
-			l_interfaces="$(cd /sys/class/net/ && ls -d eth* 2>/dev/null)"
+			l_interfaces="$(cd /sys/class/net/ && ls -d * 2>/dev/null | grep -v "lo")"
 		done
 
 		if [ $(echo $l_interfaces | wc -w) -lt 2 ]

debian/changelog

@@ -1,3 +1,18 @@
+live-boot (5.0~a5-1) unstable; urgency=low
+
+  [ Richard Nelson ]
+  * Adjusting whitespace to tabs on components/9990-overlay.sh
+  * Adjusting whitespace to tabs on components/9990-misc-helpers.sh
+  * Adjusting whitespace to tabs on components/9990-mount-http.sh
+
+  [ Daniel Baumann ]
+  * Wrap and sort debian control file.
+
+  [ Steven Shiau ]
+  * Support predictable network interface names.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 23 Aug 2015 10:55:32 +0200
+
 live-boot (5.0~a4-1+grml.1) unstable; urgency=medium
 
   [ Evgeni Golov ]

debian/control

@@ -13,8 +13,8 @@ Bugs: mailto:bugs@grml.org
 Package: live-boot-grml
 Architecture: all
 Depends:
- ${misc:Depends},
  live-boot-grml-initramfs-tools | live-boot-backend,
+ ${misc:Depends},
 Recommends:
  live-boot-grml-doc,
  live-tools,
@@ -23,8 +23,8 @@ Recommends:
  rsync,
  uuid-runtime,
 Suggests:
- curlftpfs,
  cryptsetup,
+ curlftpfs,
  httpfs2,
  wget,
 Conflicts: live-boot
@@ -44,7 +44,8 @@ Description: Live System Boot Components
 Package: live-boot-grml-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: Live System Boot Components (documentation)
  The Live Systems project maintains the components to build Debian based Live
  systems and the official Debian Live images themselves.
@@ -61,13 +62,16 @@ Description: Live System Boot Components (documentation)
 Package: live-boot-grml-initramfs-tools
 Architecture: all
 Depends:
- ${misc:Depends},
  busybox | busybox-initramfs,
  initramfs-tools,
  udev,
-Conflicts: live-boot-backend
-Replaces: live-boot-backend
-Provides: live-boot-backend
+ ${misc:Depends},
+Conflicts:
+ live-boot-backend,
+Replaces:
+ live-boot-backend,
+Provides:
+ live-boot-backend,
 Description: Live System Boot Components (initramfs-tools backend)
  The Live Systems project maintains the components to build Debian based Live
  systems and the official Debian Live images themselves.

manpages/en/live-boot.7

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2015\-04\-28 5.0~a3-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2015\-08\-23 5.0~a5-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 2015\-04\-28 5.0~a3-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2015\-08\-23 5.0~a5-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 2015\-04\-28 5.0~a3\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT 7 2015\-08\-23 5.0~a5\-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 2015\-04\-28 5.0~a3\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT conf 2015\-08\-23 5.0~a5\-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 2015\-04\-28 5.0~a3\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT 7 2015\-08\-23 5.0~a5\-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 2015\-04\-28 5.0~a3\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT conf 2015\-08\-23 5.0~a5\-1 "Live システムプロジェクト"
 
 .SH 名前
 \fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル

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

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2015-04-28 07:19+0200\n"
+"POT-Creation-Date: 2015-08-23 10: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,13 +25,13 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2015-04-28"
+msgid "2015-08-23"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "5.0~a3-1"
+msgid "5.0~a5-1"
 msgstr ""
 
 #. type: TH

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

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2015-04-28 07:19+0200\n"
+"POT-Creation-Date: 2015-08-23 10: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,13 +23,13 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2015-04-28"
+msgid "2015-08-23"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "5.0~a3-1"
+msgid "5.0~a5-1"
 msgstr ""
 
 #. type: TH

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

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2015-04-28 07:19+0200\n"
+"POT-Creation-Date: 2015-08-23 10:55+0200\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -23,13 +23,13 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, fuzzy, no-wrap
-msgid "2015-04-28"
+msgid "2015-08-23"
 msgstr "2015-01-04"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, fuzzy, no-wrap
-msgid "5.0~a3-1"
+msgid "5.0~a5-1"
 msgstr "5.0~a1-1"
 
 #. type: TH

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

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2015-04-28 07:19+0200\n"
+"POT-Creation-Date: 2015-08-23 10:55+0200\n"
 "PO-Revision-Date: 2015-01-05 05:50+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -23,13 +23,13 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, fuzzy, no-wrap
-msgid "2015-04-28"
+msgid "2015-08-23"
 msgstr "2015-01-04"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, fuzzy, no-wrap
-msgid "5.0~a3-1"
+msgid "5.0~a5-1"
 msgstr "5.0~a1-1"
 
 #. type: TH

manpages/pot/live-boot.7.pot

@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 5.0~a3-1\n"
-"POT-Creation-Date: 2015-04-28 07:19+0200\n"
+"Project-Id-Version: live-boot 5.0~a5-1\n"
+"POT-Creation-Date: 2015-08-23 10:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2015-04-28"
+msgid "2015-08-23"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "5.0~a3-1"
+msgid "5.0~a5-1"
 msgstr ""
 
 #. type: TH

manpages/pot/persistence.conf.5.pot

@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 5.0~a3-1\n"
-"POT-Creation-Date: 2015-04-28 07:19+0200\n"
+"Project-Id-Version: live-boot 5.0~a5-1\n"
+"POT-Creation-Date: 2015-08-23 10:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2015-04-28"
+msgid "2015-08-23"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "5.0~a3-1"
+msgid "5.0~a5-1"
 msgstr ""
 
 #. type: TH