remove trailing / on the /boot device parameter

This commit is contained in:
Trammell Hudson 2017-07-17 12:43:14 -04:00
parent 831dca5124
commit af3170ebf7
Failed to extract signature
9 changed files with 9 additions and 9 deletions

View File

@ -20,6 +20,6 @@ if ! grep -q /boot /proc/mounts ; then
fi
# Attempt to pull verified config from device
kexec-select-boot -b /boot/ -c "grub.cfg"
kexec-select-boot -b /boot -c "grub.cfg"
recovery "Something failed during boot"

View File

@ -19,7 +19,7 @@ while getopts "b:e:r:a:o:fi" arg; do
done
if [ -z "$bootdir" -o -z "$entry" ]; then
die "Usage: $0 -b /boot/ -e 'kexec params|...|...'"
die "Usage: $0 -b /boot -e 'kexec params|...|...'"
fi
bootdir=${bootdir%%"/"}

View File

@ -43,7 +43,7 @@ if [ -r $REMOVE_FILE ]; then
fi
# Call kexec and indicate that hashes have been verified
kexec-select-boot -b /boot/ -d /media/ -p "$paramsdir" \
kexec-select-boot -b /boot -d /media/ -p "$paramsdir" \
-a "$ADD" -r "$REMOVE" -c "*.cfg" -u -i
die "Something failed in selecting boot"

View File

@ -4,7 +4,7 @@ bootdir="$1"
file="$2"
if [ -z "$bootdir" -o -z "$file" ]; then
die "Usage: $0 /boot/ /boot/grub/grub.cfg"
die "Usage: $0 /boot /boot/grub/grub.cfg"
fi
reset_entry() {

View File

@ -13,7 +13,7 @@ while getopts "b:d:p:e:i:" arg; do
done
if [ -z "$bootdir" -o -z "$index" ]; then
die "Usage: $0 -b /boot/ -i menu_option "
die "Usage: $0 -b /boot -i menu_option "
fi
if [ -z "$paramsdev" ]; then

View File

@ -15,7 +15,7 @@ shift `expr $OPTIND - 1`
key_devices="$@"
if [ -z "$paramsdir" ]; then
die "Usage: $0 -p /boot/ [-l qubes_dom0] [/dev/sda2 /dev/sda5 ...] "
die "Usage: $0 -p /boot [-l qubes_dom0] [/dev/sda2 /dev/sda5 ...] "
fi
if [ -z "$paramsdev" ]; then

View File

@ -15,7 +15,7 @@ RECOVERY_KEY="/tmp/secret/recovery.key"
paramsdir=$1
if [ -z "$paramsdir" ]; then
die "Usage $0 /boot/"
die "Usage $0 /boot"
fi
KEY_DEVICES="$paramsdir/kexec_key_devices.txt"

View File

@ -25,7 +25,7 @@ while getopts "b:d:p:a:r:c:ui" arg; do
done
if [ -z "$bootdir" ]; then
die "Usage: $0 -b /boot/"
die "Usage: $0 -b /boot"
fi
if [ -z "$paramsdev" ]; then

View File

@ -14,7 +14,7 @@ while getopts "p:c:u" arg; do
done
if [ -z "$paramsdir" ]; then
die "Usage: $0 -p /boot/ [ -u | -c counter ]"
die "Usage: $0 -p /boot [ -u | -c counter ]"
fi
confirm_gpg_card