Move out initrd creation from immutable-rootfs package

Signed-off-by: David Cassany <[email protected]>
rancher · Jun 21, 2021 · 8fc9fc6 · 8fc9fc6
1 parent 5c5648a
commit 8fc9fc6
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 16 deletions.
diff --git a/packages/cos-setup/02-cos-setup-initramfs.conf b/packages/cos-setup/02-cos-setup-initramfs.conf
@@ -0,0 +1,3 @@
+install_items+=" /lib/systemd/system/cos-setup-initramfs.service /etc/systemd/system/initrd.target.requires/cos-setup-initramfs.service "
+install_items+=" /lib/systemd/system/cos-setup-rootfs.service /etc/systemd/system/initrd-fs.target.requires/cos-setup-rootfs.service "
+add_dracutmodules+=" network "
diff --git a/packages/cos-setup/02cos-setup-initramfs.conf b/packages/cos-setup/02cos-setup-initramfs.conf
diff --git a/packages/cos-setup/build.yaml b/packages/cos-setup/build.yaml
@@ -5,7 +5,7 @@ requires:
 steps:
 - mkdir -p /lib/systemd/system
 - mkdir -p /etc/dracut.conf.d
-- cp 02cos-setup-initramfs.conf /etc/dracut.conf.d
+- cp 02-cos-setup-initramfs.conf /etc/dracut.conf.d
 - cp -rfv *.service /lib/systemd/system
 - cp -rfv *.timer /lib/systemd/system
 - cp -rfv cos-setup /usr/bin/

diff --git a/packages/cos-setup/definition.yaml b/packages/cos-setup/definition.yaml
@@ -1,6 +1,6 @@
 name: cos-setup
 category: system
-version: 0.2.11+2
+version: "0.2.16"
 requires:
   - name: "yip"
     category: "toolchain"

diff --git a/packages/cos/50-cos-initrd.conf b/packages/cos/50-cos-initrd.conf
@@ -0,0 +1,5 @@
+hostonly_cmdline="no"
+hostonly="no"
+compress="xz"
+omit_dracutmodules+=" multipath "
+add_dracutmodules+=" dmsquash-live "
diff --git a/packages/cos/build.yaml b/packages/cos/build.yaml
@@ -64,6 +64,13 @@ steps:
 - sed -i 's/:PRETTY_NAME:/{{.Values.brand_name}} v{{.Values.version}}/g' setup.yaml
 - yip setup.yaml
 
+# Create initrd
+- |
+    cp 50-cos-initrd.conf /etc/dracut.conf.d && \
+    kernel=$(ls /lib/modules | head -n1) && \
+    dracut -f "/boot/initrd-${kernel}" "${kernel}" && \
+    ln -sf "initrd-${kernel}" /boot/initrd
+
 # See https://luet-lab.github.io/docs/docs/concepts/packages/specfile/#package-by-container-content
 unpack: true
 

diff --git a/packages/cos/collection.yaml b/packages/cos/collection.yaml
@@ -1,16 +1,15 @@
 packages:
   - name: "cos"
     category: "system"
-    version: 0.5.3+3
+    version: 0.5.3+5
     brand_name: "cOS"
     labels:
       autobump.revdeps: "true"
       autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
   - name: "cos"
     category: "recovery"
-    version: "0.5.3+2"
-    version: 0.5.3+3
+    version: 0.5.3+5
     brand_name: "cOS recovery"
     labels:
       autobump.revdeps: "true"
-      autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
+      autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
diff --git a/packages/immutable-rootfs/02-cos-immutable-rootfs.conf b/packages/immutable-rootfs/02-cos-immutable-rootfs.conf
@@ -0,0 +1 @@
+add_dracutmodules+=" cos-immutable-rootfs "
diff --git a/packages/immutable-rootfs/build.yaml b/packages/immutable-rootfs/build.yaml
@@ -25,9 +25,4 @@ steps:
 {{end}}
 {{end}}
 - cp -r 30cos-immutable-rootfs /usr/lib/dracut/modules.d
-- |
-    kernel=$(ls /lib/modules | head -n1) && \
-    dracut --verbose --no-hostonly --omit multipath --no-hostonly-cmdline --xz \
-        -f "/boot/initrd-${kernel}" --add " dmsquash-live cos-immutable-rootfs network " \
-        "${kernel}" && \
-    ln -sf "initrd-${kernel}" /boot/initrd
+- cp 02-cos-immutable-rootfs.conf /etc/dracut.conf.d
diff --git a/packages/immutable-rootfs/definition.yaml b/packages/immutable-rootfs/definition.yaml
@@ -1,3 +1,3 @@
 name: "immutable-rootfs"
 category: "system"
-version: "0.0.24"
+version: "0.0.30"
diff --git a/packages/recovery-img/definition.yaml b/packages/recovery-img/definition.yaml
@@ -1,4 +1,4 @@
 name: "cos-img"
 category: "recovery"
-version: 0.5.3+2
+version: 0.5.3+5
 brand_name: "cOS"
diff --git a/packages/recovery-img/squash/definition.yaml b/packages/recovery-img/squash/definition.yaml
@@ -1,3 +1,3 @@
 name: "cos-squash"
 category: "recovery"
-version: "0.5.3+1"
+version: "0.5.3+5"