Source: dracut
Version: 051
Severity: minor
Tags: patch
Hi Thomas, et al,
the attached debdiff updates the debian/ directory to work with
upstream version 055.
Thanks to Andre Russ for preparing the patch updates; thanks to
credativ for sponsoring Debian work!
Thomas, if you are ok, I would upload to experimental.
Cheers,
Nik
diff -Nru dracut-051/debian/changelog dracut-055/debian/changelog
--- dracut-051/debian/changelog 2020-12-15 16:23:33.000000000 +0100
+++ dracut-055/debian/changelog 2021-08-05 13:31:22.000000000 +0200
@@ -1,3 +1,20 @@
+dracut (055-1) UNRELEASED; urgency=medium
+
+ [ Dominik George ]
+ * Team upload.
+ * New upstream version
+
+ [ Andre Russ ]
+ * Refresh patches for dracut 055
+ + systemd needs more users in Debian
+ + crc32c patch was applied upstream
+ + several minor changes
+ * Update installed files
+ + Several docs were moved upstream
+ + mkinitrd was removed
+
+ -- Dominik George <naturesha...@debian.org> Thu, 05 Aug 2021 13:31:22 +0200
+
dracut (051-1) unstable; urgency=low
* new upstream version
diff -Nru dracut-051/debian/dracut-core.docs dracut-055/debian/dracut-core.docs
--- dracut-051/debian/dracut-core.docs 2020-12-15 15:29:17.000000000 +0100
+++ dracut-055/debian/dracut-core.docs 2021-08-05 13:31:22.000000000 +0200
@@ -1,10 +1,8 @@
AUTHORS
-HACKING
-NEWS
+docs/HACKING.md
+NEWS.md
README.md
-README.cross
-README.generic
-README.kernel
-README.modules
-TODO
+docs/README.cross
+docs/README.generic
+docs/README.kernel
dracut.html
diff -Nru dracut-051/debian/dracut-core.install
dracut-055/debian/dracut-core.install
--- dracut-051/debian/dracut-core.install 2020-12-15 15:29:17.000000000
+0100
+++ dracut-055/debian/dracut-core.install 2021-08-05 13:31:22.000000000
+0200
@@ -1,6 +1,5 @@
usr/bin/dracut
usr/bin/dracut-catimages
-usr/bin/mkinitrd
usr/bin/lsinitrd
usr/lib/dracut/dracut-functions
usr/lib/dracut/dracut-functions.sh
@@ -19,7 +18,6 @@
debian/90overlay-root usr/lib/dracut/modules.d
modules.d/00dash usr/lib/dracut/modules.d
modules.d/00bash usr/lib/dracut/modules.d
-modules.d/00bootchart usr/lib/dracut/modules.d
modules.d/00systemd usr/lib/dracut/modules.d
modules.d/01fips usr/lib/dracut/modules.d
modules.d/01systemd-initrd usr/lib/dracut/modules.d
diff -Nru dracut-051/debian/dracut-core.manpages
dracut-055/debian/dracut-core.manpages
--- dracut-051/debian/dracut-core.manpages 2020-12-15 15:29:17.000000000
+0100
+++ dracut-055/debian/dracut-core.manpages 2021-08-05 13:31:22.000000000
+0200
@@ -1,9 +1,8 @@
-dracut.8
-dracut.conf.5
-dracut.modules.7
-dracut.bootup.7
-dracut.cmdline.7
-dracut-catimages.8
-lsinitrd.1
-mkinitrd.8
+man/dracut.8
+man/dracut.conf.5
+man/dracut.modules.7
+man/dracut.bootup.7
+man/dracut.cmdline.7
+man/dracut-catimages.8
+man/lsinitrd.1
debian/tmp/usr/share/man/man8/*
diff -Nru dracut-051/debian/dracut-network.install
dracut-055/debian/dracut-network.install
--- dracut-051/debian/dracut-network.install 2020-12-15 15:29:17.000000000
+0100
+++ dracut-055/debian/dracut-network.install 2021-08-05 13:31:22.000000000
+0200
@@ -1,5 +1,5 @@
debian/etc/11-ifcfg.conf etc/dracut.conf.d
-modules.d/02systemd-networkd usr/lib/dracut/modules.d
+modules.d/01systemd-networkd usr/lib/dracut/modules.d
modules.d/35network-manager usr/lib/dracut/modules.d
modules.d/35network-legacy usr/lib/dracut/modules.d
modules.d/40network usr/lib/dracut/modules.d
diff -Nru dracut-051/debian/patches/crc32c dracut-055/debian/patches/crc32c
--- dracut-051/debian/patches/crc32c 2020-12-15 15:29:17.000000000 +0100
+++ dracut-055/debian/patches/crc32c 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- a/modules.d/99fs-lib/module-setup.sh
-+++ b/modules.d/99fs-lib/module-setup.sh
-@@ -38,7 +38,7 @@
- include_fs_helper_modules() {
- local dev=$1 fs=$2
- case "$fs" in
-- xfs|btrfs|ext4)
-+ xfs|btrfs|ext4|ext3)
- instmods crc32c
- ;;
- f2fs)
diff -Nru dracut-051/debian/patches/dev-shm-mount
dracut-055/debian/patches/dev-shm-mount
--- dracut-051/debian/patches/dev-shm-mount 2020-12-15 15:29:17.000000000
+0100
+++ dracut-055/debian/patches/dev-shm-mount 2021-08-05 13:31:22.000000000
+0200
@@ -1,14 +1,14 @@
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
-@@ -57,11 +57,6 @@
- mount -t devpts -o gid=5,mode=620,noexec,nosuid devpts /dev/pts >/dev/null
+@@ -55,11 +55,6 @@
+ mount -t devpts -o gid=5,mode=620,noexec,nosuid devpts /dev/pts >
/dev/null
fi
-if ! ismounted /dev/shm; then
-- mkdir -m 0755 /dev/shm
-- mount -t tmpfs -o mode=1777,noexec,nosuid,nodev,strictatime tmpfs
/dev/shm >/dev/null
+- mkdir -m 0755 -p /dev/shm
+- mount -t tmpfs -o mode=1777,noexec,nosuid,nodev,strictatime tmpfs
/dev/shm > /dev/null
-fi
-
if ! ismounted /run; then
- mkdir -m 0755 /newrun
+ mkdir -m 0755 -p /newrun
if ! str_starts "$(readlink -f /bin/sh)" "/run/"; then
diff -Nru dracut-051/debian/patches/initrd-not-initramfs.patch
dracut-055/debian/patches/initrd-not-initramfs.patch
--- dracut-051/debian/patches/initrd-not-initramfs.patch 2020-12-15
15:29:17.000000000 +0100
+++ dracut-055/debian/patches/initrd-not-initramfs.patch 2021-08-05
13:31:22.000000000 +0200
@@ -1,16 +1,18 @@
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
-@@ -19,7 +19,7 @@
- if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID}
]] ; then
+@@ -24,8 +24,8 @@
+ && [[ $MACHINE_ID ]] \
+ && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]]; then
IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
- fi
--[[ -f $IMG ]] || IMG="/boot/initramfs-${KERNEL_VERSION}.img"
-+[[ -f $IMG ]] || IMG="/boot/initrd.img-${KERNEL_VERSION}"
-
- cd /run/initramfs
-
---- a/dracut.8.asc
-+++ b/dracut.8.asc
+-elif [[ -f /boot/initramfs-${KERNEL_VERSION}.img ]]; then
+- IMG="/boot/initramfs-${KERNEL_VERSION}.img"
++elif [[ -f /boot/initrd.img-${KERNEL_VERSION} ]]; then
++ IMG="/boot/initrd.img-${KERNEL_VERSION}"
+ elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then
+ IMG="/lib/modules/${KERNEL_VERSION}/initrd"
+ else
+--- a/man/dracut.8.asc
++++ b/man/dracut.8.asc
@@ -19,7 +19,7 @@
Create an initramfs <image> for the kernel with the version <kernel version>.
If <kernel version> is omitted, then the version of the actual running
@@ -22,13 +24,13 @@
device modules (such as IDE, SCSI or RAID) which are needed to access the root
--- a/dracut.sh
+++ b/dracut.sh
-@@ -836,11 +836,11 @@
+@@ -1039,11 +1039,11 @@
outfile="$dracutsysrootdir$efidir/Linux/linux-$kernel${MACHINE_ID:+-${MACHINE_ID}}${BUILD_ID:+-${BUILD_ID}}.efi"
else
- if [[ -e "$dracutsysrootdir/boot/vmlinuz-$kernel" ]]; then
+ if [[ -e $dracutsysrootdir/boot/vmlinuz-$kernel ]]; then
- outfile="/boot/initramfs-$kernel.img"
+ outfile="/boot/initrd.img-$kernel"
- elif [[ $MACHINE_ID ]] && ( [[ -d
$dracutsysrootdir/boot/${MACHINE_ID} ]] || [[ -L
$dracutsysrootdir/boot/${MACHINE_ID} ]] ); then
+ elif [[ $MACHINE_ID ]] && { [[ -d
$dracutsysrootdir/boot/${MACHINE_ID} ]] || [[ -L
$dracutsysrootdir/boot/${MACHINE_ID} ]]; }; then
outfile="$dracutsysrootdir/boot/${MACHINE_ID}/$kernel/initrd"
else
- outfile="$dracutsysrootdir/boot/initramfs-$kernel.img"
@@ -36,8 +38,8 @@
fi
fi
fi
---- a/dracut.usage.asc
-+++ b/dracut.usage.asc
+--- a/man/dracut.usage.asc
++++ b/man/dracut.usage.asc
@@ -5,7 +5,7 @@
This will generate a general purpose initramfs image, with all possible
@@ -47,8 +49,8 @@
contains the kernel modules of the currently active kernel with version
_++<kernel version>++_.
---- a/lsinitrd.1.asc
-+++ b/lsinitrd.1.asc
+--- a/man/lsinitrd.1.asc
++++ b/man/lsinitrd.1.asc
@@ -19,7 +19,7 @@
-----------
lsinitrd shows the contents of an initramfs image. if <image> is omitted, then
@@ -60,8 +62,8 @@
-------
--- a/lsinitrd.sh
+++ b/lsinitrd.sh
-@@ -102,7 +102,7 @@
- && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
+@@ -120,7 +120,7 @@
+ && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]]; then
image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
else
- image="/boot/initramfs-${KERNEL_VERSION}.img"
@@ -69,25 +71,14 @@
fi
fi
---- a/mkinitrd-dracut.sh
-+++ b/mkinitrd-dracut.sh
-@@ -16,7 +16,7 @@
- $cmd " [--nocompress]"
- $cmd " <initrd-image> <kernel-version>"
- $cmd ""
-- $cmd " (ex: ${0##*/} /boot/initramfs-$kver.img $kver)"
-+ $cmd " (ex: ${0##*/} /boot/initrd.img-$kver $kver)"
-
- [[ $1 = '-n' ]] && exit 0
- exit 1
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
-@@ -86,7 +86,7 @@
+@@ -99,7 +99,7 @@
done
inst_simple /etc/os-release
inst ./test-init.sh /sbin/init
- inst "$TESTDIR"/initramfs.testing "/boot/initramfs-$KVERSION.img"
+ inst "$TESTDIR"/initramfs.testing "/boot/initrd.img-$KVERSION"
- [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
-
+ [[ -f /etc/machine-id ]] && read -r MACHINE_ID < /etc/machine-id
+
VMLINUZ="/lib/modules/${KVERSION}/vmlinuz"
diff -Nru dracut-051/debian/patches/multipath
dracut-055/debian/patches/multipath
--- dracut-051/debian/patches/multipath 2020-12-15 15:29:17.000000000 +0100
+++ dracut-055/debian/patches/multipath 2021-08-05 13:31:22.000000000 +0200
@@ -1,11 +1,11 @@
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
-@@ -102,7 +102,7 @@
- inst $(command -v partx) /sbin/partx
+@@ -108,7 +108,7 @@
+ inst "$(command -v partx)" /sbin/partx
inst_libdir_file "libmultipath*" "multipath/*"
- inst_libdir_file 'libgcc_s.so*'
+ inst_libdir_file 'libgcc_s.so*' 'libaio.so*'
- if [[ $hostonly_cmdline ]] ; then
- local _conf=$(cmdline)
+ if [[ $hostonly_cmdline ]]; then
+ local _conf
diff -Nru dracut-051/debian/patches/series dracut-055/debian/patches/series
--- dracut-051/debian/patches/series 2020-12-15 15:29:17.000000000 +0100
+++ dracut-055/debian/patches/series 2021-08-05 13:31:22.000000000 +0200
@@ -1,7 +1,7 @@
vconsole
microcode
-crc32c
plymouth
multipath
initrd-not-initramfs.patch
dev-shm-mount
+systemd-users
diff -Nru dracut-051/debian/patches/systemd-udev
dracut-055/debian/patches/systemd-udev
--- dracut-051/debian/patches/systemd-udev 2020-12-15 15:29:17.000000000
+0100
+++ dracut-055/debian/patches/systemd-udev 1970-01-01 01:00:00.000000000
+0100
@@ -1,14 +0,0 @@
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1736,10 +1736,9 @@
- _src="*"
- dinfo "*** Constructing ${ucode_dest[$idx]} ***"
- if [[ $hostonly ]]; then
-- _src=$(get_ucode_file)
-+ _src="$(get_ucode_file)*"
- [[ $_src ]] || break
- [[ -r $_fwdir/$_fw/$_src ]] || _src="${_src}.early"
-- [[ -r $_fwdir/$_fw/$_src ]] || break
- fi
-
- for i in $_fwdir/$_fw/$_src; do
diff -Nru dracut-051/debian/patches/systemd-users
dracut-055/debian/patches/systemd-users
--- dracut-051/debian/patches/systemd-users 1970-01-01 01:00:00.000000000
+0100
+++ dracut-055/debian/patches/systemd-users 2021-08-05 13:31:22.000000000
+0200
@@ -0,0 +1,20 @@
+--- a/modules.d/00systemd/module-setup.sh 2021-05-27 12:34:19.000000000
+0000
++++ b/modules.d/00systemd/module-setup.sh 2021-07-26 22:13:44.847143617
+0000
+@@ -201,6 +201,8 @@
+ grep '^adm:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
+ # we don't use systemd-networkd, but the user is in systemd.conf
tmpfiles snippet
+ grep '^systemd-network:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
++ grep '^systemd-timesync:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
++ grep '^systemd-resolve:' "$dracutsysrootdir"/etc/passwd 2> /dev/null
+ } >> "$initdir/etc/passwd"
+
+ {
+@@ -211,6 +213,8 @@
+ grep '^root:' "$dracutsysrootdir"/etc/group 2> /dev/null
+ # we don't use systemd-networkd, but the user is in systemd.conf
tmpfiles snippet
+ grep '^systemd-network:' "$dracutsysrootdir"/etc/group 2> /dev/null
++ grep '^systemd-timesync:' "$dracutsysrootdir"/etc/group 2> /dev/null
++ grep '^systemd-resolve:' "$dracutsysrootdir"/etc/group 2> /dev/null
+ } >> "$initdir/etc/group"
+
+ ln_r "$systemdutildir"/systemd "/init"
diff -Nru dracut-051/debian/patches/vconsole dracut-055/debian/patches/vconsole
--- dracut-051/debian/patches/vconsole 2020-12-15 15:29:17.000000000 +0100
+++ dracut-055/debian/patches/vconsole 2021-08-05 13:31:22.000000000 +0200
@@ -1,12 +1,12 @@
--- a/modules.d/00systemd/module-setup.sh
+++ b/modules.d/00systemd/module-setup.sh
-@@ -242,7 +242,8 @@
- systemd-ask-password-plymouth.service \
- ; 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
+@@ -232,7 +232,8 @@
+ systemd-ask-password-console.service \
+ systemd-ask-password-plymouth.service; 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"
