Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VHyla-0006BM-RO for mharc-grub-devel@gnu.org; Fri, 06 Sep 2013 12:20:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHylX-00062e-4L for grub-devel@gnu.org; Fri, 06 Sep 2013 12:20:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHylV-0003Qy-8m for grub-devel@gnu.org; Fri, 06 Sep 2013 12:20:11 -0400 Received: from mail-qa0-x249.google.com ([2607:f8b0:400d:c00::249]:48811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHylV-0003Qk-3E for grub-devel@gnu.org; Fri, 06 Sep 2013 12:20:09 -0400 Received: by mail-qa0-f73.google.com with SMTP id bv4so130772qab.0 for ; Fri, 06 Sep 2013 09:20:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+axoyFBptqEiuCsSaVfhHsSzMcIi8im5yFWRUmIbcUg=; b=ow3ZZ+uhB8v3bLcVoknYkpivenngn4TVWRKKqXOfRzX+ssij1Iu/03ArhI/7RoOGud J/7Xo95jeXRmo3tW0Gqcf7IlYqb0gNW9nqbsN1hFI7fBf3BOGcMVoI8pNYx+WTlYFL2P 3XHwqaWLilmksOKxQ+u/scYdtujvAgvdRuG+kZTUiVPCGJGAuJyXD9Lj7Sf+8xRQU8P6 f1z3Y5Vs9ackwZWLC19gYMZlTNEOJZozYXS6fPYY6z025TS2TK8+ak3t11g7uuF3plRw O+iCzBSRtoCMeu7NBaOSyVr9Lg6Vn07fkExclpQ+fkDK7nQNU6s8eblnFbZEMYVJqFbu PMGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+axoyFBptqEiuCsSaVfhHsSzMcIi8im5yFWRUmIbcUg=; b=mHyd3QlmmHaW5TLVQT4DA60QQ8G5BBAhLZdjZeahj04NuEfHPoIKIFfUYd90wfL6uy BjZ4VbXvHCLoeeB21ruxCvAkKAUQjBH/4MySbCOqRgF4+9Af/1zwd0KYz6/rb2OAzm8U VLJ4y/uK1EHPEiDDii1snK722Buq+b/wMe8Y9PUYHQ/MgRQY4w35QZM+DVUMeYPOZWQO RIZNs4YoNLJWC9ct87nm2RsVXr23C+rsj1x853zmFvMzZCBu52rW90cYEyBTg3qOMR6E cmRklegkA8GihDsLzT4qdRJwSYkTSJ0YGBxo9OnsxujpdDofmgtoluyHuppaTWXVpUcm PQUA== X-Gm-Message-State: ALoCoQnZsuO6zW0fU5qk4FSLbt+LanFQjAALXuJ70ew6OnENf4rUCYUvCpgFn02q5aY2hGqEhxhkk69oXkp5OkfomYwCBEdoRzihmT06i3P079NMJj0VhAcZBt0uOZFkFIXypHmBtbEB10RJUIeO8fd6JmxdoPNsyxl93gVhuGNntKqUXLIAhPBxdHu5e4TrcJB4hmg0FbSIjxOaZS5jIu6Fk1BeVSfMABDL/lsT9zJ9rueRE6Hw7Do= X-Received: by 10.236.167.138 with SMTP id i10mr1150712yhl.9.1378484408738; Fri, 06 Sep 2013 09:20:08 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id z29si163382yhd.3.1969.12.31.16.00.00 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Fri, 06 Sep 2013 09:20:08 -0700 (PDT) Received: from yinz.mtv.corp.google.com (yinz.mtv.corp.google.com [172.17.81.122]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 798345A4005; Fri, 6 Sep 2013 09:20:08 -0700 (PDT) Received: by yinz.mtv.corp.google.com (Postfix, from userid 184367) id 3BD54C076E; Fri, 6 Sep 2013 09:20:08 -0700 (PDT) From: Jon McCune To: grub-devel@gnu.org Subject: [PATCH v2 4/5] Add -k, --pubkey=FILE support to grub-install command Date: Fri, 6 Sep 2013 09:18:52 -0700 Message-Id: <1378484333-13577-5-git-send-email-jonmccune@google.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1378484333-13577-1-git-send-email-jonmccune@google.com> References: <1378484333-13577-1-git-send-email-jonmccune@google.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::249 Cc: Jon McCune X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Sep 2013 16:20:14 -0000 This simply passes along the public key to the grub-mkimage invocation Signed-off-by: Jon McCune --- util/grub-install.in | 13 +++++++++---- util/grub-install_header | 6 ++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/util/grub-install.in b/util/grub-install.in index 1816bb1..3df0087 100644 --- a/util/grub-install.in +++ b/util/grub-install.in @@ -650,10 +650,15 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in *) imgext=img ;; esac +pubkey_file_arg="" +if [ -e "$pubkey_file" ]; then + pubkey_file_arg="--pubkey=$pubkey_file" +fi + if [ x"$config_opt_file" = x ]; then - "$grub_mkimage" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $grub_decompression_module $modules || exit 1 + "$grub_mkimage" "$pubkey_file_arg" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $grub_decompression_module $modules || exit 1 else - "$grub_mkimage" -c "${config_opt_file}" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $grub_decompression_module $modules || exit 1 + "$grub_mkimage" -c "${config_opt_file}" "$pubkey_file_arg" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $grub_decompression_module $modules || exit 1 fi # Backward-compatibility kludges @@ -664,9 +669,9 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ] elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-efi" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "x86_64-efi" ]; then if [ x"$config_opt_file" = x ]; then - "$grub_mkimage" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/grub.efi" --prefix="" $grub_decompression_module $modules || exit 1 + "$grub_mkimage" "$pubkey_file_arg" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/grub.efi" --prefix="" $grub_decompression_module $modules || exit 1 else - "$grub_mkimage" -c "${config_opt_file}" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/grub.efi" --prefix="" $grub_decompression_module $modules || exit 1 + "$grub_mkimage" -c "${config_opt_file}" "$pubkey_file_arg" -d "${source_directory}" -O "${mkimage_target}" --output="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/grub.efi" --prefix="" $grub_decompression_module $modules || exit 1 fi fi diff --git a/util/grub-install_header b/util/grub-install_header index cf7fa9d..20a0321 100644 --- a/util/grub-install_header +++ b/util/grub-install_header @@ -156,6 +156,7 @@ grub_print_install_files_help () { dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/]" "${libdir}/@PACKAGE@")" print_option_help "-d, --directory=$(gettext "DIR")" "$dir_msg" print_option_help "--grub-mkimage=$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")" + print_option_help "-k, --pubkey=$(gettext "FILE")" "$(gettext "embed FILE as public key for signature checking")" print_option_help "-v, --version" "$(gettext "print the version information and exit")" } @@ -168,6 +169,7 @@ grub_decompression_module="" compressor="" compressor_opts="" source_directory="" +pubkey_file="" argument () { opt=$1 @@ -245,6 +247,10 @@ grub_process_install_options () { grub_mkimage=`argument $option "$@"`; grub_process_install_options_consumed=2 ;; --grub-mkimage=*) grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'`;grub_process_install_options_consumed=1 ;; + --pubkey | -k) + pubkey_file=`argument $option "$@"`; grub_process_install_options_consumed=2 ;; + --pubkey=*) + pubkey_file=`echo "$option" | sed 's/--pubkey=//'` grub_process_install_options_consumed=1;; --modules) modules=`argument $option "$@"`; grub_process_install_options_consumed=2;; --modules=*) -- 1.8.4