cleanup: add network-hooks directory and move respective files

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index dbf810a01138a9a0366af35e94141c6df60b80f6..f44e1a500528978c3bca380f372df12b1dac78f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
 
 DESTDIR=
 
-SUBDIRS = aplinfo PVE bin www services configs
+SUBDIRS = aplinfo PVE bin www services configs network-hooks
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell git rev-parse HEAD)
@@ -38,7 +38,7 @@ upload: ${DEB} check
        tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com upload --product pve --dist stretch
 
 .PHONY: install
-install: vzdump-hook-script.pl mtu bridgevlan bridgevlanport vlan vlan-down
+install: vzdump-hook-script.pl
        install -d -m 0700 -o www-data -g www-data ${DESTDIR}/var/log/pveproxy
        install -d ${DESTDIR}/usr/share/${PACKAGE}
        install -d ${DESTDIR}/usr/share/man/man1
@@ -48,15 +48,8 @@ install: vzdump-hook-script.pl mtu bridgevlan bridgevlanport vlan vlan-down
        install -d ${DESTDIR}/var/lib/vz/template/cache
        install -d ${DESTDIR}/var/lib/vz/template/iso
        install -d ${DESTDIR}/var/lib/vz/template/qemu
-       install -D -m 0755 mtu ${DESTDIR}/etc/network/if-up.d/mtu
-       install -D -m 0755 bridgevlan ${DESTDIR}/etc/network/if-up.d/bridgevlan
-       install -D -m 0755 bridgevlanport ${DESTDIR}/etc/network/if-up.d/bridgevlanport
-       install -D -m 0755 vlan ${DESTDIR}/etc/network/if-pre-up.d/vlan
-       install -D -m 0755 vlan-down ${DESTDIR}/etc/network/if-post-down.d/vlan
-
        install -m 0644 vzdump-hook-script.pl ${DOCDIR}/examples/vzdump-hook-script.pl
        install -m 0644 spice-example-sh ${DOCDIR}/examples/spice-example-sh
-
        set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
 
 .PHONY: distclean

diff --git a/bridgevlan b/bridgevlan
deleted file mode 100755 (executable)
index ea04357..0000000
--- a/bridgevlan
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-if [ ! -x /sbin/bridge ] && [ ! -f /sys/class/net/$IFACE/bridge/vlan_filtering ]
-then
-  exit 0
-fi
-
-# Enabling vlan filtering feature
-if [ "$MODE" = "start" ] ; then
-
-  if [ -n "$IF_BRIDGE_VLAN_AWARE" ]
-  then
-    echo 1 > /sys/class/net/$IFACE/bridge/vlan_filtering
-  else
-   exit 0
-  fi
-
-fi
-
-. /lib/bridge-utils/bridge-utils.sh
-
-case "$IF_BRIDGE_PORTS" in
-    "")
-       exit 0
-       ;;
-    none)
-       INTERFACES=""
-       ;;
-    *)
-       INTERFACES="$IF_BRIDGE_PORTS"
-       ;;
-esac
-
-all_interfaces= &&
-unset all_interfaces &&
-bridge_parse_ports $INTERFACES | while read i
-do
-  for port in $i
-  do
-    if [ "$MODE" = "start" ] && [ -d /sys/class/net/$IFACE/brif/$port ]; then
-        # we allow vlan to pass through attached interface
-        if [ -n "$IF_BRIDGE_VIDS" ]
-       then
-            bridge vlan add dev $port vid $IF_BRIDGE_VIDS
-       else
-            bridge vlan add dev $port vid 2-4094
-        fi
-    fi
-  done
-done
-

diff --git a/bridgevlanport b/bridgevlanport
deleted file mode 100755 (executable)
index 921890f..0000000
--- a/bridgevlanport
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-if [ ! -x /sbin/bridge ]
-then
-  exit 0
-fi
-
-if [ "$MODE" = "start" ] ; then
-  case "$IFACE" in
-    *.[0-9]*)
-      VLANID="${IFACE##*.}"
-      IF_VLAN_RAW_DEVICE="${IFACE%.*}"
-    ;;
-  esac
-
-  if [ -n "$IF_VLAN_RAW_DEVICE" ]; then
-      if [ -e "/sys/class/net/$IF_VLAN_RAW_DEVICE/bridge/vlan_filtering" ]; then 
-          bridge vlan add dev $IF_VLAN_RAW_DEVICE vid $VLANID self
-      fi
-  fi
-fi
-
-

diff --git a/mtu b/mtu
deleted file mode 100755 (executable)
index 1369f42..0000000
--- a/mtu
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-case "$IFACE" in
-  # Ignore any alias (#272891) which uses <interface>:<alabel>
-  *:*)
-    exit 0
-  ;;
-esac
-
-if [ "$METHOD" != manual ]; then
-        exit 0
-fi
-
-if [ -n "$IF_MTU" ]; then
-    ip link set $IFACE mtu $IF_MTU
-fi

diff --git a/network-hooks/Makefile b/network-hooks/Makefile
new file mode 100644 (file)
index 0000000..b6a06dd
--- /dev/null
+++ b/network-hooks/Makefile
@@ -0,0 +1,13 @@
+include ../defines.mk
+
+all:
+
+.PHONY: install
+install: mtu bridgevlan bridgevlanport vlan vlan-down
+       install -D -m 0755 mtu ${DESTDIR}/etc/network/if-up.d/mtu
+       install -D -m 0755 bridgevlan ${DESTDIR}/etc/network/if-up.d/bridgevlan
+       install -D -m 0755 bridgevlanport ${DESTDIR}/etc/network/if-up.d/bridgevlanport
+       install -D -m 0755 vlan ${DESTDIR}/etc/network/if-pre-up.d/vlan
+       install -D -m 0755 vlan-down ${DESTDIR}/etc/network/if-post-down.d/vlan
+
+clean:

diff --git a/network-hooks/bridgevlan b/network-hooks/bridgevlan
new file mode 100755 (executable)
index 0000000..ea04357
--- /dev/null
+++ b/network-hooks/bridgevlan
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+if [ ! -x /sbin/bridge ] && [ ! -f /sys/class/net/$IFACE/bridge/vlan_filtering ]
+then
+  exit 0
+fi
+
+# Enabling vlan filtering feature
+if [ "$MODE" = "start" ] ; then
+
+  if [ -n "$IF_BRIDGE_VLAN_AWARE" ]
+  then
+    echo 1 > /sys/class/net/$IFACE/bridge/vlan_filtering
+  else
+   exit 0
+  fi
+
+fi
+
+. /lib/bridge-utils/bridge-utils.sh
+
+case "$IF_BRIDGE_PORTS" in
+    "")
+       exit 0
+       ;;
+    none)
+       INTERFACES=""
+       ;;
+    *)
+       INTERFACES="$IF_BRIDGE_PORTS"
+       ;;
+esac
+
+all_interfaces= &&
+unset all_interfaces &&
+bridge_parse_ports $INTERFACES | while read i
+do
+  for port in $i
+  do
+    if [ "$MODE" = "start" ] && [ -d /sys/class/net/$IFACE/brif/$port ]; then
+        # we allow vlan to pass through attached interface
+        if [ -n "$IF_BRIDGE_VIDS" ]
+       then
+            bridge vlan add dev $port vid $IF_BRIDGE_VIDS
+       else
+            bridge vlan add dev $port vid 2-4094
+        fi
+    fi
+  done
+done
+

diff --git a/network-hooks/bridgevlanport b/network-hooks/bridgevlanport
new file mode 100755 (executable)
index 0000000..921890f
--- /dev/null
+++ b/network-hooks/bridgevlanport
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+if [ ! -x /sbin/bridge ]
+then
+  exit 0
+fi
+
+if [ "$MODE" = "start" ] ; then
+  case "$IFACE" in
+    *.[0-9]*)
+      VLANID="${IFACE##*.}"
+      IF_VLAN_RAW_DEVICE="${IFACE%.*}"
+    ;;
+  esac
+
+  if [ -n "$IF_VLAN_RAW_DEVICE" ]; then
+      if [ -e "/sys/class/net/$IF_VLAN_RAW_DEVICE/bridge/vlan_filtering" ]; then 
+          bridge vlan add dev $IF_VLAN_RAW_DEVICE vid $VLANID self
+      fi
+  fi
+fi
+
+

diff --git a/network-hooks/mtu b/network-hooks/mtu
new file mode 100755 (executable)
index 0000000..1369f42
--- /dev/null
+++ b/network-hooks/mtu
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+case "$IFACE" in
+  # Ignore any alias (#272891) which uses <interface>:<alabel>
+  *:*)
+    exit 0
+  ;;
+esac
+
+if [ "$METHOD" != manual ]; then
+        exit 0
+fi
+
+if [ -n "$IF_MTU" ]; then
+    ip link set $IFACE mtu $IF_MTU
+fi

diff --git a/network-hooks/vlan b/network-hooks/vlan
new file mode 100755 (executable)
index 0000000..abe646a
--- /dev/null
+++ b/network-hooks/vlan
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# Most of this stuff is to enable vlans, it's really only needed by bridge_utils
+case "$IFACE" in
+  # Ignore any alias (#272891) which uses <interface>:<alabel>
+  *:*)
+    exit 0
+  ;;
+  vlan[0-9]*)
+    VLANID=`echo $IFACE|sed "s/vlan*//"`
+  ;;
+  *.[0-9]*)
+    # Silently ignore interfaces which ifupdown handles on its own
+    # If IF_BRIDGE_PORTS is set, probably we're called by bridge-utils
+    [ -z "$IF_VLAN_RAW_DEVICE" -a -z "$IF_BRIDGE_PORTS" ] && exit 0
+    VLANID=`echo $IFACE|sed "s/[a-zA-Z0-9]*\.//g"`
+    IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\([a-zA-Z0-9]*\)\..*/\1/"`
+  ;;
+
+  *)
+    exit 0
+  ;;
+esac
+
+if [ -n "$IF_VLAN_RAW_DEVICE" ]; then
+    if ! ip link show dev "$IF_VLAN_RAW_DEVICE" > /dev/null; then
+        echo "$IF_VLAN_RAW_DEVICE does not exist, unable to create $IFACE"
+        exit 1
+    fi
+    if [ ! -e "/sys/class/net/$IFACE" ]; then
+        ip link set up dev $IF_VLAN_RAW_DEVICE
+       ip link add link $IF_VLAN_RAW_DEVICE name $IFACE type vlan id $VLANID 
+    fi
+
+fi
+
+# This is not vlan specific, and should actually go somewhere else.
+if [ -n "$IF_HW_MAC_ADDRESS" ]; then
+    ip link set $IFACE address $IF_HW_MAC_ADDRESS
+fi

diff --git a/network-hooks/vlan-down b/network-hooks/vlan-down
new file mode 100644 (file)
index 0000000..bb2d31f
--- /dev/null
+++ b/network-hooks/vlan-down
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# If IFACE is an automagic vlan interface (without the vlan-raw-device
+# parameter) then let's try to discover the magic here..  Another way would be
+# to just probe for the right device name in /proc/net/vlan
+
+case "$IFACE" in
+  # Ignore any alias (#272891)
+  *:*)
+    exit 0
+  ;;
+  *.[0-9]*)
+    # Silently ignore interfaces which ifupdown handles on its own
+    # If IF_BRIDGE_PORTS is set, probably we're called by bridge-utils
+    [ -z "$IF_VLAN_RAW_DEVICE" -a -z "$IF_BRIDGE_PORTS" ] && exit 0
+    IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\([A-Za-z0-9]*\)\..*/\1/"`
+  ;;
+  # Test for vlan raw device (#196890, #292648)
+  *)
+    [ -z "$IF_VLAN_RAW_DEVICE" ] && exit 0
+  ;;
+esac
+
+if [ -e "/sys/class/net/$IFACE" ]; then
+    ip link delete $IFACE
+fi

diff --git a/vlan b/vlan
deleted file mode 100755 (executable)
index abe646a..0000000
--- a/vlan
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# Most of this stuff is to enable vlans, it's really only needed by bridge_utils
-case "$IFACE" in
-  # Ignore any alias (#272891) which uses <interface>:<alabel>
-  *:*)
-    exit 0
-  ;;
-  vlan[0-9]*)
-    VLANID=`echo $IFACE|sed "s/vlan*//"`
-  ;;
-  *.[0-9]*)
-    # Silently ignore interfaces which ifupdown handles on its own
-    # If IF_BRIDGE_PORTS is set, probably we're called by bridge-utils
-    [ -z "$IF_VLAN_RAW_DEVICE" -a -z "$IF_BRIDGE_PORTS" ] && exit 0
-    VLANID=`echo $IFACE|sed "s/[a-zA-Z0-9]*\.//g"`
-    IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\([a-zA-Z0-9]*\)\..*/\1/"`
-  ;;
-
-  *)
-    exit 0
-  ;;
-esac
-
-if [ -n "$IF_VLAN_RAW_DEVICE" ]; then
-    if ! ip link show dev "$IF_VLAN_RAW_DEVICE" > /dev/null; then
-        echo "$IF_VLAN_RAW_DEVICE does not exist, unable to create $IFACE"
-        exit 1
-    fi
-    if [ ! -e "/sys/class/net/$IFACE" ]; then
-        ip link set up dev $IF_VLAN_RAW_DEVICE
-       ip link add link $IF_VLAN_RAW_DEVICE name $IFACE type vlan id $VLANID 
-    fi
-
-fi
-
-# This is not vlan specific, and should actually go somewhere else.
-if [ -n "$IF_HW_MAC_ADDRESS" ]; then
-    ip link set $IFACE address $IF_HW_MAC_ADDRESS
-fi

diff --git a/vlan-down b/vlan-down
deleted file mode 100644 (file)
index bb2d31f..0000000
--- a/vlan-down
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# If IFACE is an automagic vlan interface (without the vlan-raw-device
-# parameter) then let's try to discover the magic here..  Another way would be
-# to just probe for the right device name in /proc/net/vlan
-
-case "$IFACE" in
-  # Ignore any alias (#272891)
-  *:*)
-    exit 0
-  ;;
-  *.[0-9]*)
-    # Silently ignore interfaces which ifupdown handles on its own
-    # If IF_BRIDGE_PORTS is set, probably we're called by bridge-utils
-    [ -z "$IF_VLAN_RAW_DEVICE" -a -z "$IF_BRIDGE_PORTS" ] && exit 0
-    IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\([A-Za-z0-9]*\)\..*/\1/"`
-  ;;
-  # Test for vlan raw device (#196890, #292648)
-  *)
-    [ -z "$IF_VLAN_RAW_DEVICE" ] && exit 0
-  ;;
-esac
-
-if [ -e "/sys/class/net/$IFACE" ]; then
-    ip link delete $IFACE
-fi