/[smecontribs]/rpms/smeserver-bridge-interface/contribs10/smeserver-bridge-interface.0.2-dhcp-base-compat--bz12271.patch
ViewVC logotype

Contents of /rpms/smeserver-bridge-interface/contribs10/smeserver-bridge-interface.0.2-dhcp-base-compat--bz12271.patch

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


Revision 1.1 - (show annotations) (download)
Sun Dec 25 07:16:54 2022 UTC (22 months, 4 weeks ago) by terryfage
Branch: MAIN
CVS Tags: smeserver-bridge-interface-0_2-9_el7_sme, HEAD
Error occurred while calculating annotation data.
* Sun Dec 25 2022 Terry Fage <terry@fage.id.au> 0.2-9.sme
- make bridge interface compat to e-smith-base on install [SME: 12271]

1 diff -urN smeserver-bridge-interface-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf/41service smeserver-bridge-interface-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf/41service
2 --- smeserver-bridge-interface-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf/41service 2022-12-24 09:29:48.130814309 -0500
3 +++ smeserver-bridge-interface-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf/41service 2022-12-24 14:17:57.000000000 -0500
4 @@ -1,6 +1,6 @@
5 {
6 $interface=$InternalInterface{'Name'}||"hum";
7 -$bridgeif=(defined $bridge{bridgeInterface} && $bridge{status} eq "enabled")? $bridge{bridgeInterface}: "";
8 +$bridgeif=(defined $bridge{bridgeInterface} )? $bridge{bridgeInterface}: "";
9 #$bridgedif=(defined $bridge{ethernetInterface} ) ? $bridge{ethernetInterface} : undef;
10 #$interface=(defined $bridgedif && $bridgedif eq $interface && defined $bridgeif) ? $bridgeif : $interface;
11 # extra code if we want to hide the ethernet interface, howecer with only a little noise in dhcp log, we can keep the two intefaces
12 @@ -14,4 +14,7 @@
13 [Service]
14 # added for bridge interface
15 ExecStart=
16 -ExecStart=/usr/bin/sh -c 'exec /usr/sbin/dhcpd -f -cf /etc/dhcpd.conf -lf /var/lib/dhcpd/dhcpd.leases -user dhcpd -group dhcpd --no-pid {$interface} {$bridgeif} >>/var/log/dhcpd/current 2>>/var/log/dhcpd/current'
17 +ExecStart=/usr/bin/sh -c 'exec /usr/sbin/dhcpd -f -cf /etc/dhcpd.conf -lf /var/lib/dhcpd/dhcpd.leases -user dhcpd -group dhcpd --no-pid {$bridgeif} >>/var/log/dhcpd/current 2>>/var/log/dhcpd/current'
18 +Restart=always
19 +RestartSec=5
20 +

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