B #174: add support for ALIAS_DETACH

5 years ago · b6f2245f97
parent 68834953f7
commit b6f2245f97
4 changed files with 28 additions and 16 deletions
--- a/src/etc/one-context.d/loc-10-network##apk.one
+++ b/src/etc/one-context.d/loc-10-network##apk.one
@ -273,11 +273,14 @@ EOT

            EXTERNAL=$(get_iface_var "EXTERNAL")
            EXTERNAL=${EXTERNAL^^}
+            DETACH=$(get_iface_var "DETACH")

+            if [ -z "${DETACH}" ]; then
                if [ -z "${EXTERNAL}" ] || [ $EXTERNAL = "NO" ]; then
                    [ -n "${IP}"  ] && gen_alias_conf
                    [ -n "${IP6}" ] && gen_alias6_conf
                fi
+            fi
        done
    done
 }
--- a/src/etc/one-context.d/loc-10-network##bsd.one
+++ b/src/etc/one-context.d/loc-10-network##bsd.one
@ -243,7 +243,9 @@ gen_network_configuration()

            EXTERNAL=$(get_iface_var "EXTERNAL")
            EXTERNAL=${EXTERNAL^^}
+            DETACH=$(get_iface_var "DETACH")

+            if [ -z "${DETACH}" ]; then
                if [ -z "${EXTERNAL}" ] || [ "$EXTERNAL" = "NO" ]; then
                    [ -n "${IP}"  ] && gen_alias_conf

@ -252,6 +254,7 @@ gen_network_configuration()
                        HAS_IP6=${IP6}
                    fi
                fi
+            fi
        done
    done
 }
--- a/src/etc/one-context.d/loc-10-network##deb.one
+++ b/src/etc/one-context.d/loc-10-network##deb.one
@ -299,11 +299,14 @@ EOT

            EXTERNAL=$(get_iface_var "EXTERNAL")
            EXTERNAL=${EXTERNAL^^}
+            DETACH=$(get_iface_var "DETACH")

+            if [ -z "${DETACH}" ]; then
                if [ -z "${EXTERNAL}" ] || [ $EXTERNAL = "NO" ]; then
                    [ -n "${IP}"  ] && gen_alias_conf
                    [ -n "${IP6}" ] && gen_alias6_conf
                fi
+            fi
        done
    done
 }
--- a/src/etc/one-context.d/loc-10-network##rpm.one
+++ b/src/etc/one-context.d/loc-10-network##rpm.one
@ -273,7 +273,9 @@ EOT

                EXTERNAL=$(get_iface_var "EXTERNAL")
                EXTERNAL=${EXTERNAL^^}
+                DETACH=$(get_iface_var "DETACH")

+                if [ -z "${DETACH}" ]; then
                    if [ -z "${EXTERNAL}" ] || [ "$EXTERNAL" = "NO" ]; then
                        [ -n "${IP}"  ] && gen_alias_conf
                        [ -n "${IP6}" ] && gen_alias6_conf
@ -282,6 +284,7 @@ EOT
                            ALIAS_NUM=$((ALIAS_NUM + 1))
                        fi
                    fi
+                fi
            done

            # on Red Hats, we need just a single configuration