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 (executable)
--- 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 (file)
--- 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),