diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-09-13 19:16:00 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-09-14 08:59:51 +0200 |
| commit | 054dcd3d5a3815a8088a3f92dd548f909ed23f40 (patch) | |
| tree | 162276381e39d8a243f59c317ba77f54eed7e032 /source/a/mkinitrd/mkinitrd | |
| parent | 1c35025416b4295915f499a01d0cee8899971321 (diff) | |
| download | current-054dcd3d5a3815a8088a3f92dd548f909ed23f40.tar.gz current-054dcd3d5a3815a8088a3f92dd548f909ed23f40.tar.xz | |
Fri Sep 13 19:16:00 UTC 201920190913191600
a/mkinitrd-1.4.11-x86_64-13.txz: Rebuilt.
Add libargon2 and libgcc_s for cryptsetup LUKS2 support.
Add jfs (thanks to gus3 on LQ) and xfs (thanks to klipkyle on LQ) repair
tools to initrd if those filesystems are used.
Support PARTUUID in mkinitrd_command_generator.sh (thanks to luvr on LQ).
Fixes and enhancements to docs suggested on LQ.
Thanks to Robby Workman.
a/sysvinit-2.96-x86_64-1.txz: Upgraded.
ap/vim-8.1.2022-x86_64-1.txz: Upgraded.
d/bison-3.4.2-x86_64-1.txz: Upgraded.
d/ccache-3.7.4-x86_64-1.txz: Upgraded.
d/icecream-1.3-x86_64-1.txz: Upgraded.
d/meson-0.51.2-x86_64-2.txz: Rebuilt.
Fix meson configure crash. Thanks to orbea.
l/dbus-python-1.2.12-x86_64-1.txz: Upgraded.
l/pulseaudio-13.0-x86_64-1.txz: Upgraded.
l/python-certifi-2019.9.11-x86_64-1.txz: Upgraded.
x/libwacom-1.0-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.2022-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/mkinitrd/mkinitrd')
| -rw-r--r-- | source/a/mkinitrd/mkinitrd | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd index 6f4ff3c19..7f921e3bd 100644 --- a/source/a/mkinitrd/mkinitrd +++ b/source/a/mkinitrd/mkinitrd @@ -53,6 +53,10 @@ # output filename. Thanks to SeB. # Modified by Patrick Volkerding <volkerdi@slackware.com> 04 Feb 2019 # Allow specifying more than one kernel version. +# Modified by Robby Workman <rworkman@slackware.com> 05 September 2019 +# to add libargon2 and libgcc_s for cryptsetup LUKS2 support; add +# jfs and xfs repair tools to initrd if those filesystems are used; +# fixes and enhancements to docs MKINITRD_VERSION=1.4.11 @@ -620,6 +624,9 @@ if [ ! -z "$CRYPT" ]; then if [ -e /usr/sbin/cryptsetup ]; then mkdir -p $SOURCE_TREE/sbin cp /usr/sbin/cryptsetup $SOURCE_TREE/sbin/cryptsetup + find /lib /lib64 /usr/lib /usr/lib64 -name "libargon2*so*" 2> /dev/null | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/ + find /lib /lib64 /usr/lib /usr/lib64 -name "libgcc_s*so*" 2> /dev/null | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/ + MODULE_LIST="${MODULE_LIST}:algif_skcipher" if [ ! -e $SOURCE_TREE/sbin/udevadm ]; then cat << EOF > $SOURCE_TREE/sbin/udevadm #!/bin/sh @@ -733,6 +740,13 @@ if [ ! -z "$MODULE_LIST" ]; then /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 + cp -a /sbin/jfs_fsck $SOURCE_TREE/sbin/ + elif [ "$(basename $SRCMOD .ko)" = "xfs" ]; then + cp -a /sbin/xfs_repair $SOURCE_TREE/sbin/ + fi + if ! grep -Eq " $(basename $SRCMOD .ko)(\.| |$)" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then LINE="$(echo "modprobe -v $(basename ${SRCMOD%%.gz} .ko)" )" |