summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:33:12 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:33:12 +0000
commita6fbba18331b7ab8aaf019ff957cbecef909d6ec (patch)
tree0341a3d862d73de719dcf337a8f6ae995f439034
parentMerging upstream version 103. (diff)
downloaddracut-a6fbba18331b7ab8aaf019ff957cbecef909d6ec.tar.xz
dracut-a6fbba18331b7ab8aaf019ff957cbecef909d6ec.zip
Adding debian version 103-1.debian/103-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/changelog8
-rw-r--r--debian/dracut-core.install1
-rwxr-xr-xdebian/fix-revdate14
-rw-r--r--debian/patches/debian-initramfs-post-update.patch2
-rw-r--r--debian/patches/rpc-user31
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/udevsettle2
-rw-r--r--debian/patches/vconsole12
8 files changed, 18 insertions, 54 deletions
diff --git a/debian/changelog b/debian/changelog
index 8659511..bdad8e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dracut (103-1) unstable; urgency=low
+
+ * new upstream version 103
+ * sync and delete patches
+ * add new dracut module
+
+ -- Thomas Lange <lange@debian.org> Thu, 25 Jul 2024 13:30:18 +0900
+
dracut (102-3) unstable; urgency=medium
* add module net-lib, Closes: #1072744
diff --git a/debian/dracut-core.install b/debian/dracut-core.install
index 7ed2bd9..781b03f 100644
--- a/debian/dracut-core.install
+++ b/debian/dracut-core.install
@@ -89,6 +89,7 @@ usr/lib/dracut/modules.d/95dasd_mod
usr/lib/dracut/modules.d/95dcssblk
usr/lib/dracut/modules.d/95debug
usr/lib/dracut/modules.d/95fstab-sys
+usr/lib/dracut/modules.d/95hwdb
usr/lib/dracut/modules.d/95lunmask
usr/lib/dracut/modules.d/95nvmf
usr/lib/dracut/modules.d/95resume
diff --git a/debian/fix-revdate b/debian/fix-revdate
index fd1af1c..f3f773e 100755
--- a/debian/fix-revdate
+++ b/debian/fix-revdate
@@ -1,10 +1,10 @@
-sed -i -e '3i:revdate: 2022-08-26' man/dracut-catimages.8.asc
-sed -i -e '3i:revdate: 2023-08-21' man/dracut.8.asc
+sed -i -e '3i:revdate: 2024-06-28' man/dracut-catimages.8.asc
+sed -i -e '3i:revdate: 2024-06-22' man/dracut.8.asc
sed -i -e '3i:revdate: 2023-07-24' man/dracut.bootup.7.asc
-sed -i -e '3i:revdate: 2023-08-21' man/dracut.cmdline.7.asc
-sed -i -e '3i:revdate: 2023-08-21' man/dracut.conf.5.asc
-sed -i -e '3i:revdate: 2023-08-21' man/dracut.modules.7.asc
-sed -i -e '3i:revdate: 2022-08-26' man/lsinitrd.1.asc
+sed -i -e '3i:revdate: 2024-06-01' man/dracut.cmdline.7.asc
+sed -i -e '3i:revdate: 2024-06-28' man/dracut.conf.5.asc
+sed -i -e '3i:revdate: 2024-06-01' man/dracut.modules.7.asc
+sed -i -e '3i:revdate: 2024-04-18' man/lsinitrd.1.asc
sed -i -e '3i:revdate: 2015-03-19' modules.d/98dracut-systemd/dracut-cmdline.service.8.asc
sed -i -e '3i:revdate: 2015-03-19' modules.d/98dracut-systemd/dracut-initqueue.service.8.asc
sed -i -e '3i:revdate: 2015-03-19' modules.d/98dracut-systemd/dracut-mount.service.8.asc
@@ -12,4 +12,4 @@ sed -i -e '3i:revdate: 2015-03-19' modules.d/98dracut-systemd/dracut-pre-mount.s
sed -i -e '3i:revdate: 2015-03-19' modules.d/98dracut-systemd/dracut-pre-pivot.service.8.asc
sed -i -e '3i:revdate: 2015-03-19' modules.d/98dracut-systemd/dracut-pre-trigger.service.8.asc
sed -i -e '3i:revdate: 2015-03-19' modules.d/98dracut-systemd/dracut-pre-udev.service.8.asc
-sed -i -e '3i:revdate: 2022-02-02' modules.d/98dracut-systemd/dracut-shutdown.service.8.asc
+sed -i -e '3i:revdate: 2024-07-07' modules.d/98dracut-systemd/dracut-shutdown.service.8.asc
diff --git a/debian/patches/debian-initramfs-post-update.patch b/debian/patches/debian-initramfs-post-update.patch
index e2b5da8..b8aeafe 100644
--- a/debian/patches/debian-initramfs-post-update.patch
+++ b/debian/patches/debian-initramfs-post-update.patch
@@ -9,7 +9,7 @@ Last-Update: 2022-11-17
--- a/dracut.sh
+++ b/dracut.sh
-@@ -2685,4 +2685,10 @@
+@@ -2673,4 +2673,10 @@
fi
fi
diff --git a/debian/patches/rpc-user b/debian/patches/rpc-user
deleted file mode 100644
index e9a8b8e..0000000
--- a/debian/patches/rpc-user
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/modules.d/95nfs/nfs-start-rpc.sh
-+++ b/modules.d/95nfs/nfs-start-rpc.sh
-@@ -9,7 +9,7 @@
- command -v portmap > /dev/null && [ -z "$(pidof portmap)" ] && portmap
- if command -v rpcbind > /dev/null && [ -z "$(pidof rpcbind)" ]; then
- mkdir -p /run/rpcbind
-- chown rpc:rpc /run/rpcbind
-+ chown _rpc:root /run/rpcbind
- rpcbind
- fi
-
---- a/modules.d/95nfs/parse-nfsroot.sh
-+++ b/modules.d/95nfs/parse-nfsroot.sh
-@@ -126,5 +126,5 @@
- # rpc user needs to be able to write to this directory to save the warmstart
- # file
- mkdir -p /var/lib/rpcbind
--chown rpc:rpc /var/lib/rpcbind
-+chown _rpc:root /var/lib/rpcbind
- chmod 770 /var/lib/rpcbind
---- a/modules.d/95nfs/module-setup.sh
-+++ b/modules.d/95nfs/module-setup.sh
-@@ -125,7 +125,7 @@
-
- # Rather than copy the passwd file in, just set a user for rpcbind
- # We'll save the state and restart the daemon from the root anyway
-- grep -E '^nfsnobody:|^rpc:|^rpcuser:' "$dracutsysrootdir"/etc/passwd >> "$initdir/etc/passwd"
-+ grep -E '^nfsnobody:|^_rpc:|^rpcuser:' "$dracutsysrootdir"/etc/passwd >> "$initdir/etc/passwd"
- grep -E '^nogroup:|^rpc:|^nobody:' "$dracutsysrootdir"/etc/group >> "$initdir/etc/group"
-
- dracut_need_initqueue
diff --git a/debian/patches/series b/debian/patches/series
index 901d431..6cbc151 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-rpc-user
udevsettle
nm-path
-vconsole
debian-initramfs-post-update.patch
diff --git a/debian/patches/udevsettle b/debian/patches/udevsettle
index 3c14803..49246e2 100644
--- a/debian/patches/udevsettle
+++ b/debian/patches/udevsettle
@@ -1,6 +1,6 @@
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
-@@ -157,6 +157,7 @@
+@@ -159,6 +159,7 @@
# then the rest
udevadm trigger --type=subsystems --action=add > /dev/null 2>&1
udevadm trigger --type=devices --action=add > /dev/null 2>&1
diff --git a/debian/patches/vconsole b/debian/patches/vconsole
deleted file mode 100644
index 569b375..0000000
--- a/debian/patches/vconsole
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/modules.d/00systemd/module-setup.sh
-+++ b/modules.d/00systemd/module-setup.sh
-@@ -158,7 +158,8 @@
- emergency.target \
- rescue.target; do
- [[ -f "$systemdsystemunitdir"/$i ]] || continue
-- $SYSTEMCTL -q --root "$initdir" add-wants "$i" systemd-vconsole-setup.service
-+ # $SYSTEMCTL -q --root "$initdir" add-wants "$i" systemd-vconsole-setup.service
-+ true
- done
-
- mkdir -p "$initdir/etc/systemd"