From f8aadf234d8c7bc8c268bdd598147bfb4a47309c Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@mocaccino.org>
Date: Mon, 14 Nov 2022 12:43:03 +0100
Subject: [PATCH] :seedling: Build initrds with our modules

Signed-off-by: Ettore Di Giacinto <mudler@mocaccino.org>
---
 packages/initrd/build.yaml                    | 14 +++++++-------
 packages/initrd/collection.yaml               |  4 ++--
 .../system/dracut/immutable-rootfs/build.yaml | 19 ++++++++++---------
 .../dracut/immutable-rootfs/definition.yaml   |  2 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/packages/initrd/build.yaml b/packages/initrd/build.yaml
index 02644c2..fab4c5d 100644
--- a/packages/initrd/build.yaml
+++ b/packages/initrd/build.yaml
@@ -5,18 +5,18 @@ requires:
 
 copy:
 # The toolkit is required in module-setup and embedded in the initramfs. 
-- package: 
-    category: "system"
-    name: "elemental-toolkit-{{.Values.name}}"
-    version: ">=0"
-  source: "/framework/."
-  destination: "/"
 - package: 
     category: "system"
     name: "elemental-cli"
     version: ">=0"
   source: "/usr/bin/elemental"
   destination: "/usr/bin/elemental"
+- package: 
+    category: "dracut"
+    name: "immutable-rootfs"
+    version: ">=0"
+  source: "/package/."
+  destination: "/"
 - package: 
     category: "dracut"
     name: "kcrypt"
@@ -39,4 +39,4 @@ steps:
 - |
     kernel=$(ls /lib/modules | head -n1) && \
     dracut -f "/boot/initrd-${kernel}" "${kernel}" && \
-    ln -sf "initrd-${kernel}" /boot/initrd
\ No newline at end of file
+    ln -sf "initrd-${kernel}" /boot/initrd
diff --git a/packages/initrd/collection.yaml b/packages/initrd/collection.yaml
index 49d809a..197697c 100644
--- a/packages/initrd/collection.yaml
+++ b/packages/initrd/collection.yaml
@@ -1,10 +1,10 @@
 packages:
 - name: "opensuse"
   category: "distro-initrd"
-  version: "0.14"
+  version: "0.15"
 # - name: "fedora"
 #   category: "distro-initrd"
 #   version: "0.11"
 - name: "ubuntu"
   category: "distro-initrd"
-  version: "0.14"
+  version: "0.15"
diff --git a/packages/system/dracut/immutable-rootfs/build.yaml b/packages/system/dracut/immutable-rootfs/build.yaml
index f704e45..8a5b439 100644
--- a/packages/system/dracut/immutable-rootfs/build.yaml
+++ b/packages/system/dracut/immutable-rootfs/build.yaml
@@ -1,11 +1,12 @@
 image: alpine
+package_dir: "/package"
 steps:
-- mkdir -p /etc/systemd/system
-- mkdir -p /etc/dracut.conf.d
-- cp -rf tmp.mount /etc/systemd/system
-- mkdir -p /usr/lib/dracut/modules.d
-- cp -r 30cos-immutable-rootfs /usr/lib/dracut/modules.d
-- cp 02-cos-immutable-rootfs.conf /etc/dracut.conf.d
-- cp 02-cos-setup-initramfs.conf /etc/dracut.conf.d
-- cp 50-cos-initrd.conf /etc/dracut.conf.d
-- cp -rfv 30cos-immutable-rootfs/cos-setup-*.service /etc/systemd/system
+- mkdir -p /package/etc/systemd/system
+- mkdir -p /package/etc/dracut.conf.d
+- cp -rf tmp.mount /package/etc/systemd/system
+- mkdir -p /package/usr/lib/dracut/modules.d
+- cp -r 30cos-immutable-rootfs /package/usr/lib/dracut/modules.d
+- cp 02-cos-immutable-rootfs.conf /package/etc/dracut.conf.d
+- cp 02-cos-setup-initramfs.conf /package/etc/dracut.conf.d
+- cp 50-cos-initrd.conf /package/etc/dracut.conf.d
+- cp -rfv 30cos-immutable-rootfs/cos-setup-*.service /package/etc/systemd/system
diff --git a/packages/system/dracut/immutable-rootfs/definition.yaml b/packages/system/dracut/immutable-rootfs/definition.yaml
index 1c02082..4cb867d 100644
--- a/packages/system/dracut/immutable-rootfs/definition.yaml
+++ b/packages/system/dracut/immutable-rootfs/definition.yaml
@@ -1,3 +1,3 @@
 name: "immutable-rootfs"
 category: "dracut"
-version: "0.7"
+version: "0.8"