manifests: move shared overlays to shared-el.yaml

This will make it so they don't have to be redefined in
rhel-coreos-config.

manifests/fedora-coreos-base.yaml

@@ -12,12 +12,8 @@ include:
   - coreos-bootc-delta.yaml
 
 ostree-layers:
-  - overlay.d/05core
-  - overlay.d/08nouveau
   - overlay.d/09misc
   - overlay.d/10disk-images
-  - overlay.d/20platform-chrony
-  - overlay.d/30lvmdevices
 
 conditional-include:
   - if: releasever < 44

manifests/shared-el.yaml

@@ -28,3 +28,20 @@ conditional-include:
         - azure-vm-utils
         # Include udev rules azure storage and productid
         - WALinuxAgent-udev
+
+  # Include the layers that are shared amongst Fedora and EL
+  # (though at different import paths).
+  - if: id == "fedora"
+    include:
+      ostree-layers:
+        - overlay.d/05core
+        - overlay.d/08nouveau
+        - overlay.d/20platform-chrony
+        - overlay.d/30lvmdevices
+  - if: id != "fedora"
+    include:
+      ostree-layers:
+        - fedora-coreos-config/overlay.d/05core
+        - fedora-coreos-config/overlay.d/08nouveau
+        - fedora-coreos-config/overlay.d/20platform-chrony
+        - fedora-coreos-config/overlay.d/30lvmdevices