From: Raphaël Hertzog <hertzog@debian.org>
Date: Sat, 12 Dec 2020 16:10:37 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: debian/1%20210122~3
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=4e260c46192d5c6e67fd7b6775aaa2f07ea8301e;hp=e82ece9eb1d606a1479f02fd3ae4f46eb9bb0ded

Merge branch 'master' into 'master'

9990-select-eth-device.sh: check carrier, pick NIC

See merge request live-team/live-boot!33
---

diff --git a/components/9990-select-eth-device.sh b/components/9990-select-eth-device.sh
index 8d7ef84..365d64b 100755
--- a/components/9990-select-eth-device.sh
+++ b/components/9990-select-eth-device.sh
@@ -120,7 +120,7 @@ Select_eth_device ()
 					1)
 						echo "Connected $interface found"
 						# inform initrd's init script :
-						found_eth_dev="$found_eth_dev $interface"
+						found_eth_dev="$interface"
 						;;
 				esac
 			done
diff --git a/debian/control b/debian/control
index 65c6b83..8b29f35 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: live-boot
 Section: misc
 Priority: optional
 Maintainer: Debian Live Maintainers <debian-live@lists.debian.org>
-Uploaders: Iain R. Learmonth <irl@debian.org>, Raphaël Hertzog <hertzog@debian.org>,
+Uploaders: Raphaël Hertzog <hertzog@debian.org>,
  Luca Boccassi <bluca@debian.org>
 Build-Depends:
  debhelper-compat (= 12),