moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

u-boot-menu: quote all the things

Browse source 
At least the CMDLINE expansion did break on the printf '%s' and we
got a newline for every parameter, which is wrong.
(I'm suprised nobody noticed this, and how I not noticed this myself)
This commit is contained in:
John Zimmermann 2021-05-12 06:07:29 +00:00
parent 479120e1ca
commit 0e9cdc13ed
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
srcpkgs/u-boot-menu/files/kernel.d/extlinux
View file

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
header() { header() {
printf "TIMEOUT %s\n" ${TIMEOUT} > ${OUTFILE} printf "TIMEOUT %s\n" "${TIMEOUT}" > "${OUTFILE}"
printf "DEFAULT entry0\n" >> ${OUTFILE} printf "DEFAULT entry0\n" >> "${OUTFILE}"
printf "MENU TITLE Boot menu\n" >> ${OUTFILE} printf "MENU TITLE Boot menu\n" >> "${OUTFILE}"
} }
get_bootpath() { get_bootpath() {
@ -18,19 +18,19 @@ add_kernel() {
fdt=$(get_bootpath "/boot/dtbs/dtbs-${ver}/${DTBPATH}") fdt=$(get_bootpath "/boot/dtbs/dtbs-${ver}/${DTBPATH}")
cmdline="${CMDLINE}" cmdline="${CMDLINE}"
printf "LABEL entry%s\n" ${ENTRY} >> ${OUTFILE} printf "LABEL entry%s\n" "${ENTRY}" >> "${OUTFILE}"
printf "\tMENU LABEL Void Linux Version %s\n" ${ver} >> ${OUTFILE} printf "\tMENU LABEL Void Linux Version %s\n" "${ver}" >> "${OUTFILE}"
printf "\tLINUX %s\n" ${kernel} >> ${OUTFILE} printf "\tLINUX %s\n" "${kernel}" >> "${OUTFILE}"
if [ -e "${BOOTPART}/${initrd}" ]; then if [ -e "${BOOTPART}/${initrd}" ]; then
printf "\tINITRD %s\n" ${initrd} >> ${OUTFILE} printf "\tINITRD %s\n" "${initrd}" >> "${OUTFILE}"
fi fi
if [ -n "${USE_DEVICETREEDIR}" ]; then if [ -n "${USE_DEVICETREEDIR}" ]; then
printf "\tDEVICETREEDIR %s\n" ${devicetreedir} >> ${OUTFILE} printf "\tDEVICETREEDIR %s\n" "${devicetreedir}" >> "${OUTFILE}"
elif [ -n "${DTBPATH}" ] && [ -e "${BOOTPART}/${fdt}" ]; then elif [ -n "${DTBPATH}" ] && [ -e "${BOOTPART}/${fdt}" ]; then
printf "\tFDT %s\n" ${fdt} >> ${OUTFILE} printf "\tFDT %s\n" ${fdt} >> "${OUTFILE}"
fi fi
if [ -n "${cmdline}" ]; then if [ -n "${cmdline}" ]; then
printf "\tAPPEND %s\n" ${cmdline} >> ${OUTFILE} printf "\tAPPEND %s\n" "${cmdline}" >> "${OUTFILE}"
fi fi
ENTRY=$(expr ${ENTRY} + 1) ENTRY=$(expr ${ENTRY} + 1)
} }

2
srcpkgs/u-boot-menu/template
View file

@ -1,7 +1,7 @@
# Template file for 'u-boot-menu' # Template file for 'u-boot-menu'
pkgname=u-boot-menu pkgname=u-boot-menu
version=0.2 version=0.2
revision=2 revision=3
conf_files="/etc/default/extlinux" conf_files="/etc/default/extlinux"
short_desc="Create an u-boot menu with currently available kernels" short_desc="Create an u-boot menu with currently available kernels"
maintainer="Remi Pommarel <repk@triplefau.lt>" maintainer="Remi Pommarel <repk@triplefau.lt>"