/[smeserver]/rpms/e-smith-base/sme9/e-smith-base-5.4.0-no_modprobe.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme9/e-smith-base-5.4.0-no_modprobe.patch

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

Revision 1.2 - (hide annotations) (download)
Mon Mar 24 03:05:36 2014 UTC (10 years, 7 months ago) by wellsi
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED 
* Sun Mar 23 2014 Ian Wells <esmith@wellsi.com> 5.6.0-1.sme
- Roll new stream to remove obsolete images [SME: 7962]
1 slords 1.1 diff -ruN e-smith-base-5.4.0.old/createlinks e-smith-base-5.4.0/createlinks
2     --- e-smith-base-5.4.0.old/createlinks 2013-03-16 09:26:44.627415245 -0600
3     +++ e-smith-base-5.4.0/createlinks 2013-03-16 09:27:45.036615400 -0600
4     @@ -70,15 +70,6 @@
5     templates2events($_, qw(console-save bootstrap-console-save));
6     }
7    
8     -# conf-modules
9     -
10     -templates2events("/etc/modprobe.conf", qw(
11     - console-save
12     - bootstrap-console-save
13     - post-install
14     - post-upgrade
15     - ));
16     -
17     # conf-other
18    
19     templates2events("/etc/crontab", qw(
20     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10blockdev-aliases e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10blockdev-aliases
21     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10blockdev-aliases 2005-11-20 21:28:07.000000000 -0700
22     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10blockdev-aliases 1969-12-31 17:00:00.000000000 -0700
23     @@ -1,13 +0,0 @@
24     -{
25     - foreach my $line
26     - (
27     - "alias block-major-3 off",
28     - )
29     - {
30     - unless (exists $lines{$line})
31     - {
32     - push @lines, $line;
33     - }
34     - }
35     - "";
36     -}
37     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10bonding e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10bonding
38     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10bonding 2006-03-14 09:20:43.000000000 -0700
39     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10bonding 1969-12-31 17:00:00.000000000 -0700
40     @@ -1,16 +0,0 @@
41     -{
42     - my $options = ${InternalInterface}{NICBondingOptions} || '';
43     - foreach my $line
44     - (
45     - "alias bond0 bonding",
46     - )
47     - {
48     - unless (exists $lines{$line})
49     - {
50     - push @lines, $line;
51     - }
52     - }
53     - @lines = grep !/^options bond0/, @lines;
54     - push @lines, "options bond0 $options" if($options);
55     - "";
56     -}
57     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10EthernetDrivers e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10EthernetDrivers
58     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10EthernetDrivers 2005-11-20 21:28:07.000000000 -0700
59     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10EthernetDrivers 1969-12-31 17:00:00.000000000 -0700
60     @@ -1,12 +0,0 @@
61     -{
62     - @lines = grep { !/^\s*alias\s*eth[01]/ } @lines;
63     - if (defined $EthernetDriver1 && $EthernetDriver1 ne "unknown")
64     - {
65     - push @lines, "alias eth0 ${EthernetDriver1}";
66     - }
67     - if (defined $EthernetDriver2 && $EthernetDriver2 ne "unknown")
68     - {
69     - push @lines, "alias eth1 ${EthernetDriver2}";
70     - }
71     - "";
72     -}
73     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10hisax e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10hisax
74     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10hisax 2005-11-20 21:28:07.000000000 -0700
75     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10hisax 1969-12-31 17:00:00.000000000 -0700
76     @@ -1,25 +0,0 @@
77     -{
78     - @lines = grep { !/^\s*options\s*hisax/ } @lines;
79     - my $hisax_alias = "alias char-major-43 hisax";
80     - unless (exists $lines{$hisax_alias})
81     - {
82     - push @lines, $hisax_alias;
83     - }
84     - my $hisax = $isdn{'HisaxOptions'} || "";
85     - my $type = $isdn{'Type'} || "";
86     - my $protocol = $isdn{'Protocol'} || "";
87     - if ($type)
88     - {
89     - $hisax .= " type=$type";
90     - }
91     - if ($protocol)
92     - {
93     - $hisax .= " protocol=$protocol";
94     - }
95     - if ($hisax)
96     - {
97     - push @lines, "options hisax $hisax";
98     - }
99     - "";
100     -}
101     -
102     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-aliases e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-aliases
103     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-aliases 2006-02-16 20:41:51.000000000 -0700
104     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-aliases 1969-12-31 17:00:00.000000000 -0700
105     @@ -1,26 +0,0 @@
106     -{
107     - foreach my $line
108     - (
109     - # alias IPX off
110     - "alias net-pf-4 off",
111     - # alias IPV6 off
112     - "alias net-pf-10 off",
113     - "alias net-pf-47 ip_gre",
114     - )
115     - {
116     - unless (exists $lines{$line})
117     - {
118     - push @lines, $line;
119     - }
120     - }
121     - foreach my $line
122     - (
123     - "alias net-pf-15 ipsec",
124     - "alias net-pf-50 ipsec",
125     - )
126     - {
127     - @lines = grep { !/^$line$/ } @lines;
128     - }
129     -
130     - "";
131     -}
132     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-pppoe e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-pppoe
133     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-pppoe 2005-11-20 21:28:07.000000000 -0700
134     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-pppoe 1969-12-31 17:00:00.000000000 -0700
135     @@ -1,9 +0,0 @@
136     -{
137     - # Ensure that pppoe module can be autoloaded
138     - my $line = "alias net-pf-24 pppoe";
139     - unless (exists $lines{$line})
140     - {
141     - push @lines, $line;
142     - }
143     - "";
144     -}
145     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10parport-aliases e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10parport-aliases
146     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10parport-aliases 2005-11-20 21:28:07.000000000 -0700
147     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10parport-aliases 1969-12-31 17:00:00.000000000 -0700
148     @@ -1,13 +0,0 @@
149     -{
150     - foreach my $line
151     - (
152     - "alias parport_lowlevel parport_pc"
153     - )
154     - {
155     - unless (exists $lines{$line})
156     - {
157     - push @lines, $line;
158     - }
159     - }
160     - "";
161     -}
162     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10ppp e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10ppp
163     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10ppp 2005-11-20 21:28:07.000000000 -0700
164     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10ppp 1969-12-31 17:00:00.000000000 -0700
165     @@ -1,21 +0,0 @@
166     -{
167     - # Obsolete the aliasing of ppp module name if we find it
168     - # We no longer need to use the alias, we use a module
169     - # search path instead
170     - @lines = grep { !/^alias ppp ppp-4mppe$/ } @lines;
171     - foreach my $line
172     - (
173     - "alias ppp ppp_generic",
174     - "alias char-major-108 ppp",
175     - "alias /dev/ppp ppp",
176     - "alias tty-ldisc-3 ppp_async",
177     - "alias tty-ldisc-14 ppp_synctty",
178     - )
179     - {
180     - unless (exists $lines{$line})
181     - {
182     - push @lines, $line;
183     - }
184     - }
185     - "";
186     -}
187     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10ppp-compress-aliases e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10ppp-compress-aliases
188     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10ppp-compress-aliases 2005-11-20 21:28:07.000000000 -0700
189     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10ppp-compress-aliases 1969-12-31 17:00:00.000000000 -0700
190     @@ -1,16 +0,0 @@
191     -{
192     - foreach my $line
193     - (
194     - "alias ppp-compress-18 ppp_mppe",
195     - "alias ppp-compress-21 bsd_comp",
196     - "alias ppp-compress-24 ppp_deflate",
197     - "alias ppp-compress-26 ppp_deflate"
198     - )
199     - {
200     - unless (exists $lines{$line})
201     - {
202     - push @lines, $line;
203     - }
204     - }
205     - "";
206     -}
207     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10tap-aliases e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10tap-aliases
208     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10tap-aliases 2005-11-20 21:28:07.000000000 -0700
209     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10tap-aliases 1969-12-31 17:00:00.000000000 -0700
210     @@ -1,11 +0,0 @@
211     -{
212     - foreach my $i (0..15)
213     - {
214     - my $line = "alias tap${i} off";
215     - unless (exists $lines{$line})
216     - {
217     - push @lines, $line;
218     - }
219     - }
220     - "";
221     -}
222     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10usb e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10usb
223     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10usb 2005-11-20 21:28:07.000000000 -0700
224     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10usb 1969-12-31 17:00:00.000000000 -0700
225     @@ -1,8 +0,0 @@
226     -{
227     - my $usb_alias = "alias char-major-180 usbcore";
228     - unless (exists $lines{$usb_alias})
229     - {
230     - push @lines, $usb_alias;
231     - }
232     - "";
233     -}
234     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/99writefile e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/99writefile
235     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/99writefile 2005-11-20 21:28:07.000000000 -0700
236     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/99writefile 1969-12-31 17:00:00.000000000 -0700
237     @@ -1,7 +0,0 @@
238     -{
239     - $OUT .= "";
240     - foreach my $line (@lines)
241     - {
242     - $OUT .= "$line\n";
243     - }
244     -}
245     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/template-begin e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/template-begin
246     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/template-begin 2005-11-20 21:28:07.000000000 -0700
247     +++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/template-begin 1969-12-31 17:00:00.000000000 -0700
248     @@ -1,34 +0,0 @@
249     -{
250     - %lines = ();
251     - @lines = ();
252     - open (RD, "</etc/modprobe.conf")
253     - || warn "Cannot open input file /etc/modprobe.conf: $!\n";
254     - while (<RD>)
255     - {
256     - chop;
257     - push @lines, $_;
258     - $lines{$_} = 1;
259     - }
260     - close(RD);
261     - my @header = (
262     - "#------------------------------------------------------------",
263     - "# BE CAREFUL WHEN MODIFYING THIS FILE! It is updated automatically",
264     - "# by the SME server software. Various aliases are added and/or",
265     - "# deleted by the template processing of the file and white space",
266     - "# is removed, but otherwise changes to the file are preserved.",
267     - "# For more information, see http://www.e-smith.org/custom/ and",
268     - "# the template fragments in /etc/e-smith/templates/etc/modprobe.conf/.",
269     - "# ",
270     - "# copyright (C) 2002-2005 Mitel Networks Corporation",
271     - "#------------------------------------------------------------",
272     - );
273     - foreach my $line (@header)
274     - {
275     - # Print the header banner, and delete any of its lines from the
276     - # buffer, so that it isn't repeated.
277     - my $test = $line;
278     - $test =~ tr/()/../; # Avoid special interpretation of () in pattern
279     - @lines = grep { !/^$test$/ } @lines;
280     - $OUT .= "$line\n";
281     - }
282     -}
283     diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates.metadata/etc/modprobe.conf e-smith-base-5.4.0/root/etc/e-smith/templates.metadata/etc/modprobe.conf
284     --- e-smith-base-5.4.0.old/root/etc/e-smith/templates.metadata/etc/modprobe.conf 2005-11-20 21:28:09.000000000 -0700
285     +++ e-smith-base-5.4.0/root/etc/e-smith/templates.metadata/etc/modprobe.conf 1969-12-31 17:00:00.000000000 -0700
286     @@ -1 +0,0 @@
287     -FILTER=sub { $_[0] =~ /^\s*$/ ? '' : $_[0] }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed