From 3c29a4d7599ff857bda13f4e7ef8ee367ae793f3 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 21:56:17 +0100
Subject: [PATCH] update to 046 [release 046-1mamba;Tue Jan 02 2018]

---
 ...patch => dracut-046-nfs-var-statd-sm.patch |  9 ++++----
 dracut.spec                                   | 21 ++++++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)
 rename dracut-032-nfs-var-statd-sm.patch => dracut-046-nfs-var-statd-sm.patch (51%)

diff --git a/dracut-032-nfs-var-statd-sm.patch b/dracut-046-nfs-var-statd-sm.patch
similarity index 51%
rename from dracut-032-nfs-var-statd-sm.patch
rename to dracut-046-nfs-var-statd-sm.patch
index 3a6cc77..6c80811 100644
--- a/dracut-032-nfs-var-statd-sm.patch
+++ b/dracut-046-nfs-var-statd-sm.patch
@@ -1,10 +1,9 @@
-diff -Nru dracut-032.orig/modules.d/95nfs/module-setup.sh dracut-032/modules.d/95nfs/module-setup.sh
---- dracut-032.orig/modules.d/95nfs/module-setup.sh	2013-08-20 13:08:52.000000000 +0200
-+++ dracut-032/modules.d/95nfs/module-setup.sh	2013-08-30 12:07:02.965711902 +0200
-@@ -58,7 +58,7 @@
+--- dracut-046/modules.d/95nfs/module-setup.sh.orig	2018-01-02 01:01:26.222284736 +0100
++++ dracut-046/modules.d/95nfs/module-setup.sh	2018-01-02 01:01:38.984327676 +0100
+@@ -101,7 +101,7 @@
      inst "$moddir/nfs-lib.sh" "/lib/nfs-lib.sh"
      mkdir -m 0755 -p "$initdir/var/lib/nfs/rpc_pipefs"
-     mkdir -m 0755 -p "$initdir/var/lib/rpcbind"
+     mkdir -m 0770 -p "$initdir/var/lib/rpcbind"
 -    mkdir -m 0755 -p "$initdir/var/lib/nfs/statd/sm"
 +    mkdir -m 0755 -p "$initdir/var/lib/nfs/sm"
  
diff --git a/dracut.spec b/dracut.spec
index d61e344..541d87b 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,6 +1,6 @@
 Name:          dracut
-Version:       044.20161015git
-Release:       3mamba
+Version:       046
+Release:       1mamba
 Summary:       Generic, modular initramfs generation tool that can be used across various distributions
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -8,7 +8,7 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://sourceforge.net/apps/trac/dracut/
 #Source:        http://ftp.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
-Source:        https://github.com/dracutdevs/dracut.git/master/dracut-%{version}.tar.bz2
+Source:        https://github.com/dracutdevs/dracut.git/%{version}/dracut-%{version}.tar.bz2
 Source1:       dracut-openmamba.conf
 Source2:       dracut-openmamba.png
 Patch0:        %{name}-020-openmamba_logo_release.patch
@@ -17,7 +17,7 @@ Patch6:        %{name}-037-mkinitrd-hostonly.patch
 Patch8:        %{name}-037-fix_devpts_gid.patch
 Patch10:       %{name}-037-i18n_install_locale-archive.patch
 Patch15:       dracut-027-find-systemdutildir.patch
-Patch16:       dracut-032-nfs-var-statd-sm.patch
+Patch16:       dracut-046-nfs-var-statd-sm.patch
 Patch17:       dracut-032-fix-libdirs.patch
 Patch18:       dracut-040-fix-udevdir-detection.patch
 Patch19:       dracut-040-no-gzip-rsyncable.patch
@@ -114,7 +114,7 @@ This package conatins extra optional modules for dracut.
 #%patch20 -p1
 %patch21 -p1
 #%patch22 -p1
-%patch23 -p1
+#%patch23 -p1
 chmod +x modules.d/99squash-live/*
 
 # remove *.orig files created by patched to prevent from being installed
@@ -217,8 +217,8 @@ fi
 %{_prefix}/lib/dracut/modules.d/50plymouth/*
 %dir %{_prefix}/lib/dracut/modules.d/80cms
 %{_prefix}/lib/dracut/modules.d/80cms/*
-#%dir %{_prefix}/lib/dracut/modules.d/90bcache
-#%{_prefix}/lib/dracut/modules.d/90bcache/module-setup.sh
+%dir %{_prefix}/lib/dracut/modules.d/80lvmmerge
+%{_prefix}/lib/dracut/modules.d/80lvmmerge/*
 %dir %{_prefix}/lib/dracut/modules.d/90btrfs
 %{_prefix}/lib/dracut/modules.d/90btrfs/*
 %dir %{_prefix}/lib/dracut/modules.d/90crypt
@@ -229,6 +229,10 @@ fi
 %{_prefix}/lib/dracut/modules.d/90dmraid/*
 %dir %{_prefix}/lib/dracut/modules.d/90dmsquash-live
 %{_prefix}/lib/dracut/modules.d/90dmsquash-live/*
+%dir %{_prefix}/lib/dracut/modules.d/90dmsquash-live-ntfs
+%{_prefix}/lib/dracut/modules.d/90dmsquash-live-ntfs/*
+%dir %{_prefix}/lib/dracut/modules.d/90multipath-hostonly
+%{_prefix}/lib/dracut/modules.d/90multipath-hostonly/*
 %dir %{_prefix}/lib/dracut/modules.d/90lvm
 %{_prefix}/lib/dracut/modules.d/90lvm/*
 %dir %{_prefix}/lib/dracut/modules.d/90kernel-modules
@@ -367,6 +371,9 @@ fi
 #%doc NEWS README README.generic README.kernel README.modules TODO
 
 %changelog
+* Tue Jan 02 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 046-1mamba
+- update to 046
+
 * Tue Apr 18 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 044.20161015git-3mamba
 - fix posttrans script to avoid creating initramfs if related kernel is missing