diff --git a/0001-dmsquash-for-isoft-sw.patch b/0001-dmsquash-for-isoft-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..1aa03fd881d8cdb3734bd1e6f68312be131241f7 --- /dev/null +++ b/0001-dmsquash-for-isoft-sw.patch @@ -0,0 +1,99 @@ +From d84615fec9abd845bb6ceb1eb9c4f6ac27cc8458 Mon Sep 17 00:00:00 2001 +From: isoft +Date: Fri, 4 Nov 2022 03:28:15 +0000 +Subject: [PATCH] dmsquash for isoft sw + +--- + .../90dmsquash-live/dmsquash-generator.sh | 4 ++-- + .../90dmsquash-live/dmsquash-live-root.sh | 18 +++++++++--------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/modules.d/90dmsquash-live/dmsquash-generator.sh b/modules.d/90dmsquash-live/dmsquash-generator.sh +index fe25e99..3390295 100755 +--- a/modules.d/90dmsquash-live/dmsquash-generator.sh ++++ b/modules.d/90dmsquash-live/dmsquash-generator.sh +@@ -75,6 +75,6 @@ ROOTFLAGS="$(getarg rootflags)" + mkdir -p "$GENERATOR_DIR/$_dev.device.d" + { + echo "[Unit]" +- echo "JobTimeoutSec=3000" +- echo "JobRunningTimeoutSec=3000" ++ echo "JobTimeoutSec=300" ++ echo "JobRunningTimeoutSec=300" + } > "$GENERATOR_DIR/$_dev.device.d/timeout.conf" +diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh +index 0912807..ae9bc63 100755 +--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh ++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh +@@ -18,9 +18,9 @@ livedev="$1" + # parse various live image specific options that make sense to be + # specified as their own things + live_dir=$(getarg rd.live.dir -d live_dir) +-[ -z "$live_dir" ] && live_dir="LiveOS" ++[ -z "$live_dir" ] && live_dir="isoft/sw64" + squash_image=$(getarg rd.live.squashimg) +-[ -z "$squash_image" ] && squash_image="squashfs.img" ++[ -z "$squash_image" ] && squash_image="root-image.fs.sfs" + + getargbool 0 rd.live.ram -d -y live_ram && live_ram="yes" + getargbool 0 rd.live.overlay.reset -d -y reset_overlay && reset_overlay="yes" +@@ -292,18 +292,18 @@ if [ -e "$SQUASHED" ]; then + mkdir -m 0755 -p /run/initramfs/squashfs + mount -n -t squashfs -o ro "$SQUASHED_LOOPDEV" /run/initramfs/squashfs + +- if [ -d /run/initramfs/squashfs/LiveOS ]; then +- if [ -f /run/initramfs/squashfs/LiveOS/rootfs.img ]; then +- FSIMG="/run/initramfs/squashfs/LiveOS/rootfs.img" +- elif [ -f /run/initramfs/squashfs/LiveOS/ext3fs.img ]; then +- FSIMG="/run/initramfs/squashfs/LiveOS/ext3fs.img" +- fi +- elif [ -d /run/initramfs/squashfs/proc ]; then ++ if [ -d /run/initramfs/squashfs/proc ]; then + FSIMG=$SQUASHED + if [ -z "$overlayfs" ] && [ -n "$DRACUT_SYSTEMD" ]; then + reloadsysrootmountunit=":>/xor_overlayfs;" + fi + overlayfs="required" ++ else ++ if [ -f /run/initramfs/squashfs/root-image.fs ]; then ++ FSIMG="/run/initramfs/squashfs/root-image.fs" ++ elif [ -f /run/initramfs/squashfs/LiveOS/ext3fs.img ]; then ++ FSIMG="/run/initramfs/squashfs/LiveOS/ext3fs.img" ++ fi + else + die "Failed to find a root filesystem in $SQUASHED." + exit 1 +-- +2.33.0 + +From 7a25d78a282f1aa232f414085a240b7191c8e946 Mon Sep 17 00:00:00 2001 +From: isoft +Date: Fri, 4 Nov 2022 05:36:39 +0000 +Subject: [PATCH] dmsquash for isoft sw + +--- + modules.d/90dmsquash-live/dmsquash-live-root.sh | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh +index ae9bc63..0db97bb 100755 +--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh ++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh +@@ -298,12 +298,8 @@ if [ -e "$SQUASHED" ]; then + reloadsysrootmountunit=":>/xor_overlayfs;" + fi + overlayfs="required" +- else +- if [ -f /run/initramfs/squashfs/root-image.fs ]; then +- FSIMG="/run/initramfs/squashfs/root-image.fs" +- elif [ -f /run/initramfs/squashfs/LiveOS/ext3fs.img ]; then +- FSIMG="/run/initramfs/squashfs/LiveOS/ext3fs.img" +- fi ++ elif [ -f /run/initramfs/squashfs/root-image.fs ]; then ++ FSIMG="/run/initramfs/squashfs/root-image.fs" + else + die "Failed to find a root filesystem in $SQUASHED." + exit 1 +-- +2.33.0 + diff --git a/dracut.spec b/dracut.spec index 72cef0a4e91d1f2e322911e861cbc9c087eb6508..26750f472f869a6f3da89cd4653c2596c43498aa 100644 --- a/dracut.spec +++ b/dracut.spec @@ -9,7 +9,7 @@ Name: dracut Version: 055 -Release: 6 +Release: 7 Summary: Initramfs generator using udev @@ -39,6 +39,9 @@ Patch12: backport-feat-lvm-use-generated-filter-when-none-is-set.patch Patch13: backport-feat-lvm-only-run-lvchange-for-LV-that-is-seen-on-de.patch Patch14: backport-fix-lvm-restore-setting-LVM_MD_PV_ACTIVATED.patch Patch15: backport-Bring-back-51-dracut-rescue-postinst.sh.patch +%ifarch sw_64 +Patch16: 0001-dmsquash-for-isoft-sw.patch +%endif Patch9000: remove-iscsi-related-code-since-it-is-no-longer-main.patch @@ -514,6 +517,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %endif %changelog +* Mon Dec 12 2022 zhangzhixin -005-7 +- Change the installation path of the isoft image software package + * Sun Dec 4 2022 luck - 055-6 - remove iscsi-related code since it is no longer maintained by open-iscsi