From 881196cde20711e82957d8214855fe00b62f8da8 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sat, 10 Feb 2018 11:15:39 +0900 Subject: [PATCH] Debian package update for docker issue (#16) * Previously, pgwtun is setup with ifupdown package. * Now, we'll use the systemd-networkd. --- debian/control | 3 +- debian/nextepc-pgw.install | 2 +- debian/nextepc-pgw.postinst | 47 ------------------------------ debian/nextepc-pgw.postrm | 45 ---------------------------- support/docker/README.md | 1 + support/network/99-nextepc.netdev | 3 ++ support/network/99-nextepc.network | 6 ++++ support/network/nextepc | 9 ------ 8 files changed, 12 insertions(+), 104 deletions(-) delete mode 100644 debian/nextepc-pgw.postinst delete mode 100644 debian/nextepc-pgw.postrm create mode 100644 support/network/99-nextepc.netdev create mode 100644 support/network/99-nextepc.network delete mode 100644 support/network/nextepc diff --git a/debian/control b/debian/control index 429c022d2..4d4e91735 100644 --- a/debian/control +++ b/debian/control @@ -68,8 +68,7 @@ Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - nextepc-core (= ${binary:Version}), - ifupdown + nextepc-core (= ${binary:Version}) Description: Open Source based 3GPP EPC PGW (Packet Data Network Gateway) NextEPC is a C-language Open Source implementation of the 3GPP Evolved Packet Core, i.e. the core network of an LTE network. diff --git a/debian/nextepc-pgw.install b/debian/nextepc-pgw.install index 47f54f677..33c9ecb2c 100644 --- a/debian/nextepc-pgw.install +++ b/debian/nextepc-pgw.install @@ -3,5 +3,5 @@ etc/nextepc/freeDiameter/pgw.conf etc/nextepc/freeDiameter/pgw.cert.pem etc/nextepc/freeDiameter/pgw.key.pem etc/nextepc/pgw.conf -support/network/nextepc etc/network/interfaces.d +support/network/99-nextepc.* etc/systemd/network support/systemd/nextepc-pgwd.service lib/systemd/system diff --git a/debian/nextepc-pgw.postinst b/debian/nextepc-pgw.postinst deleted file mode 100644 index 8fc5b1c8c..000000000 --- a/debian/nextepc-pgw.postinst +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# postinst script for nextepc -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - if ! grep "source-directory" /etc/network/interfaces | grep "/etc/network/interfaces.d" > /dev/null; then - echo "source-directory /etc/network/interfaces.d" >> /etc/network/interfaces - fi - if ! grep "pgwtun" /proc/net/dev > /dev/null; then - ifup pgwtun - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/nextepc-pgw.postrm b/debian/nextepc-pgw.postrm deleted file mode 100644 index a2a34e92b..000000000 --- a/debian/nextepc-pgw.postrm +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# postrm script for nextepc-core -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge) - if grep "pgwtun" /proc/net/dev > /dev/null; then - ip tuntap del name pgwtun mode tun - fi - ;; - - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/support/docker/README.md b/support/docker/README.md index a15d881d9..5f1095de2 100644 --- a/support/docker/README.md +++ b/support/docker/README.md @@ -40,6 +40,7 @@ export DEBEMAIL='acetcom@gmail.com' Docker Tun Configuration =========================================== +* sudo apt-get install udev * sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 * sudo chmod 666 /dev/net/tun diff --git a/support/network/99-nextepc.netdev b/support/network/99-nextepc.netdev new file mode 100644 index 000000000..0ccbc171b --- /dev/null +++ b/support/network/99-nextepc.netdev @@ -0,0 +1,3 @@ +[NetDev] +Name=pgwtun +Kind=tun diff --git a/support/network/99-nextepc.network b/support/network/99-nextepc.network new file mode 100644 index 000000000..90cf2f55f --- /dev/null +++ b/support/network/99-nextepc.network @@ -0,0 +1,6 @@ +[Match] +Name=pgwtun + +[Network] +Address=45.45.0.1/16 +Address=cafe::1/64 diff --git a/support/network/nextepc b/support/network/nextepc deleted file mode 100644 index a06cea86a..000000000 --- a/support/network/nextepc +++ /dev/null @@ -1,9 +0,0 @@ -auto pgwtun -iface pgwtun inet static - address 45.45.0.1 - netmask 255.255.0.0 - pre-up ip tuntap add name pgwtun mode tun - post-down ip tuntap del name pgwtun mode tun -iface pgwtun inet6 static - address cafe::1 - netmask 64