- PLD merge: container related fixes

diff --git a/lib/functions b/lib/functions
index 012f59c1faab52b55a7034023bb555162202fce4..682102201880e77143688e76525a20b29453c69b 100644 (file)
--- a/lib/functions
+++ b/lib/functions
@@ -1028,6 +1028,9 @@ confirm() {
 
 # module is needed (ie. is requested, is available and isn't loaded already)
 is_module() {
+       # fail if /sbin/lsmod does not exists (ex. in containers)
+       [ -x /sbin/lsmod ] || return 1
+
        # module name without .o at end
        if ! lsmod | grep -q "$1"; then
                if ls -1R /lib/modules/$(uname -r)/ 2> /dev/null | grep -q "^${1}.\(\|k\)o\(\|.gz\)"; then

diff --git a/lib/functions.network b/lib/functions.network
index b4ea5d03533d48230516331bc0adba181ef08087..ad930e3b9914d6cfb1e2d2ca8939c7929504fb19 100644 (file)
--- a/lib/functions.network
+++ b/lib/functions.network
@@ -345,7 +345,8 @@ setup_routes()
 # Add ONLY IPv4 address (IPv6 address is added automaticly)
 set_up_loopback()
 {
-       if is_yes "$IPV4_NETWORKING"; then
+       # test if addr is assigned already as lxd(lxc?) initializes loopback upfront
+       if is_yes "$IPV4_NETWORKING" && ! ip addr show lo | grep -q "127\.0\.0\.1"; then
                ip addr add 127.0.0.1/8 dev lo
        fi
        ip link set dev lo up