From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Mon, 22 Sep 2025 22:46:18 +0000 (-0400)
Subject: fix(systemd-portabled): do not call portablectl
X-Git-Tag: 110~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a0b1f4ebbfc5233f190df00640d790ebdb5b44d;p=thirdparty%2Fdracut-ng.git

fix(systemd-portabled): do not call portablectl

Drop the portablectl call altogether and stop adding
{/etc,/var,usr}/lib/portables/*.raw to the initramfs automatically.

These .raw files are full OS trees and are rather huge, adding a
specific .raw one manually seems like a legit use-case.
---

diff --git a/modules.d/11systemd-portabled/module-setup.sh b/modules.d/11systemd-portabled/module-setup.sh
index 85ed6adea..fbc62e1f3 100755
--- a/modules.d/11systemd-portabled/module-setup.sh
+++ b/modules.d/11systemd-portabled/module-setup.sh
@@ -31,18 +31,7 @@ installkernel() {
 
 # Install the required file(s) and directories for the module in the initramfs.
 install() {
-
-    # It's intended to work only with raw binary disk images contained in
-    # regular files, but not with directory trees.
-    local _nonraw
-    _nonraw=$(portablectl --no-pager --no-legend list | grep -v " raw " | cut -d ' ' -f1 | tr '\n' ' ')
-    if [ -n "$_nonraw" ]; then
-        dwarn "systemd-portabled: this module only installs raw disk images in the initramfs; skipping: $_nonraw"
-    fi
-
     inst_multiple -o \
-        "/var/lib/portables/*.raw" \
-        "/usr/lib/portables/*.raw" \
         "$tmpfilesdir/portables.conf" \
         "$dbussystem"/org.freedesktop.portable1.conf \
         "$dbussystemservices"/org.freedesktop.portable1.service \
@@ -66,7 +55,6 @@ install() {
     # Install the hosts local user configurations if enabled.
     if [[ $hostonly ]]; then
         inst_multiple -H -o \
-            "/etc/portables/*.raw" \
             "$systemdutilconfdir/system.attached/*" \
             "$systemdutilconfdir/system.attached/*/*" \
             "$systemdutilconfdir/portable/profile/default/*.conf" \