automatic import of dracutopeneuler20.03

1 files changed, 73 insertions, 0 deletions

diff --git a/summer-ospp-replace-isomd5sum-with-isosm3sum.patch b/summer-ospp-replace-isomd5sum-with-isosm3sum.patch
new file mode 100644
index 0000000..532f0c9
--- /dev/null
+++ b/summer-ospp-replace-isomd5sum-with-isosm3sum.patch
@@ -0,0 +1,73 @@
+From a924671594ab5026b06088f9f5edf7146d850317 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 7 Sep 2023 03:20:57 +0000
+Subject: [PATCH] summer ospp replace isomd5sum with isosm3sum
+
+Signed-off-by: rpm-build <rpm-build>
+---
+ modules.d/90dmsquash-live/checkisosm3@.service  | 14 ++++++++++++++
+ modules.d/90dmsquash-live/dmsquash-live-root.sh |  4 ++--
+ modules.d/90dmsquash-live/module-setup.sh       |  4 ++--
+ 3 files changed, 18 insertions(+), 4 deletions(-)
+ create mode 100644 modules.d/90dmsquash-live/checkisosm3@.service
+
+diff --git a/modules.d/90dmsquash-live/checkisosm3@.service b/modules.d/90dmsquash-live/checkisosm3@.service
+new file mode 100644
+index 0000000..8bd24e8
+--- /dev/null
++++ b/modules.d/90dmsquash-live/checkisosm3@.service
+@@ -0,0 +1,14 @@
++[Unit]
++Description=Media check on %f
++DefaultDependencies=no
++Before=shutdown.target
++
++[Service]
++Type=oneshot
++RemainAfterExit=no
++ExecStart=/bin/checkisosm3 --verbose %f
++StandardInput=tty-force
++StandardOutput=inherit
++StandardError=inherit
++TimeoutSec=0
++SuccessExitStatus=2
+diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+index 0912807..6b14dc4 100755
+--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+@@ -43,9 +43,9 @@ if [ -n "$check" ]; then
+     type plymouth > /dev/null 2>&1 && plymouth --hide-splash
+     if [ -n "$DRACUT_SYSTEMD" ]; then
+         p=$(dev_unit_name "$livedev")
+-        systemctl start checkisomd5@"${p}".service
++        systemctl start checkisosm3@"${p}".service
+     else
+-        checkisomd5 --verbose "$livedev"
++        checkisosm3 --verbose "$livedev"
+     fi
+     if [ $? -eq 1 ]; then
+         die "CD check failed!"
+diff --git a/modules.d/90dmsquash-live/module-setup.sh b/modules.d/90dmsquash-live/module-setup.sh
+index 70be185..7e43841 100755
+--- a/modules.d/90dmsquash-live/module-setup.sh
++++ b/modules.d/90dmsquash-live/module-setup.sh
+@@ -23,7 +23,7 @@ installkernel() {
+ # called by dracut
+ install() {
+     inst_multiple umount dmsetup blkid dd losetup blockdev find
+-    inst_multiple -o checkisomd5
++    inst_multiple -o checkisosm3
+     inst_hook cmdline 30 "$moddir/parse-dmsquash-live.sh"
+     inst_hook cmdline 31 "$moddir/parse-iso-scan.sh"
+     inst_hook pre-udev 30 "$moddir/dmsquash-live-genrules.sh"
+@@ -34,6 +34,6 @@ install() {
+     inst_script "$moddir/dmsquash-generator.sh" "$systemdutildir"/system-generators/dracut-dmsquash-generator
+     # should probably just be generally included
+     inst_rules 60-cdrom_id.rules
+-    inst_simple "$moddir/checkisomd5@.service" "/etc/systemd/system/checkisomd5@.service"
++    inst_simple "$moddir/checkisosm3@.service" "/etc/systemd/system/checkisosm3@.service"
+     dracut_need_initqueue
+ }
+-- 
+2.33.0
+