Merge pull request #1389 from vcaputo/ignition-networkd

Ignition networkd integration
This commit is contained in:
Vito Caputo 2015-07-20 16:36:47 -07:00
commit 823c03873f
4 changed files with 7 additions and 7 deletions

View File

@ -1,8 +1,6 @@
[Unit]
Description=Ignition
DefaultDependencies=false
Conflicts=initrd-switch-root.target
Before=initrd-switch-root.target
Requires=local-fs-pre.target
Before=local-fs-pre.target

View File

@ -1,7 +1,6 @@
[Unit]
Description=Ignition
DefaultDependencies=false
Conflicts=initrd-switch-root.target
Before=initrd-switch-root.target
Requires=initrd-root-fs.target

View File

@ -1,6 +1,5 @@
[Unit]
DefaultDependencies=false
Conflicts=initrd-switch-root.target
Before=initrd-switch-root.target
OnFailure=emergency.target
@ -12,5 +11,10 @@ After=ignition-disks.service
Requires=ignition-files.service
After=ignition-files.service
Requires=systemd-networkd.service
After=systemd-networkd.service
# setup networking
Requires=initrd-systemd-networkd.service
After=initrd-systemd-networkd.service
# generate resolv.conf
Requires=initrd-systemd-resolved.service
After=initrd-systemd-resolved.service

View File

@ -1,6 +1,5 @@
[Unit]
DefaultDependencies=false
Conflicts=initrd-switch-root.target
Before=initrd-switch-root.target
[Mount]