From d00cfc2a7b5ec95f288d127dcde5a20c3afc4577 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 18 Jan 2018 15:07:25 +0100 Subject: [PATCH] Remove obsolete prelinking functionality --- dracut-bash-completion.sh | 4 +--- dracut.8.asc | 6 ------ dracut.conf.5.asc | 3 --- dracut.sh | 23 ----------------------- modules.d/01fips/module-setup.sh | 1 - 5 files changed, 1 insertion(+), 36 deletions(-) diff --git a/dracut-bash-completion.sh b/dracut-bash-completion.sh index 9e5806cc1..17374bf3e 100644 --- a/dracut-bash-completion.sh +++ b/dracut-bash-completion.sh @@ -31,9 +31,7 @@ _dracut() { --local --hostonly --no-hostonly --fstab --help --bzip2 --lzma --xz --zstd --no-compress --gzip --list-modules --show-modules --keep --printsize --regenerate-all --noimageifnotneeded --early-microcode - --no-early-microcode --print-cmdline --prelink --noprelink --reproducible - --uefi - ' + --no-early-microcode --print-cmdline --reproducible --uefi' [ARG]='-a -m -o -d -I -k -c -L --kver --add --force-add --add-drivers --omit-drivers --modules --omit --drivers --filesystems --install diff --git a/dracut.8.asc b/dracut.8.asc index 64c0207f5..2e974fb0b 100644 --- a/dracut.8.asc +++ b/dracut.8.asc @@ -243,12 +243,6 @@ example: **--nostrip**:: do not strip binaries in the initramfs -**--prelink**:: - prelink binaries in the initramfs (default) - -**--noprelink**:: - do not prelink binaries in the initramfs - **--hardlink**:: hardlink files in the initramfs (default) diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc index ecaf35c8d..1dfa28f65 100644 --- a/dracut.conf.5.asc +++ b/dracut.conf.5.asc @@ -89,9 +89,6 @@ Configuration files must have the extension .conf; other extensions are ignored. *do_strip=*"__{yes|no}__":: Strip binaries in the initramfs (default=yes) -*do_prelink=*"__{yes|no}__":: - Prelink binaries in the initramfs (default=yes) - *hostonly=*"__{yes|no}__":: Host-Only mode: Install only what is needed for booting the local host instead of a generic host and generate host-specific configuration. diff --git a/dracut.sh b/dracut.sh index f1821e4a3..4e3854b71 100755 --- a/dracut.sh +++ b/dracut.sh @@ -110,8 +110,6 @@ Creates initial ramdisk images for preloading modules --kernel-cmdline [PARAMETERS] Specify default kernel command line parameters --strip Strip binaries in the initramfs --nostrip Do not strip binaries in the initramfs - --prelink Prelink binaries in the initramfs - --noprelink Do not prelink binaries in the initramfs --hardlink Hardlink files in the initramfs --nohardlink Do not hardlink files in the initramfs --prefix [DIR] Prefix initramfs files with [DIR] @@ -336,8 +334,6 @@ rearrange_params() --long kernel-cmdline: \ --long strip \ --long nostrip \ - --long prelink \ - --long noprelink \ --long hardlink \ --long nohardlink \ --long noprefix \ @@ -522,8 +518,6 @@ while :; do early_microcode_l="no";; --strip) do_strip_l="yes";; --nostrip) do_strip_l="no";; - --prelink) do_prelink_l="yes";; - --noprelink) do_prelink_l="no";; --hardlink) do_hardlink_l="yes";; --nohardlink) do_hardlink_l="no";; --noprefix) prefix_l="/";; @@ -726,8 +720,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) [[ $drivers_dir_l ]] && drivers_dir=$drivers_dir_l [[ $do_strip_l ]] && do_strip=$do_strip_l [[ $do_strip ]] || do_strip=yes -[[ $do_prelink_l ]] && do_prelink=$do_prelink_l -[[ $do_prelink ]] || do_prelink=yes [[ $do_hardlink_l ]] && do_hardlink=$do_hardlink_l [[ $do_hardlink ]] || do_hardlink=yes [[ $prefix_l ]] && prefix=$prefix_l @@ -1610,21 +1602,6 @@ if [[ $kernel_only != yes ]]; then fi fi -PRELINK_BIN="$(command -v prelink)" -if [[ $EUID = 0 ]] && [[ $PRELINK_BIN ]]; then - if [[ $DRACUT_FIPS_MODE ]]; then - dinfo "*** Installing prelink files ***" - inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache - elif [[ $do_prelink == yes ]]; then - dinfo "*** Pre-linking files ***" - inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf - chroot "$initdir" "$PRELINK_BIN" -a - rm -f -- "$initdir/$PRELINK_BIN" - rm -fr -- "$initdir"/etc/prelink.* - dinfo "*** Pre-linking files done ***" - fi -fi - if [[ $do_hardlink = yes ]] && command -v hardlink >/dev/null; then dinfo "*** Hardlinking files ***" hardlink "$initdir" 2>&1 diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh index 3b800c7ce..4b3e322fd 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -49,7 +49,6 @@ install() { libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \ libfreeblpriv3.so libfreeblpriv3.chk - inst_multiple -o prelink inst_simple /etc/system-fips [ -c ${initdir}/dev/random ] || mknod ${initdir}/dev/random c 1 8 \ || { -- 2.39.2