From 53077da0600bd91b79affab8ea18f5dd2ed61446 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Tue, 16 May 2017 14:36:54 -0500 Subject: [PATCH] The following changes were made: * Package now manages /etc/network.conf via usher * Added man page and ifup symlinks * Updated network init script --- Makefile | 2 +- SNAP/usher | 20 ++++++++++++++++++++ SRC/iftools/Makefile | 12 +++++++++++- SRC/iftools/network.conf | 12 ------------ SRC/iftools/network.init | 14 +++++++------- 5 files changed, 39 insertions(+), 21 deletions(-) create mode 100755 SNAP/usher diff --git a/Makefile b/Makefile index 54aa67f..697d8d1 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ URL = BRIEF = Scripts for starting and stopping network interfaces DESC = Scripts which use the iproute2 tools for automatically starting and \ stopping network devices during startup. -SNAPVER = 1 +SNAPVER = 2 ARCHIVE := SRCDIR := $(PWD)/SRC/iftools diff --git a/SNAP/usher b/SNAP/usher new file mode 100755 index 0000000..c3e5c44 --- /dev/null +++ b/SNAP/usher @@ -0,0 +1,20 @@ +#!/bin/bash + +set -e + +case $1 in + preinst) + exit 0 + ;; + postinst) + if [ ! -f ${TARGET}/etc/network.conf ]; then + cp ${TARGET}/usr/share/iftools/network.conf ${TARGET}/etc/network.conf + fi + ;; + prerm) + exit 0 + ;; + postrm) + exit 0 + ;; +esac diff --git a/SRC/iftools/Makefile b/SRC/iftools/Makefile index d79473d..430766f 100644 --- a/SRC/iftools/Makefile +++ b/SRC/iftools/Makefile @@ -3,8 +3,10 @@ dirs: install -d -v -m 755 $(DESTDIR)/etc/network.d install -d -v -m 755 $(DESTDIR)/usr/share/iftools install -d -v -m 755 $(DESTDIR)/usr/share/man/man{5,8} + install -d -v -m 755 $(DESTDIR)/sbin files: + install -v -m 755 ifup $(DESTDIR)/sbin/ifup install -v -m 755 network.init $(DESTDIR)/etc/init.d/network install -v -m 755 network.conf \ $(DESTDIR)/usr/share/iftools/network.conf @@ -12,4 +14,12 @@ files: $(DESTDIR)/usr/share/man/man5/network.conf.5 install -v -m 644 ifup.8 $(DESTDIR)/usr/share/man/man8/ifup.8 -install: dirs files +links: + ln -s ifup.8 $(DESTDIR)/usr/share/man/man8/ifdown.8 + ln -s ifup.8 $(DESTDIR)/usr/share/man/man8/ifquery.8 + ln -s ifup.8 $(DESTDIR)/usr/share/man/man8/ifreload.8 + ln -s ifup $(DESTDIR)/sbin/ifdown + ln -s ifup $(DESTDIR)/sbin/ifquery + ln -s ifup $(DESTDIR)/sbin/ifreload + +install: dirs files links diff --git a/SRC/iftools/network.conf b/SRC/iftools/network.conf index f588317..06c2e61 100644 --- a/SRC/iftools/network.conf +++ b/SRC/iftools/network.conf @@ -1,16 +1,4 @@ auto lo iface lo inet loopback -# An example of an interface automatically started on boot with dhcp -#auto eth0 -#iface eth0 inet dhcp - -# Another example with a static IP and static route -#iface eth1 inet static -# address 192.168.0.202 -# netmask 255.255.255.0 -# gateway 192.168.0.1 -# route 192.168.3.0 via 192.168.0.100 - -# This requests that all files in /etc/network.d be appended source-directory network.d diff --git a/SRC/iftools/network.init b/SRC/iftools/network.init index 3ca1f3a..85d1793 100755 --- a/SRC/iftools/network.init +++ b/SRC/iftools/network.init @@ -1,30 +1,30 @@ #!/bin/sh ### BEGIN INIT INFO # Provides: $network -# Required-Start: $local_fs swap localnet -# Required-Stop: $local_fs swap localnet +# Required-Start: $local_fs swap +# Required-Stop: $local_fs swap # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 -# Short-Description: Starts and configures network interfaces. -# Description: Starts and configures network interfaces. +# Short-Description: Start and configure network interfaces +# X-Required: true ### END INIT INFO . /lib/lsb/init-functions case "$1" in start) - log_info_msg "Bringing up network interfaces" + log_init_msg "Bringing up network interfaces" ifup -a && log_success_msg || log_failure_msg ;; stop) - log_info_msg "Bringing down network interfaces" + log_init_msg "Bringing down network interfaces" ifdown -a && log_success_msg || log_failure_msg ;; reload|restart) - log_info_msg "Restarting network interfaced" + log_init_msg "Restarting network interfaces" ifreload -a && log_success_msg || log_failure_msg ;;