/[smeserver]/rpms/e-smith-base/sme8/e-smith-base-5.2.0-relocate_dhcpd_leases_file.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme8/e-smith-base-5.2.0-relocate_dhcpd_leases_file.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Tue Oct 12 17:55:13 2010 UTC (14 years ago) by vip-ire
Branch: MAIN
CVS Tags: e-smith-base-5_2_0-67_el5_sme, e-smith-base-5_2_0-71_el5_sme, e-smith-base-5_2_0-52_el5_sme, e-smith-base-5_2_0-51_el5_sme, e-smith-base-5_2_0-53_el5_sme, e-smith-base-5_2_0-68_el5_sme, e-smith-base-5_2_0-77_el5_sme, e-smith-base-5_2_0-59_el5_sme, e-smith-base-5_2_0-56_el5_sme, e-smith-base-5_2_0-55_el5_sme, e-smith-base-5_2_0-78_el5_sme, e-smith-base-5_2_0-86_el5_sme, e-smith-base-5_2_0-76_el5_sme, e-smith-base-5_2_0-84_el5_sme, e-smith-base-5_2_0-38_el5_sme, e-smith-base-5_2_0-65_el5_sme, e-smith-base-5_2_0-88_el5_sme, e-smith-base-5_2_0-64_el5_sme, e-smith-base-5_2_0-47_el5_sme, e-smith-base-5_2_0-81_el5_sme, e-smith-base-5_2_0-82_el5_sme, e-smith-base-5_2_0-50_el5_sme, e-smith-base-5_2_0-57_el5_sme, e-smith-base-5_2_0-89_el5_sme, e-smith-base-5_2_0-49_el5_sme, e-smith-base-5_2_0-90_el5_sme, e-smith-base-5_2_0-48_el5_sme, e-smith-base-5_2_0-87_el5_sme, e-smith-base-5_2_0-80_el5_sme, e-smith-base-5_2_0-70_el5_sme, e-smith-base-5_2_0-66_el5_sme, e-smith-base-5_2_0-63_el5_sme, e-smith-base-5_2_0-41_el5_sme, e-smith-base-5_2_0-42_el5_sme, e-smith-base-5_2_0-61_el5_sme, e-smith-base-5_2_0-60_el5_sme, e-smith-base-5_2_0-58_el5_sme, e-smith-base-5_2_0-45_el5_sme, e-smith-base-5_2_0-46_el5_sme, e-smith-base-5_2_0-85_el5_sme, e-smith-base-5_2_0-69_el5_sme, e-smith-base-5_2_0-79_el5_sme, e-smith-base-5_2_0-72_el5_sme, e-smith-base-5_2_0-75_el5_sme, e-smith-base-5_2_0-73_el5_sme, e-smith-base-5_2_0-54_el5_sme, e-smith-base-5_2_0-37_el5_sme, e-smith-base-5_2_0-43_el5_sme, e-smith-base-5_2_0-44_el5_sme, e-smith-base-5_2_0-62_el5_sme, e-smith-base-5_2_0-74_el5_sme, e-smith-base-5_2_0-83_el5_sme
* Tue Oct 12 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-37.sme
- Relocate dhcpd leases file [SME: 6274]

1 vip-ire 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm mezzanine_patched_e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm
2     --- e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm 2010-10-12 19:29:24.000000000 +0200
3     +++ mezzanine_patched_e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm 2010-10-12 19:27:59.000000000 +0200
4     @@ -1690,7 +1690,7 @@
5     unless ((($start & $netmask) == $localnet) &&
6     (($end & $netmask) == $localnet))
7     {
8     - my $dhcpLeases = "/var/lib/dhcp/dhcpd.leases";
9     + my $dhcpLeases = "/var/lib/dhcpd/dhcpd.leases";
10     open (WR, ">$dhcpLeases")
11     or die gettext("Can't open output file"),
12     " $dhcpLeases", ": $!\n";
13     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/var/service/dhcpd/run mezzanine_patched_e-smith-base-5.2.0/root/var/service/dhcpd/run
14     --- e-smith-base-5.2.0/root/var/service/dhcpd/run 2005-11-21 05:28:11.000000000 +0100
15     +++ mezzanine_patched_e-smith-base-5.2.0/root/var/service/dhcpd/run 2010-10-12 19:26:51.000000000 +0200
16     @@ -23,12 +23,18 @@
17     interface=$(/sbin/e-smith/db configuration getprop InternalInterface Name)
18    
19     configfile=/etc/dhcpd.conf
20     -leasefile=/var/lib/dhcp/dhcpd.leases
21     +leasefile=/var/lib/dhcpd/dhcpd.leases
22    
23     /bin/touch $leasefile
24    
25     /sbin/e-smith/expand-template $configfile
26    
27     +# Relocate the leases file to its new location
28     +if [ -e /var/lib/dhcp/dhcpd.leases -a ! -z /var/lib/dhcpd/dhcpd.leases ]; then
29     + mv -f /var/lib/dhcp/dhcpd.leases \
30     + /var/lib/dhcpd/dhcpd.leases
31     +fi
32     +
33     exec /usr/sbin/dhcpd -d -f \
34     -cf $configfile \
35     -lf $leasefile \

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed