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

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

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

Revision 1.1 - (hide annotations) (download)
Mon Oct 11 17:19:05 2010 UTC (14 years, 1 month ago) by vip-ire
Branch: MAIN
CVS Tags: e-smith-base-5_2_0-34_el5_sme, e-smith-base-5_2_0-51_el5_sme, e-smith-base-5_2_0-36_el5_sme, e-smith-base-5_2_0-38_el5_sme, e-smith-base-5_2_0-47_el5_sme, e-smith-base-5_2_0-50_el5_sme, e-smith-base-5_2_0-49_el5_sme, e-smith-base-5_2_0-48_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-45_el5_sme, e-smith-base-5_2_0-46_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-35_el5_sme 
* Mon Oct 11 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-34.sme
- Relocate dhclient conf file [SME: 5833]
1 vip-ire 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/createlinks mezzanine_patched_e-smith-base-5.2.0/createlinks
2     --- e-smith-base-5.2.0/createlinks 2010-10-11 19:15:47.000000000 +0200
3     +++ mezzanine_patched_e-smith-base-5.2.0/createlinks 2010-10-11 19:10:06.000000000 +0200
4     @@ -15,8 +15,8 @@
5     }
6    
7     foreach (qw(
8     - /var/lib/dhcp/dhclient-eth0.conf
9     - /var/lib/dhcp/dhclient-eth1.conf
10     + /var/lib/dhclient/dhclient-eth0.conf
11     + /var/lib/dhclient/dhclient-eth1.conf
12     /var/service/wan/pppoe.pppd.conf
13     /var/service/wan/run.pppoe.conf
14     /etc/ppp/ip-down.local
15     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/00interface mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/00interface
16     --- e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/00interface 1970-01-01 01:00:00.000000000 +0100
17     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/00interface 2006-03-14 17:20:43.000000000 +0100
18     @@ -0,0 +1,4 @@
19     +{
20     + die "Need to pass THIS_DEVICE in MORE_DATA\n" unless (defined $THIS_DEVICE);
21     + $OUT = "interface \"$THIS_DEVICE\" \{";
22     +}
23     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/50hostname mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/50hostname
24     --- e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/50hostname 1970-01-01 01:00:00.000000000 +0100
25     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/50hostname 2007-01-27 02:56:31.000000000 +0100
26     @@ -0,0 +1,7 @@
27     +{
28     + return unless defined $ExternalInterface;
29     + return unless $ExternalInterface{Name} eq $THIS_DEVICE;
30     + return unless $ExternalInterface{Configuration} eq "DHCPHostname";
31     + $OUT .= " send host-name \"$DialupUserAccount\";\n";
32     + $OUT .= " send dhcp-client-identifier \"$DialupUserAccount\";";
33     +}
34     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/template-end mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/template-end
35     --- e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/template-end 1970-01-01 01:00:00.000000000 +0100
36     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhclient/dhclient.conf/template-end 2006-03-14 17:20:43.000000000 +0100
37     @@ -0,0 +1,3 @@
38     +{
39     + $OUT = '\}';
40     +}
41     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/00interface mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/00interface
42     --- e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/00interface 2006-03-14 17:20:43.000000000 +0100
43     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/00interface 1970-01-01 01:00:00.000000000 +0100
44     @@ -1,4 +0,0 @@
45     -{
46     - die "Need to pass THIS_DEVICE in MORE_DATA\n" unless (defined $THIS_DEVICE);
47     - $OUT = "interface \"$THIS_DEVICE\" \{";
48     -}
49     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/50hostname mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/50hostname
50     --- e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/50hostname 2007-01-27 02:56:31.000000000 +0100
51     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/50hostname 1970-01-01 01:00:00.000000000 +0100
52     @@ -1,7 +0,0 @@
53     -{
54     - return unless defined $ExternalInterface;
55     - return unless $ExternalInterface{Name} eq $THIS_DEVICE;
56     - return unless $ExternalInterface{Configuration} eq "DHCPHostname";
57     - $OUT .= " send host-name \"$DialupUserAccount\";\n";
58     - $OUT .= " send dhcp-client-identifier \"$DialupUserAccount\";";
59     -}
60     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/template-end mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/template-end
61     --- e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/template-end 2006-03-14 17:20:43.000000000 +0100
62     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates/var/lib/dhcp/dhclient.conf/template-end 1970-01-01 01:00:00.000000000 +0100
63     @@ -1,3 +0,0 @@
64     -{
65     - $OUT = '\}';
66     -}
67     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhclient/dhclient-eth0.conf mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhclient/dhclient-eth0.conf
68     --- e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhclient/dhclient-eth0.conf 1970-01-01 01:00:00.000000000 +0100
69     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhclient/dhclient-eth0.conf 2006-03-14 17:20:43.000000000 +0100
70     @@ -0,0 +1,3 @@
71     +TEMPLATE_PATH="/var/lib/dhcp/dhclient.conf"
72     +OUTPUT_FILENAME="/var/lib/dhcp/dhclient-eth0.conf"
73     +MORE_DATA={ THIS_DEVICE => "eth0" }
74     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhclient/dhclient-eth1.conf mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhclient/dhclient-eth1.conf
75     --- e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhclient/dhclient-eth1.conf 1970-01-01 01:00:00.000000000 +0100
76     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhclient/dhclient-eth1.conf 2006-03-14 17:20:43.000000000 +0100
77     @@ -0,0 +1,3 @@
78     +TEMPLATE_PATH="/var/lib/dhcp/dhclient.conf"
79     +OUTPUT_FILENAME="/var/lib/dhcp/dhclient-eth1.conf"
80     +MORE_DATA={ THIS_DEVICE => "eth1" }
81     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhcp/dhclient-eth0.conf mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhcp/dhclient-eth0.conf
82     --- e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhcp/dhclient-eth0.conf 2006-03-14 17:20:43.000000000 +0100
83     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhcp/dhclient-eth0.conf 1970-01-01 01:00:00.000000000 +0100
84     @@ -1,3 +0,0 @@
85     -TEMPLATE_PATH="/var/lib/dhcp/dhclient.conf"
86     -OUTPUT_FILENAME="/var/lib/dhcp/dhclient-eth0.conf"
87     -MORE_DATA={ THIS_DEVICE => "eth0" }
88     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhcp/dhclient-eth1.conf mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhcp/dhclient-eth1.conf
89     --- e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhcp/dhclient-eth1.conf 2006-03-14 17:20:43.000000000 +0100
90     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/var/lib/dhcp/dhclient-eth1.conf 1970-01-01 01:00:00.000000000 +0100
91     @@ -1,3 +0,0 @@
92     -TEMPLATE_PATH="/var/lib/dhcp/dhclient.conf"
93     -OUTPUT_FILENAME="/var/lib/dhcp/dhclient-eth1.conf"
94     -MORE_DATA={ THIS_DEVICE => "eth1" }
95     diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/var/service/wan/run.dhclient mezzanine_patched_e-smith-base-5.2.0/root/var/service/wan/run.dhclient
96     --- e-smith-base-5.2.0/root/var/service/wan/run.dhclient 2007-01-27 02:56:31.000000000 +0100
97     +++ mezzanine_patched_e-smith-base-5.2.0/root/var/service/wan/run.dhclient 2010-10-11 19:15:26.000000000 +0200
98     @@ -21,8 +21,8 @@
99    
100     . ./dhclient.config
101    
102     -configfile=/var/lib/dhcp/dhclient-$interface.conf
103     -leasefile=/var/lib/dhcp/dhclient-$interface.leases
104     +configfile=/var/lib/dhclient/dhclient-$interface.conf
105     +leasefile=/var/lib/dhclient/dhclient-$interface.leases
106    
107     export PEERDNS=no
108     exec /sbin/dhclient -d \
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed