jlarson/ifupdown
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- tweaked patch to set OS version in vars that normally depend on dpkg

Browse Source 
- tweaked inet.defn to remove verbosity from dhclient execution
This commit is contained in:
Jay Larson
2016-11-08 13:14:49 -06:00
parent fe7106dccd
commit 8f8cd148f0
3 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -13,7 +13,7 @@ ARCH = x86_64
URL = https://packages.qa.debian.org/i/ifupdown.html
DESC = ifupdown is a set of utilities to assist with basic interface \
manipulation.
SNAPVER = sr0
SNAPVER = sr1
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')

14
SRC/patches/01_fix-host-os.patch
View File

@@ -1,6 +1,18 @@
diff -Naur a/defn2c.pl b/defn2c.pl
--- a/defn2c.pl 2014-03-23 12:27:30.000000000 -0500
+++ b/defn2c.pl 2016-11-06 15:21:35.200000000 -0600
+++ b/defn2c.pl 2016-11-08 13:02:33.568000000 -0600
@@ -2,7 +2,7 @@
use strict;
-my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
+my $DEB_HOST_ARCH_OS = 'linux';
$DEB_HOST_ARCH_OS =~ s/\n//;
diff -Naur a/defn2man.pl b/defn2man.pl
--- a/defn2man.pl 2013-07-02 04:44:56.000000000 -0500
+++ b/defn2man.pl 2016-11-08 13:02:14.736000000 -0600
@@ -2,7 +2,7 @@
use strict;

57
SRC/patches/04_quiet-dhclient.patch Normal file
View File

@@ -0,0 +1,57 @@
diff -Naur a/inet.defn b/inet.defn
--- a/inet.defn 2014-11-29 07:24:14.000000000 -0600
+++ b/inet.defn 2016-11-08 12:57:33.260000000 -0600
@@ -81,7 +81,7 @@
up
[[ip link set dev %iface% address %hwaddress%]]
- dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+ dhclient -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
[[-e IF_METRIC=%metric%]] \
if (execable("/sbin/dhclient"))
dhclient3 -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
@@ -96,7 +96,7 @@
elsif (execable("/sbin/dhcpcd"))
down
- dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+ dhclient -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
if (execable("/sbin/dhclient"))
dhclient3 -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
elsif (execable("/sbin/dhclient3"))
@@ -269,7 +269,7 @@
up
[[ifconfig %iface% link %hwaddress%]]
- dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+ dhclient -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
[[-e IF_METRIC=%metric%]] \
if (execable("/sbin/dhclient"))
dhclient3 -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
@@ -283,7 +283,7 @@
elsif (execable("/sbin/dhcpcd"))
down
- dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+ dhclient -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
if (execable("/sbin/dhclient"))
dhclient3 -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
elsif (execable("/sbin/dhclient3"))
@@ -425,7 +425,7 @@
up
[[Warning: Option hwaddress: %hwaddress% not yet supported]]
- dhclient -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases %iface% \
+ dhclient -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases %iface% \
if (execable("/sbin/dhclient"))
udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \
[[-c %client%]] \
@@ -435,7 +435,7 @@
elsif (execable("/sbin/dhcpcd"))
down
- dhclient -v -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases %iface% \
+ dhclient -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases %iface% \
if (execable("/sbin/dhclient"))
kill -USR2 $(cat /run/udhcpc.%iface///.%.pid); kill -TERM $(cat /run/udhcpc.%iface///.%.pid) \
elsif (execable("/sbin/udhcpc"))