diff --git a/initrd/bin/generic-init b/initrd/bin/generic-init index 7b993068..825c2c6b 100755 --- a/initrd/bin/generic-init +++ b/initrd/bin/generic-init @@ -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" diff --git a/initrd/bin/kexec-boot b/initrd/bin/kexec-boot index 93565cb1..09773c58 100755 --- a/initrd/bin/kexec-boot +++ b/initrd/bin/kexec-boot @@ -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%%"/"} diff --git a/initrd/bin/kexec-iso-init b/initrd/bin/kexec-iso-init index 95eb972f..7cf22cb7 100755 --- a/initrd/bin/kexec-iso-init +++ b/initrd/bin/kexec-iso-init @@ -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" diff --git a/initrd/bin/kexec-parse-boot b/initrd/bin/kexec-parse-boot index 82b62994..4c6f8d09 100755 --- a/initrd/bin/kexec-parse-boot +++ b/initrd/bin/kexec-parse-boot @@ -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() { diff --git a/initrd/bin/kexec-save-default b/initrd/bin/kexec-save-default index b9aaa3f5..70b54c93 100755 --- a/initrd/bin/kexec-save-default +++ b/initrd/bin/kexec-save-default @@ -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 diff --git a/initrd/bin/kexec-save-key b/initrd/bin/kexec-save-key index 733a0d76..80995c08 100755 --- a/initrd/bin/kexec-save-key +++ b/initrd/bin/kexec-save-key @@ -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 diff --git a/initrd/bin/kexec-seal-key b/initrd/bin/kexec-seal-key index ec4ccb69..05216191 100755 --- a/initrd/bin/kexec-seal-key +++ b/initrd/bin/kexec-seal-key @@ -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" diff --git a/initrd/bin/kexec-select-boot b/initrd/bin/kexec-select-boot index 40d2f338..948bd3e0 100755 --- a/initrd/bin/kexec-select-boot +++ b/initrd/bin/kexec-select-boot @@ -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 diff --git a/initrd/bin/kexec-sign-config b/initrd/bin/kexec-sign-config index e4be1194..fc91a1d3 100755 --- a/initrd/bin/kexec-sign-config +++ b/initrd/bin/kexec-sign-config @@ -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