cloud-init

Merge ~chad.smith/cloud-init:ubuntu/cosmic into cloud-init:ubuntu/cosmic

  1. Git
  2. lp:~chad.smith/cloud-init
  3. ubuntu/cosmic
  4. Merge into ubuntu/cosmic
Proposed by Chad Smith
Status: Merged
Merged at revision: 7554261566c933a9cfb4f17166069742f1e9fc02
Proposed branch: ~chad.smith/cloud-init:ubuntu/cosmic
Merge into: cloud-init:ubuntu/cosmic
Diff against target: 550 lines (+84/-8)
8 files modified
cloudinit/config/cc_rh_subscription.py (+3/-3)
cloudinit/net/sysconfig.py (+2/-0)
cloudinit/sources/DataSourceOpenNebula.py (+3/-1)
debian/changelog (+13/-1)
setup.py (+10/-3)
systemd/cloud-init-generator.tmpl (+5/-0)
tests/unittests/test_distros/test_netconfig.py (+8/-0)
tests/unittests/test_net.py (+40/-0)
Reviewer Review Type Date Requested Status
Ryan Harper Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+362366@code.launchpad.net

Commit message

new upstream snapshot to fix intermittent unittest failure on opennebule. SRU into cosmic

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:7554261566c933a9cfb4f17166069742f1e9fc02
https://jenkins.ubuntu.com/server/job/cloud-init-ci/551/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/551/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py
2index edee01e..28c79b8 100644
3--- a/cloudinit/config/cc_rh_subscription.py
4+++ b/cloudinit/config/cc_rh_subscription.py
5@@ -249,14 +249,14 @@ class SubscriptionManager(object):
6 except util.ProcessExecutionError as e:
7 if e.stdout.rstrip() != '':
8 for line in e.stdout.split("\n"):
9- if line is not '':
10+ if line != '':
11 self.log_warn(line)
12 else:
13 self.log_warn("Setting the service level failed with: "
14 "{0}".format(e.stderr.strip()))
15 return False
16 for line in return_out.split("\n"):
17- if line is not "":
18+ if line != "":
19 self.log.debug(line)
20 return True
21
22@@ -268,7 +268,7 @@ class SubscriptionManager(object):
23 self.log_warn("Auto-attach failed with: {0}".format(e))
24 return False
25 for line in return_out.split("\n"):
26- if line is not "":
27+ if line != "":
28 self.log.debug(line)
29 return True
30
31diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
32index fd8e501..19b3e60 100644
33--- a/cloudinit/net/sysconfig.py
34+++ b/cloudinit/net/sysconfig.py
35@@ -273,6 +273,7 @@ class Renderer(renderer.Renderer):
36 ('USERCTL', False),
37 ('NM_CONTROLLED', False),
38 ('BOOTPROTO', 'none'),
39+ ('STARTMODE', 'auto'),
40 ])
41
42 # If these keys exist, then their values will be used to form
43@@ -367,6 +368,7 @@ class Renderer(renderer.Renderer):
44 iface_cfg.name))
45 if subnet.get('control') == 'manual':
46 iface_cfg['ONBOOT'] = False
47+ iface_cfg['STARTMODE'] = 'manual'
48
49 # set IPv4 and IPv6 static addresses
50 ipv4_index = -1
51diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
52index 6e1d04b..02c9a7b 100644
53--- a/cloudinit/sources/DataSourceOpenNebula.py
54+++ b/cloudinit/sources/DataSourceOpenNebula.py
55@@ -337,7 +337,9 @@ def parse_shell_config(content, keylist=None, bash=None, asuser=None,
56 (output, _error) = util.subp(cmd, data=bcmd)
57
58 # exclude vars in bash that change on their own or that we used
59- excluded = ("EPOCHREALTIME", "RANDOM", "LINENO", "SECONDS", "_", "__v")
60+ excluded = (
61+ "EPOCHREALTIME", "EPOCHSECONDS", "RANDOM", "LINENO", "SECONDS", "_",
62+ "__v")
63 preset = {}
64 ret = {}
65 target = None
66diff --git a/debian/changelog b/debian/changelog
67index f5bb1fa..4ba478b 100644
68--- a/debian/changelog
69+++ b/debian/changelog
70@@ -1,6 +1,18 @@
71-cloud-init (18.5-17-gd1a2fe73-0ubuntu1~18.10.1) cosmic; urgency=medium
72+cloud-init (18.5-21-g8ee294d5-0ubuntu1~18.10.1) cosmic; urgency=medium
73
74 * New upstream snapshot. (LP: #1813346)
75+ - opennebula: also exclude epochseconds from changed environment vars
76+ - systemd: Render generator from template to account for system
77+ differences. [Robert Schweikert]
78+ - sysconfig: On SUSE, use STARTMODE instead of ONBOOT [Robert Schweikert]
79+ - flake8: use ==/!= to compare str, bytes, and int literals
80+ [Paride Legovini]
81+
82+ -- Chad Smith <chad.smith@canonical.com> Mon, 28 Jan 2019 20:19:18 -0700
83+
84+cloud-init (18.5-17-gd1a2fe73-0ubuntu1~18.10.1) cosmic; urgency=medium
85+
86+ * New upstream snapshot.
87 - opennebula: exclude EPOCHREALTIME as known bash env variable with a
88 delta
89 - tox: fix disco httpretty dependencies for py37
90diff --git a/setup.py b/setup.py
91index ea37efc..186e215 100755
92--- a/setup.py
93+++ b/setup.py
94@@ -30,6 +30,8 @@ VARIANT = None
95 def is_f(p):
96 return os.path.isfile(p)
97
98+def is_generator(p):
99+ return '-generator' in p
100
101 def tiny_p(cmd, capture=True):
102 # Darn python 2.6 doesn't have check_output (argggg)
103@@ -90,7 +92,7 @@ def read_requires():
104 return str(deps).splitlines()
105
106
107-def render_tmpl(template):
108+def render_tmpl(template, mode=None):
109 """render template into a tmpdir under same dir as setup.py
110
111 This is rendered to a temporary directory under the top level
112@@ -119,6 +121,8 @@ def render_tmpl(template):
113 VARIANT, template, fpath])
114 else:
115 tiny_p([sys.executable, './tools/render-cloudcfg', template, fpath])
116+ if mode:
117+ os.chmod(fpath, mode)
118 # return path relative to setup.py
119 return os.path.join(os.path.basename(tmpd), bname)
120
121@@ -138,8 +142,11 @@ INITSYS_FILES = {
122 'systemd': [render_tmpl(f)
123 for f in (glob('systemd/*.tmpl') +
124 glob('systemd/*.service') +
125- glob('systemd/*.target')) if is_f(f)],
126- 'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],
127+ glob('systemd/*.target'))
128+ if (is_f(f) and not is_generator(f))],
129+ 'systemd.generators': [
130+ render_tmpl(f, mode=0o755)
131+ for f in glob('systemd/*') if is_f(f) and is_generator(f)],
132 'upstart': [f for f in glob('upstart/*') if is_f(f)],
133 }
134 INITSYS_ROOTS = {
135diff --git a/systemd/cloud-init-generator b/systemd/cloud-init-generator.tmpl
136similarity index 90%
137rename from systemd/cloud-init-generator
138rename to systemd/cloud-init-generator.tmpl
139index bd9f267..cfa5eb5 100755
140--- a/systemd/cloud-init-generator
141+++ b/systemd/cloud-init-generator.tmpl
142@@ -1,3 +1,4 @@
143+## template:jinja
144 #!/bin/sh
145 set -f
146
147@@ -9,7 +10,11 @@ DISABLE="disabled"
148 FOUND="found"
149 NOTFOUND="notfound"
150 RUN_ENABLED_FILE="$LOG_D/$ENABLE"
151+{% if variant in ["suse"] %}
152+CLOUD_SYSTEM_TARGET="/usr/lib/systemd/system/cloud-init.target"
153+{% else %}
154 CLOUD_SYSTEM_TARGET="/lib/systemd/system/cloud-init.target"
155+{% endif %}
156 CLOUD_TARGET_NAME="cloud-init.target"
157 # lxc sets 'container', but lets make that explicitly a global
158 CONTAINER="${container}"
159diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
160index 6e33935..e986b59 100644
161--- a/tests/unittests/test_distros/test_netconfig.py
162+++ b/tests/unittests/test_distros/test_netconfig.py
163@@ -468,6 +468,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
164 NETMASK=255.255.255.0
165 NM_CONTROLLED=no
166 ONBOOT=yes
167+ STARTMODE=auto
168 TYPE=Ethernet
169 USERCTL=no
170 """),
171@@ -476,6 +477,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
172 DEVICE=eth1
173 NM_CONTROLLED=no
174 ONBOOT=yes
175+ STARTMODE=auto
176 TYPE=Ethernet
177 USERCTL=no
178 """),
179@@ -499,6 +501,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
180 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
181 NM_CONTROLLED=no
182 ONBOOT=yes
183+ STARTMODE=auto
184 TYPE=Ethernet
185 USERCTL=no
186 """),
187@@ -507,6 +510,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
188 DEVICE=eth1
189 NM_CONTROLLED=no
190 ONBOOT=yes
191+ STARTMODE=auto
192 TYPE=Ethernet
193 USERCTL=no
194 """),
195@@ -559,6 +563,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
196 NETMASK=255.255.255.0
197 NM_CONTROLLED=no
198 ONBOOT=yes
199+ STARTMODE=auto
200 TYPE=Ethernet
201 USERCTL=no
202 """),
203@@ -567,6 +572,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
204 DEVICE=eth1
205 NM_CONTROLLED=no
206 ONBOOT=yes
207+ STARTMODE=auto
208 TYPE=Ethernet
209 USERCTL=no
210 """),
211@@ -587,6 +593,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
212 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
213 NM_CONTROLLED=no
214 ONBOOT=yes
215+ STARTMODE=auto
216 TYPE=Ethernet
217 USERCTL=no
218 """),
219@@ -595,6 +602,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
220 DEVICE=eth1
221 NM_CONTROLLED=no
222 ONBOOT=yes
223+ STARTMODE=auto
224 TYPE=Ethernet
225 USERCTL=no
226 """),
227diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
228index 5313d2d..e041e97 100644
229--- a/tests/unittests/test_net.py
230+++ b/tests/unittests/test_net.py
231@@ -145,6 +145,7 @@ IPADDR=172.19.1.34
232 NETMASK=255.255.252.0
233 NM_CONTROLLED=no
234 ONBOOT=yes
235+STARTMODE=auto
236 TYPE=Ethernet
237 USERCTL=no
238 """.lstrip()),
239@@ -178,6 +179,7 @@ IPADDR=172.19.1.34
240 NETMASK=255.255.252.0
241 NM_CONTROLLED=no
242 ONBOOT=yes
243+STARTMODE=auto
244 TYPE=Ethernet
245 USERCTL=no
246 """.lstrip()),
247@@ -247,6 +249,7 @@ NETMASK=255.255.252.0
248 NETMASK1=255.255.255.0
249 NM_CONTROLLED=no
250 ONBOOT=yes
251+STARTMODE=auto
252 TYPE=Ethernet
253 USERCTL=no
254 """.lstrip()),
255@@ -282,6 +285,7 @@ NETMASK=255.255.252.0
256 NETMASK1=255.255.255.0
257 NM_CONTROLLED=no
258 ONBOOT=yes
259+STARTMODE=auto
260 TYPE=Ethernet
261 USERCTL=no
262 """.lstrip()),
263@@ -373,6 +377,7 @@ IPV6_DEFAULTGW=2001:DB8::1
264 NETMASK=255.255.252.0
265 NM_CONTROLLED=no
266 ONBOOT=yes
267+STARTMODE=auto
268 TYPE=Ethernet
269 USERCTL=no
270 """.lstrip()),
271@@ -410,6 +415,7 @@ IPV6_DEFAULTGW=2001:DB8::1
272 NETMASK=255.255.252.0
273 NM_CONTROLLED=no
274 ONBOOT=yes
275+STARTMODE=auto
276 TYPE=Ethernet
277 USERCTL=no
278 """.lstrip()),
279@@ -526,6 +532,7 @@ NETWORK_CONFIGS = {
280 HWADDR=cf:d6:af:48:e8:80
281 NM_CONTROLLED=no
282 ONBOOT=yes
283+ STARTMODE=auto
284 TYPE=Ethernet
285 USERCTL=no"""),
286 'ifcfg-eth99': textwrap.dedent("""\
287@@ -542,6 +549,7 @@ NETWORK_CONFIGS = {
288 METRIC=10000
289 NM_CONTROLLED=no
290 ONBOOT=yes
291+ STARTMODE=auto
292 TYPE=Ethernet
293 USERCTL=no"""),
294 },
295@@ -655,6 +663,7 @@ NETWORK_CONFIGS = {
296 NETMASK=255.255.255.0
297 NM_CONTROLLED=no
298 ONBOOT=yes
299+ STARTMODE=auto
300 TYPE=Ethernet
301 USERCTL=no
302 MTU=9000
303@@ -694,6 +703,7 @@ NETWORK_CONFIGS = {
304 DEVICE=iface0
305 NM_CONTROLLED=no
306 ONBOOT=yes
307+ STARTMODE=auto
308 TYPE=Ethernet
309 USERCTL=no
310 """),
311@@ -897,6 +907,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
312 MACADDR=aa:bb:cc:dd:ee:ff
313 NM_CONTROLLED=no
314 ONBOOT=yes
315+ STARTMODE=auto
316 TYPE=Bond
317 USERCTL=no"""),
318 'ifcfg-bond0.200': textwrap.dedent("""\
319@@ -905,6 +916,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
320 NM_CONTROLLED=no
321 ONBOOT=yes
322 PHYSDEV=bond0
323+ STARTMODE=auto
324 TYPE=Ethernet
325 USERCTL=no
326 VLAN=yes"""),
327@@ -922,6 +934,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
328 NM_CONTROLLED=no
329 ONBOOT=yes
330 PRIO=22
331+ STARTMODE=auto
332 STP=no
333 TYPE=Bridge
334 USERCTL=no"""),
335@@ -931,6 +944,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
336 HWADDR=c0:d6:9f:2c:e8:80
337 NM_CONTROLLED=no
338 ONBOOT=yes
339+ STARTMODE=auto
340 TYPE=Ethernet
341 USERCTL=no"""),
342 'ifcfg-eth0.101': textwrap.dedent("""\
343@@ -949,6 +963,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
344 NM_CONTROLLED=no
345 ONBOOT=yes
346 PHYSDEV=eth0
347+ STARTMODE=auto
348 TYPE=Ethernet
349 USERCTL=no
350 VLAN=yes"""),
351@@ -959,6 +974,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
352 MASTER=bond0
353 NM_CONTROLLED=no
354 ONBOOT=yes
355+ STARTMODE=auto
356 SLAVE=yes
357 TYPE=Ethernet
358 USERCTL=no"""),
359@@ -969,6 +985,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
360 MASTER=bond0
361 NM_CONTROLLED=no
362 ONBOOT=yes
363+ STARTMODE=auto
364 SLAVE=yes
365 TYPE=Ethernet
366 USERCTL=no"""),
367@@ -979,6 +996,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
368 HWADDR=66:bb:9f:2c:e8:80
369 NM_CONTROLLED=no
370 ONBOOT=yes
371+ STARTMODE=auto
372 TYPE=Ethernet
373 USERCTL=no"""),
374 'ifcfg-eth4': textwrap.dedent("""\
375@@ -988,6 +1006,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
376 HWADDR=98:bb:9f:2c:e8:80
377 NM_CONTROLLED=no
378 ONBOOT=yes
379+ STARTMODE=auto
380 TYPE=Ethernet
381 USERCTL=no"""),
382 'ifcfg-eth5': textwrap.dedent("""\
383@@ -996,6 +1015,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
384 HWADDR=98:bb:9f:2c:e8:8a
385 NM_CONTROLLED=no
386 ONBOOT=no
387+ STARTMODE=manual
388 TYPE=Ethernet
389 USERCTL=no""")
390 },
391@@ -1307,6 +1327,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
392 NETMASK1=255.255.255.0
393 NM_CONTROLLED=no
394 ONBOOT=yes
395+ STARTMODE=auto
396 TYPE=Bond
397 USERCTL=no
398 """),
399@@ -1318,6 +1339,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
400 NM_CONTROLLED=no
401 ONBOOT=yes
402 SLAVE=yes
403+ STARTMODE=auto
404 TYPE=Ethernet
405 USERCTL=no
406 """),
407@@ -1334,6 +1356,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
408 NM_CONTROLLED=no
409 ONBOOT=yes
410 SLAVE=yes
411+ STARTMODE=auto
412 TYPE=Ethernet
413 USERCTL=no
414 """),
415@@ -1359,6 +1382,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
416 NETMASK1=255.255.255.0
417 NM_CONTROLLED=no
418 ONBOOT=yes
419+ STARTMODE=auto
420 TYPE=Bond
421 USERCTL=no
422 """),
423@@ -1370,6 +1394,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
424 NM_CONTROLLED=no
425 ONBOOT=yes
426 SLAVE=yes
427+ STARTMODE=auto
428 TYPE=Ethernet
429 USERCTL=no
430 """),
431@@ -1392,6 +1417,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
432 NM_CONTROLLED=no
433 ONBOOT=yes
434 SLAVE=yes
435+ STARTMODE=auto
436 TYPE=Ethernet
437 USERCTL=no
438 """),
439@@ -1429,6 +1455,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
440 HWADDR=aa:bb:cc:dd:e8:00
441 NM_CONTROLLED=no
442 ONBOOT=yes
443+ STARTMODE=auto
444 TYPE=Ethernet
445 USERCTL=no"""),
446 'ifcfg-en0.99': textwrap.dedent("""\
447@@ -1447,6 +1474,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
448 NM_CONTROLLED=no
449 ONBOOT=yes
450 PHYSDEV=en0
451+ STARTMODE=auto
452 TYPE=Ethernet
453 USERCTL=no
454 VLAN=yes"""),
455@@ -1488,6 +1516,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
456 NM_CONTROLLED=no
457 ONBOOT=yes
458 PRIO=22
459+ STARTMODE=auto
460 STP=no
461 TYPE=Bridge
462 USERCTL=no
463@@ -1501,6 +1530,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
464 IPV6INIT=yes
465 NM_CONTROLLED=no
466 ONBOOT=yes
467+ STARTMODE=auto
468 TYPE=Ethernet
469 USERCTL=no
470 """),
471@@ -1513,6 +1543,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
472 IPV6INIT=yes
473 NM_CONTROLLED=no
474 ONBOOT=yes
475+ STARTMODE=auto
476 TYPE=Ethernet
477 USERCTL=no
478 """),
479@@ -1587,6 +1618,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
480 NETMASK=255.255.255.0
481 NM_CONTROLLED=no
482 ONBOOT=no
483+ STARTMODE=manual
484 TYPE=Ethernet
485 USERCTL=no
486 """),
487@@ -1597,6 +1629,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
488 MTU=1480
489 NM_CONTROLLED=no
490 ONBOOT=yes
491+ STARTMODE=auto
492 TYPE=Ethernet
493 USERCTL=no
494 """),
495@@ -1606,6 +1639,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
496 HWADDR=52:54:00:12:34:ff
497 NM_CONTROLLED=no
498 ONBOOT=no
499+ STARTMODE=manual
500 TYPE=Ethernet
501 USERCTL=no
502 """),
503@@ -1973,6 +2007,7 @@ DEVICE=eth1000
504 HWADDR=07-1C-C6-75-A4-BE
505 NM_CONTROLLED=no
506 ONBOOT=yes
507+STARTMODE=auto
508 TYPE=Ethernet
509 USERCTL=no
510 """.lstrip()
511@@ -2094,6 +2129,7 @@ IPADDR=10.0.2.15
512 NETMASK=255.255.255.0
513 NM_CONTROLLED=no
514 ONBOOT=yes
515+STARTMODE=auto
516 TYPE=Ethernet
517 USERCTL=no
518 """
519@@ -2119,6 +2155,7 @@ BOOTPROTO=dhcp
520 DEVICE=eth0
521 NM_CONTROLLED=no
522 ONBOOT=yes
523+STARTMODE=auto
524 TYPE=Ethernet
525 USERCTL=no
526 """
527@@ -2335,6 +2372,7 @@ DEVICE=eth1000
528 HWADDR=07-1C-C6-75-A4-BE
529 NM_CONTROLLED=no
530 ONBOOT=yes
531+STARTMODE=auto
532 TYPE=Ethernet
533 USERCTL=no
534 """.lstrip()
535@@ -2456,6 +2494,7 @@ IPADDR=10.0.2.15
536 NETMASK=255.255.255.0
537 NM_CONTROLLED=no
538 ONBOOT=yes
539+STARTMODE=auto
540 TYPE=Ethernet
541 USERCTL=no
542 """
543@@ -2481,6 +2520,7 @@ BOOTPROTO=dhcp
544 DEVICE=eth0
545 NM_CONTROLLED=no
546 ONBOOT=yes
547+STARTMODE=auto
548 TYPE=Ethernet
549 USERCTL=no
550 """

Subscribers

People subscribed via source and target branches