sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use %i instead of %I in dhcp-interface@.service"

Browse Source
This commit is contained in:
Jenkins 2017-01-26 23:02:15 +00:00 committed by Gerrit Code Review
commit 7f218fe10e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
elements/dhcp-all-interfaces/install.d/dhcp-interface@.service
View File

@ -1,5 +1,5 @@
[Unit] [Unit]
Description=DHCP interface %I Description=DHCP interface %i
# We want to run after network.target so it doesn't try to bring # We want to run after network.target so it doesn't try to bring
# up the interfaces a second time, but network-online should not # up the interfaces a second time, but network-online should not
# be reached until after we've brought up the interfaces. # be reached until after we've brought up the interfaces.
@ -7,13 +7,13 @@ After=network.target
Before=network-online.target Before=network-online.target
Wants=network-online.target Wants=network-online.target
ConditionPathExists=!/etc/sysconfig/network-scripts/ifcfg-%I ConditionPathExists=!/etc/sysconfig/network-scripts/ifcfg-%i
[Service] [Service]
Type=oneshot Type=oneshot
User=root User=root
ExecStartPre=/usr/local/sbin/dhcp-all-interfaces.sh %I ExecStartPre=/usr/local/sbin/dhcp-all-interfaces.sh %i
ExecStart=/sbin/ifup %I ExecStart=/sbin/ifup %i
RemainAfterExit=true RemainAfterExit=true
TimeoutStartSec=DIB_DHCP_TIMEOUT TimeoutStartSec=DIB_DHCP_TIMEOUT