106 lines
4.4 KiB
Diff
106 lines
4.4 KiB
Diff
|
From e4f1dbcc0061113cb58e555724f76a7243788236 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kairui Song <kasong@tencent.com>
|
||
|
|
Date: Tue, 21 Jun 2022 14:54:03 +0800
|
||
|
|
Subject: [PATCH] fix(dracut): typo error 'aggresive' -> 'aggressive'
|
||
|
|
|
||
|
|
This option was introduced not long ago, but unfortunately it was
|
||
|
|
misspelled and have affected following up commits. It's not a commonly
|
||
|
|
used option, at least not yet, so just rename and fix it.
|
||
|
|
|
||
|
|
Signed-off-by: Kairui Song <kasong@tencent.com>
|
||
|
|
---
|
||
|
|
dracut.sh | 10 +++++-----
|
||
|
|
man/dracut.8.asc | 2 +-
|
||
|
|
man/dracut.conf.5.asc | 2 +-
|
||
|
|
shell-completion/bash/dracut | 2 +-
|
||
|
|
4 files changed, 8 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/dracut.sh b/dracut.sh
|
||
|
|
index a1ea1bc32..8c70befc0 100755
|
||
|
|
--- a/dracut.sh
|
||
|
|
+++ b/dracut.sh
|
||
|
|
@@ -124,7 +124,7 @@ Creates initial ramdisk images for preloading modules
|
||
|
|
--kernel-cmdline [PARAMETERS]
|
||
|
|
Specify default kernel command line parameters.
|
||
|
|
--strip Strip binaries in the initramfs.
|
||
|
|
- --aggresive-strip Strip more than just debug symbol and sections,
|
||
|
|
+ --aggressive-strip Strip more than just debug symbol and sections,
|
||
|
|
for a smaller initramfs build. The --strip option must
|
||
|
|
also be specified.
|
||
|
|
--nostrip Do not strip binaries in the initramfs.
|
||
|
|
@@ -409,7 +409,7 @@ rearrange_params() {
|
||
|
|
--long print-cmdline \
|
||
|
|
--long kernel-cmdline: \
|
||
|
|
--long strip \
|
||
|
|
- --long aggresive-strip \
|
||
|
|
+ --long aggressive-strip \
|
||
|
|
--long nostrip \
|
||
|
|
--long hardlink \
|
||
|
|
--long nohardlink \
|
||
|
|
@@ -734,7 +734,7 @@ while :; do
|
||
|
|
early_microcode_l="no"
|
||
|
|
;;
|
||
|
|
--strip) do_strip_l="yes" ;;
|
||
|
|
- --aggresive-strip) aggresive_strip_l="yes" ;;
|
||
|
|
+ --aggressive-strip) aggressive_strip_l="yes" ;;
|
||
|
|
--nostrip) do_strip_l="no" ;;
|
||
|
|
--hardlink) do_hardlink_l="yes" ;;
|
||
|
|
--nohardlink) do_hardlink_l="no" ;;
|
||
|
|
@@ -1033,7 +1033,7 @@ 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
|
||
|
|
-[[ $aggresive_strip_l ]] && aggresive_strip=$aggresive_strip_l
|
||
|
|
+[[ $aggressive_strip_l ]] && aggressive_strip=$aggressive_strip_l
|
||
|
|
[[ $do_hardlink_l ]] && do_hardlink=$do_hardlink_l
|
||
|
|
[[ $do_hardlink ]] || do_hardlink=yes
|
||
|
|
[[ $prefix_l ]] && prefix=$prefix_l
|
||
|
|
@@ -2235,7 +2235,7 @@ if [[ $do_strip == yes ]]; then
|
||
|
|
fi
|
||
|
|
done
|
||
|
|
|
||
|
|
- if [[ $aggresive_strip == yes ]]; then
|
||
|
|
+ if [[ $aggressive_strip == yes ]]; then
|
||
|
|
# `eu-strip` and `strip` both strips all unneeded parts by default
|
||
|
|
strip_args=(-p)
|
||
|
|
else
|
||
|
|
diff --git a/man/dracut.8.asc b/man/dracut.8.asc
|
||
|
|
index bfb86f5de..7930ebb02 100644
|
||
|
|
--- a/man/dracut.8.asc
|
||
|
|
+++ b/man/dracut.8.asc
|
||
|
|
@@ -265,7 +265,7 @@ example:
|
||
|
|
**--strip**::
|
||
|
|
Strip binaries in the initramfs (default).
|
||
|
|
|
||
|
|
-**--aggresive-strip**::
|
||
|
|
+**--aggressive-strip**::
|
||
|
|
Strip more than just debug symbol and sections, for a smaller initramfs
|
||
|
|
build. The --strip option must also be specified.
|
||
|
|
|
||
|
|
diff --git a/man/dracut.conf.5.asc b/man/dracut.conf.5.asc
|
||
|
|
index 96c801292..d9694a5df 100644
|
||
|
|
--- a/man/dracut.conf.5.asc
|
||
|
|
+++ b/man/dracut.conf.5.asc
|
||
|
|
@@ -106,7 +106,7 @@ Configuration files must have the extension .conf; other extensions are ignored.
|
||
|
|
*do_strip=*"__{yes|no}__"::
|
||
|
|
Strip binaries in the initramfs (default=yes).
|
||
|
|
|
||
|
|
-*aggresive_strip=*"__{yes|no}__"::
|
||
|
|
+*aggressive_strip=*"__{yes|no}__"::
|
||
|
|
Strip more than just debug symbol and sections, for a smaller initramfs
|
||
|
|
build. The "do_strip=yes" option must also be specified (default=no).
|
||
|
|
|
||
|
|
diff --git a/shell-completion/bash/dracut b/shell-completion/bash/dracut
|
||
|
|
index 86de20715..dbc669644 100644
|
||
|
|
--- a/shell-completion/bash/dracut
|
||
|
|
+++ b/shell-completion/bash/dracut
|
||
|
|
@@ -33,7 +33,7 @@ _dracut() {
|
||
|
|
--xz --zstd --no-compress --gzip --list-modules --show-modules --keep
|
||
|
|
--printsize --regenerate-all --noimageifnotneeded --early-microcode
|
||
|
|
--no-early-microcode --print-cmdline --reproducible --uefi
|
||
|
|
- --enhanced-cpio --rebuild --aggresive-strip --hostonly-cmdline
|
||
|
|
+ --enhanced-cpio --rebuild --aggressive-strip --hostonly-cmdline
|
||
|
|
--no-hostonly-cmdline --no-hostonly-default-device --nofscks
|
||
|
|
--hostonly-i18n --no-hostonly-i18n --lzo --lz4 --no-reproducible
|
||
|
|
--no-uefi --no-machineid --version
|