aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-10-18 22:06:39 -0700
committerMatt Turner <mattst88@gentoo.org>2020-10-19 09:42:19 -0700
commit0f80b87b66140ff842a71bde2dfbab0cac16d555 (patch)
treed26d95ba0fab2e835ff0d841d59250052d25cb36
parentcatalyst: Sanitize variable kernel name before giving it to bash (diff)
downloadcatalyst-0f80b87b66140ff842a71bde2dfbab0cac16d555.tar.gz
catalyst-0f80b87b66140ff842a71bde2dfbab0cac16d555.tar.bz2
catalyst-0f80b87b66140ff842a71bde2dfbab0cac16d555.zip
targets: Fix filtered_kname
A follow-on commit is going to remove this code, but I thought it was still valuable to fix the immediate problem for documentation purporses. Broken since it was first added in 2006. Fixes: 6aa64bf7 ("filter kname so - and . work") Signed-off-by: Matt Turner <mattst88@gentoo.org>
-rwxr-xr-xtargets/support/kmerge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 702c5454..d150a530 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -126,7 +126,7 @@ rm /etc/localtime
cp -f /usr/share/zoneinfo/UTC /etc/localtime
filtered_kname=${clst_kname/-/_}
-filtered_kname=${clst_kname/\//_}
+filtered_kname=${filtered_kname/\//_}
filtered_kname=${filtered_kname/\./_}
eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use"