dracut: drop CoreOS specific dracut modules

Remove both 30ignition/coreos.* and 99* modules which are specific to
Fedora CoreOS.

Signed-off-by: Ben Howard <ben.howard@redhat.com>

dracut/30ignition/ignition-fetch-offline.service

@@ -21,6 +21,10 @@ Before=ignition-fetch.service
 OnFailure=emergency.target
 OnFailureJobMode=isolate
 
+# See hack in ignition-check-neednet, as well as coreos-copy-firstboot-network.service.
+After=dracut-cmdline.service
+Before=dracut-initqueue.service
+
 [Service]
 Type=oneshot
 RemainAfterExit=yes

dracut/30ignition/ignition-generator

@@ -55,8 +55,6 @@ if $(cmdline_bool 'ignition.firstboot' 0); then
 [Unit]
 Requires=dev-disk-by\x2dlabel-boot.device
 After=dev-disk-by\x2dlabel-boot.device
-Requires=coreos-gpt-setup.service
-After=coreos-gpt-setup.service
 EOF
     fi
 else

dracut/30ignition/ignition-setup-user.service

@@ -16,7 +16,7 @@ Before=ignition-fetch-offline.service
 Before=multipathd.service
 
 # On diskful boots, ignition-generator adds Requires/After on
-# dev-disk-by\x2dlabel-boot.device & coreos-gpt-setup.service
+# dev-disk-by\x2dlabel-boot.device
 
 [Service]
 Type=oneshot

dracut/30ignition/module-setup.sh

@@ -6,6 +6,13 @@ depends() {
     echo qemu systemd url-lib network
 }
 
+# Ignition 2.5.0 conflicts with the Ignition-Drauct modules.
+check() {
+    if dracut_module_included "ignition"; then
+        return 1;
+    fi
+}
+
 install_ignition_unit() {
     local unit="$1"; shift
     local target="${1:-ignition-complete.target}"; shift
@@ -54,9 +61,6 @@ install() {
     # Required on system using SELinux
     inst_multiple -o setfiles
 
-    inst_script "$moddir/coreos-gpt-setup.sh" \
-        "/usr/sbin/coreos-gpt-setup"
-
     inst_script "$moddir/ignition-setup-base.sh" \
         "/usr/sbin/ignition-setup-base"
     inst_script "$moddir/ignition-setup-user.sh" \
@@ -83,12 +87,6 @@ install() {
             "$systemdsystemunitdir/ignition-$x.target"
     done
 
-    # For consistency tear down the network and persist multipath between the initramfs and
-    # real root. See https://github.com/coreos/fedora-coreos-tracker/issues/394#issuecomment-599721763
-    inst_script "$moddir/coreos-teardown-initramfs.sh" \
-        "/usr/sbin/coreos-teardown-initramfs"
-    install_ignition_unit coreos-teardown-initramfs.service
-
     install_ignition_unit ignition-setup-base.service
     install_ignition_unit ignition-setup-user.service
     install_ignition_unit ignition-fetch.service
@@ -99,7 +97,6 @@ install() {
 
     # units only started when we have a boot disk
     # path generated by systemd-escape --path /dev/disk/by-label/root
-    install_ignition_unit coreos-gpt-setup.service         ignition-diskful.target
     install_ignition_unit ignition-remount-sysroot.service ignition-diskful.target
 
     # needed for openstack config drive support