Support coreos.first_boot for compatibility

flatcar · Feb 12, 2020 · b7f1dbc · b7f1dbc
1 parent 5f4cf63
commit b7f1dbc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/dracut/30ignition/ignition-generator b/dracut/30ignition/ignition-generator
@@ -35,7 +35,7 @@ add_requires() {
 # This can't be done with ConditionKernelCommandLine because that always
 # starts the unit's dependencies. We want to start networkd only on first
 # boot.
-if $(cmdline_bool flatcar.first_boot 0); then
+if $(cmdline_bool flatcar.first_boot 0) || $(cmdline_bool coreos.first_boot 0); then
     add_requires ignition-disks.service
     add_requires ignition-files.service
     # Only try to mount the ESP if GRUB detected a first_boot file

diff --git a/dracut/35torcx/torcx-profile-populate-generator b/dracut/35torcx/torcx-profile-populate-generator
@@ -35,6 +35,6 @@ add_requires() {
 # This can't be done with ConditionKernelCommandLine because that always
 # starts the unit's dependencies. We want to start networkd only on first
 # boot.
-if $(cmdline_bool flatcar.first_boot 0); then
+if $(cmdline_bool flatcar.first_boot 0) || $(cmdline_bool coreos.first_boot 0); then
     add_requires torcx-profile-populate.service
 fi
diff --git a/dracut/99start-root/65-start-root.rules b/dracut/99start-root/65-start-root.rules
@@ -19,11 +19,16 @@ SUBSYSTEM!="block", GOTO="start_root_end"
 # Ignition may want to clobber partitions used in a raid array, so
 # skip assembling them when Ignition is going to run.
 IMPORT{cmdline}="flatcar.first_boot"
+IMPORT{cmdline}="coreos.first_boot"
 # Possible values for not running Ignition from 30ignition/ignition-generator
 ENV{flatcar.first_boot}=="", GOTO="start_root"
 ENV{flatcar.first_boot}=="0", GOTO="start_root"
 ENV{flatcar.first_boot}=="no", GOTO="start_root"
 ENV{flatcar.first_boot}=="off", GOTO="start_root"
+ENV{coreos.first_boot}=="", GOTO="start_root"
+ENV{coreos.first_boot}=="0", GOTO="start_root"
+ENV{coreos.first_boot}=="no", GOTO="start_root"
+ENV{coreos.first_boot}=="off", GOTO="start_root"
 GOTO="start_root_end"
 
 LABEL="start_root"