From 6a119d8d077c62db5a521ce1742ad3250aa4e886 Mon Sep 17 00:00:00 2001
From: Olav Vitters <olav@vitters.nl>
Date: Fri, 31 Jul 2020 13:34:44 +0200
Subject: vpn: use same directory layout as Makefile used to generate, part 1

---
 mageia/network-scripts/ifdown.d/vpn          | 8 ++++++++
 mageia/network-scripts/ifup.d/vpn/vpn-ifdown | 8 --------
 mageia/network-scripts/ifup.d/vpn/vpn-ifup   | 8 --------
 mageia/network-scripts/ifup.d/vpn2           | 8 ++++++++
 4 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100755 mageia/network-scripts/ifdown.d/vpn
 delete mode 100755 mageia/network-scripts/ifup.d/vpn/vpn-ifdown
 delete mode 100755 mageia/network-scripts/ifup.d/vpn/vpn-ifup
 create mode 100755 mageia/network-scripts/ifup.d/vpn2

diff --git a/mageia/network-scripts/ifdown.d/vpn b/mageia/network-scripts/ifdown.d/vpn
new file mode 100755
index 00000000..466e54fd
--- /dev/null
+++ b/mageia/network-scripts/ifdown.d/vpn
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -r /etc/sysconfig/network-scripts/ifcfg-$1 ]; then
+    . /etc/sysconfig/network-scripts/ifcfg-$1
+    if [ -n "$VPN_TYPE" ] && [ -n "$VPN_NAME" ]; then
+        /usr/sbin/vpn-stop $VPN_TYPE $VPN_NAME
+    fi
+fi
diff --git a/mageia/network-scripts/ifup.d/vpn/vpn-ifdown b/mageia/network-scripts/ifup.d/vpn/vpn-ifdown
deleted file mode 100755
index 466e54fd..00000000
--- a/mageia/network-scripts/ifup.d/vpn/vpn-ifdown
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ -r /etc/sysconfig/network-scripts/ifcfg-$1 ]; then
-    . /etc/sysconfig/network-scripts/ifcfg-$1
-    if [ -n "$VPN_TYPE" ] && [ -n "$VPN_NAME" ]; then
-        /usr/sbin/vpn-stop $VPN_TYPE $VPN_NAME
-    fi
-fi
diff --git a/mageia/network-scripts/ifup.d/vpn/vpn-ifup b/mageia/network-scripts/ifup.d/vpn/vpn-ifup
deleted file mode 100755
index 4425d154..00000000
--- a/mageia/network-scripts/ifup.d/vpn/vpn-ifup
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ -r /etc/sysconfig/network-scripts/ifcfg-$1 ]; then
-    . /etc/sysconfig/network-scripts/ifcfg-$1
-    if [ -n "$VPN_TYPE" ] && [ -n "$VPN_NAME" ]; then
-        /usr/sbin/vpn-start $VPN_TYPE "$VPN_NAME"
-    fi
-fi
diff --git a/mageia/network-scripts/ifup.d/vpn2 b/mageia/network-scripts/ifup.d/vpn2
new file mode 100755
index 00000000..4425d154
--- /dev/null
+++ b/mageia/network-scripts/ifup.d/vpn2
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -r /etc/sysconfig/network-scripts/ifcfg-$1 ]; then
+    . /etc/sysconfig/network-scripts/ifcfg-$1
+    if [ -n "$VPN_TYPE" ] && [ -n "$VPN_NAME" ]; then
+        /usr/sbin/vpn-start $VPN_TYPE "$VPN_NAME"
+    fi
+fi
-- 
cgit v1.2.1