slackware-current/source/a/mkinitrd/0010-fix-test-for-jfs-xfs-repair-tools.patch
Patrick J Volkerding 2dbdcbb842 Tue Nov 21 21:15:30 UTC 2023
We have fresh 6.6 kernels in /testing! You may notice that on the 32-bit side
we have done away with the -smp labeled kernel packages, but it's actually the
other kernels that were retired -- the non-SMP, non-PAE ones. If you were
previously using kernel-generic-smp or kernel-huge-smp, you'll need to make
some adjustments to your bootloader setup to load kernel-generic or kernel-huge
instead. About the only non-obsolete CPUs that may have an issue with this are
the first generation Pentium M chips, which supported PAE but unfortunately did
not advertise this in the CPU flags. But these will support PAE if the kernel
option "forcepae" is appended at boot time. Enjoy! :-)
a/gettext-0.22.4-x86_64-1.txz:  Upgraded.
a/kbd-2.6.3-x86_64-3.txz:  Rebuilt.
  Installed extra console fonts.
a/kernel-firmware-20231120_9552083-noarch-1.txz:  Upgraded.
a/kernel-generic-6.1.63-x86_64-1.txz:  Upgraded.
a/kernel-huge-6.1.63-x86_64-1.txz:  Upgraded.
a/kernel-modules-6.1.63-x86_64-1.txz:  Upgraded.
a/mkinitrd-1.4.11-x86_64-34.txz:  Rebuilt.
  Fix tests for including jfs/xfs repair tools. Thanks to regdub.
a/pkgtools-15.1-noarch-8.txz:  Rebuilt.
  Make vim the default vi choice.
ap/vim-9.0.2116-x86_64-1.txz:  Upgraded.
d/gettext-tools-0.22.4-x86_64-1.txz:  Upgraded.
d/git-2.43.0-x86_64-1.txz:  Upgraded.
d/kernel-headers-6.1.63-x86-1.txz:  Upgraded.
d/mercurial-6.6-x86_64-1.txz:  Upgraded.
d/meson-1.3.0-x86_64-1.txz:  Upgraded.
d/scons-4.6.0-x86_64-1.txz:  Upgraded.
k/kernel-source-6.1.63-noarch-1.txz:  Upgraded.
l/readline-8.2.007-x86_64-1.txz:  Upgraded.
n/c-ares-1.22.1-x86_64-1.txz:  Upgraded.
n/nfs-utils-2.6.4-x86_64-1.txz:  Upgraded.
x/libdrm-2.4.118-x86_64-1.txz:  Upgraded.
xap/mozilla-firefox-115.5.0esr-x86_64-1.txz:  Upgraded.
  This update contains security fixes and improvements.
  Thanks to zuriel for the taskbar icon fix on Wayland. :-)
  For more information, see:
    https://www.mozilla.org/en-US/firefox/115.5.0/releasenotes/
    https://www.mozilla.org/security/advisories/mfsa2023-50/
    https://www.cve.org/CVERecord?id=CVE-2023-6204
    https://www.cve.org/CVERecord?id=CVE-2023-6205
    https://www.cve.org/CVERecord?id=CVE-2023-6206
    https://www.cve.org/CVERecord?id=CVE-2023-6207
    https://www.cve.org/CVERecord?id=CVE-2023-6208
    https://www.cve.org/CVERecord?id=CVE-2023-6209
    https://www.cve.org/CVERecord?id=CVE-2023-6212
  (* Security fix *)
xap/vim-gvim-9.0.2116-x86_64-1.txz:  Upgraded.
xap/xsnow-3.7.6-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
testing/packages/kernel-generic-6.6.2-x86_64-1.txz:  Added.
testing/packages/kernel-headers-6.6.2-x86-1.txz:  Added.
testing/packages/kernel-huge-6.6.2-x86_64-1.txz:  Added.
testing/packages/kernel-modules-6.6.2-x86_64-1.txz:  Added.
testing/packages/kernel-source-6.6.2-noarch-1.txz:  Added.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
2023-11-21 23:50:07 +01:00

26 lines
1.2 KiB
Diff

--- ./mkinitrd.orig 2023-11-20 12:49:33.502016341 -0600
+++ ./mkinitrd 2023-11-20 12:50:30.142017608 -0600
@@ -60,6 +60,8 @@
# Modified by Piter Punk <piterpunk@slackware.com> 25 April 2022
# Add support to specify additional filesystems to be mounted by
# initrd. Useful for those that have a separated '/usr'
+# Modified by Patrick Volkerding <volkerdi@slackware.com> 20 Movember 2023
+# Add jfs/xfs repair tools if used for $ROOTFS
MKINITRD_VERSION=1.4.11
@@ -773,10 +775,11 @@
/sbin/modprobe --set-version $kver --show-depends --ignore-install $MODULE 2>/dev/null \
| grep "^insmod " | cut -f 2 -d ' ' | while read SRCMOD; do
- # If jfs or xfs filesystems are in use, add the repair tools to the initrd:
- if [ "$(basename $SRCMOD .ko)" = "jfs" ]; then
+ # If the root filesystem is jfs, add the repair tools to the initrd:
+ if [ "$ROOTFS" = "jfs" ]; then
cp -a /sbin/jfs_fsck $SOURCE_TREE/sbin/
- elif [ "$(basename $SRCMOD .ko)" = "xfs" ]; then
+ # If the root filesystem is xfs, add the repair tools to the initrd:
+ elif [ "$ROOTFS" = "xfs" ]; then
cp -a /sbin/xfs_repair $SOURCE_TREE/sbin/
fi