rpm/dhcp
SHA256
1
0
Fork 0
forked from pool/dhcp
Code Pull Requests Activity

- Fixed server lease file path in contrib/listlease and leasestate

Browse Source 
changed to extract contrib and examples using setup macro.

OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=37
This commit is contained in:
Marius Tomaschewski 2010-09-29 10:28:25 +00:00 committed by Git OBS Bridge
parent 8fb0bb9168
commit c98d1cc5ee
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib-lease-path.diff Normal file
View File

@ -0,0 +1,22 @@
--- contrib/leasestate
+++ contrib/leasestate 2010/09/29 10:07:09
@@ -16,7 +16,7 @@ my %Update;
my $level = 1;
my $IP = '';
my ($ip, $bs, $nbs, $join);
-open(FILE, "/var/lib/dhcp/dhcpd.leases");
+open(FILE, "/var/lib/dhcp/db/dhcpd.leases");
while(my $line = <FILE>) {
next if ($line =~ /^\#/);
if ($level == 1) {
--- contrib/listlease
+++ contrib/listlease 2010/09/29 10:08:10
@@ -14,7 +14,7 @@ use strict;
my $LastLease = '';
my $savelease = 0;
my $prlease = 0;
-my $LFILE = "/var/lib/dhcp/dhcpd.leases";
+my $LFILE = "/var/lib/dhcp/db/dhcpd.leases";
$LFILE = $ARGV[1] if ($ARGV[1] ne '');
open(FILE, $LFILE);

6
dhcp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 29 10:26:37 UTC 2010 - mt@suse.de
- Fixed server lease file path in contrib/listlease and leasestate
changed to extract contrib and examples using setup macro.
-------------------------------------------------------------------
Wed Aug 4 12:52:03 UTC 2010 - mt@suse.de

8
dhcp.spec
View File

@ -73,6 +73,7 @@ Patch11: dhcp-4.1.1-paranoia.diff
Patch12: dhcp-4.1.1-man-includes.diff
Patch13: dhcp-4.1.1-tmpfile.diff
Patch14: dhcp-4.1.1-in6_pktinfo-prototype.diff
Patch15: contrib-lease-path.diff
Patch20: dhcp-4.1.1-dhclient-exec-filedes.diff
Patch21: dhcp-4.1.1-dhclient-send-hostname-rml.diff
## patch lives here: http://www.suse.de/~mt/git/dhcp-ldap.git/
@ -191,13 +192,14 @@ Authors:
%prep
%setup -q -n %{name}-%{isc_version}
%setup -q -n %{name}-%{isc_version} -a 44 -a 45
##
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p0
%patch20 -p1
%patch21 -p1
%if 0%{?with_ldap:%with_ldap}
@ -339,9 +341,7 @@ install -m0644 $RPM_SOURCE_DIR/dhcp.LIESMICH LIESMICH.SuSE
install -m0644 $RPM_SOURCE_DIR/dhcp.README README.SuSE
install -m0644 $RPM_SOURCE_DIR/dhcp.README.upgrade README.upgrade
install -m0644 $RPM_SOURCE_DIR/DDNS-howto.txt .
tar xzf $RPM_SOURCE_DIR/contrib.tar.gz
mv doc/examples .
tar xzf $RPM_SOURCE_DIR/examples.tar.gz
cp doc/examples/* ./examples/
rm -f doc/{References.xml,Makefile*}
rm -f contrib/dhcp.spec
%if ! 0%{?with_ldap:%with_ldap}