Merge branch 'revert-ef866fdb' into 'master'

Revert ef866fdb

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

diff --git a/components/9990-select-eth-device.sh b/components/9990-select-eth-device.sh
index b431781..b660a3d 100755 (executable)
--- a/components/9990-select-eth-device.sh
+++ b/components/9990-select-eth-device.sh
@@ -1,5 +1,30 @@
 #!/bin/sh
 
+Wait_for_carrier ()
+{
+       # $1 = network device
+       echo -n "Waiting for link to come up on $1... "
+       ip link set $1 up
+       for step in $(seq 1 15)
+       do
+               carrier=$(cat /sys/class/net/$1/carrier \
+               2>/dev/null)
+               case "${carrier}" in
+                       1)
+                       echo -e "\nLink is up"
+                       return
+                       ;;
+                       *)
+                       # Counter
+                       echo -n "$step "
+                       ;;
+               esac
+               sleep 1
+       done
+       echo -e "\nError - carrier not detected on $1."
+       ip link set $1 down
+}
+
 Select_eth_device ()
 {
        # Boot type in initramfs's config
@@ -46,6 +71,7 @@ Select_eth_device ()
                then
                        # only one interface : no choice
                        echo "DEVICE=$l_interfaces" >> /conf/param.conf
+                       Wait_for_carrier $l_interfaces
                        return
                fi
 
@@ -57,6 +83,7 @@ Select_eth_device ()
                                NETDEV="${ARGUMENT#live-netdev=}"
                                echo "DEVICE=$NETDEV" >> /conf/param.conf
                                echo "Found live-netdev parameter, forcing to to use network device $NETDEV."
+                               Wait_for_carrier $NETDEV
                                return
                                ;;
                        esac
@@ -75,6 +102,7 @@ Select_eth_device ()
                        # ATTR{carrier} is not set if this is not done
                        echo -n " $interface ?"
                        ipconfig -c none -d $interface -t 1 >/dev/null 2>&1
+                       sleep 1
                done
 
                echo ''
@@ -83,6 +111,7 @@ Select_eth_device ()
                do
                        for interface in $l_interfaces
                        do
+                               ip link set $interface up
                                carrier=$(cat /sys/class/net/$interface/carrier \
                                        2>/dev/null)
                                # link detected

diff --git a/debian/changelog b/debian/changelog
index d3020bf..5db1157 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+live-boot (1:20210122) unstable; urgency=medium
+
+  [ Steven Shiau ]
+  * A workaround to make sure /dev/mtd0 can be created
+  * Use ntfs-3g instead of kernel module ntfs.ko (Closes: #939034)
+
+  [ Benjamin Drung ]
+  * components/9990-networking.sh: Add shellcheck override
+  * Fix DNS search entry in /etc/resolv.conf
+  * Fix shellcheck in components/9990-main.sh
+  * Simplify empty check for /etc/resolv.conf
+  * Create /etc/hostname in initramfs
+  * Copy /etc/hostname and /etc/hosts into target
+  * Fix flipped logic for handling memdiskfind
+  * components/9990-main.sh: Fix shellcheck issue SC2236
+  * Fix leading space in DEVICE setting
+
+  [ Marcel Partap ]
+  * Accept multiple overlay names from persistence-label parameter
+  * Fix spurious error msgs from live-boot about failed mounts…
+  * Document the fact that persistence-label now accepts a list
+  * Set sticky bit on /var/tmp as well (matching perms in base-files)
+
+  [ Debian Janitor ]
+  * Update standards version to 4.4.1, no changes needed.
+  * Bump debhelper from old 10 to 12. + debian/rules: Move --fail-missing
+    argument to dh_missing.
+  * Set debhelper-compat version in Build-Depends.
+
+  [ Lyndon Brown ]
+  * amend copyright
+  * "Live Systems" -> "Debian Live"
+
+  [ Raphaël Hertzog ]
+  * Drop Iain R. Learmonth from Uploaders on his request (Closes: #970288)
+  * Update standards version to 4.5.0, no changes needed.
+  * Update my maintainer email
+
+ -- Raphaël Hertzog <raphael@offensive-security.com>  Fri, 22 Jan 2021 15:18:23 +0100
+
 live-boot (1:20190614) unstable; urgency=medium
 
   [ Roland Clobus ]

diff --git a/debian/control b/debian/control
index 65c6b83..972c5d6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ 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 <raphael@offensive-security.com>,
  Luca Boccassi <bluca@debian.org>
 Build-Depends:
  debhelper-compat (= 12),
  po4a,
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://wiki.debian.org/DebianLive
 Vcs-Browser: https://salsa.debian.org/live-team/live-boot