From patchwork Tue Jul 25 06:49:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 793229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xGplf5RYwz9s0g for ; Tue, 25 Jul 2017 16:50:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="IzjA6m/O"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="l878VXpw"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xGplf3wCFzDqpS for ; Tue, 25 Jul 2017 16:50:22 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="IzjA6m/O"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="l878VXpw"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from new2-smtp.messagingengine.com (new2-smtp.messagingengine.com [66.111.4.224]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xGpkv6BzFzDqmL for ; Tue, 25 Jul 2017 16:49:43 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="IzjA6m/O"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="l878VXpw"; dkim-atps=neutral Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id 91E0711D0; Tue, 25 Jul 2017 02:49:41 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute2.internal (MEProxy); Tue, 25 Jul 2017 02:49:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=h1yR/rcoCbjR3yaivlJJAdTJCgTyBPKpL/oKErD55 L4=; b=IzjA6m/OJb3zlTE1sTSUA8IjHnkNlHcXgD/SizcQlWKOVGtS7q9ovg+hg 8saH6yxKxYMbpo6TpXOAKmbFK1X7ZuPQpGhqjFpFt411020Dq3T3MpQ6ObIYf3z6 aQ8T0pWUhyD2zzYLkh9Dg+nYAt7j1m1vXBuWp4peSHWiDV8fW1XC9pSSfhsmFbox d0F38Ql1XU0MZ8a9Ulc6ARol0Dtse/XMmaTn5ZLx8daAJpv3dE+k28qNrp7gQcnw kdqyEuPJFmGfT1bxh25TEjk843PVrwckLmqwafTEPlWuPBWUUimjHaSPawB+5Ty2 w/Oy9cO/JwcoWWQSmoLzsrXQSqBqA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=h1yR/rcoCbjR3yaivlJJAdTJCgTyBPKpL/oKErD55 L4=; b=l878VXpwnstje1HwaxjpGVuEsGniNy2w9eteB0LBdA1Lq2zXDcUITvLSc jiTGv4NIXH/6s2ZUX3SIRtcJ+W6MiiavSA0jApHUVdpef0HGma+2KtCAAU8SNTIZ qM/S22FeUQeW/gF33gdASG+tHgkFHHevBfc1OWc2+NuylH72o2L1zVLkynoOxAar bwRPvfl30KqYF/dR352WhYwaOt/dTkGWM2PBQF9pQQ4d2s3mAe1opJzmLbTip7Cw FAqSsR6P4jLrbMvlvk3sYffUcDhRBditNilfhUQ/2B05R7sjJBsxEG8VETWYEW9b /9R3wbl/FLR/vzSy0UbS8StAb83eQ== X-ME-Sender: X-Sasl-enc: 4sv73yf/l8McyjFpFyXm0+bDMIYVqdKmEasq38X/4Ymx 1500965380 Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id E8A0E24038; Tue, 25 Jul 2017 02:49:39 -0400 (EDT) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH v2 07/12] utils/pb-plugin: Advertise pb-plugins to discover server Date: Tue, 25 Jul 2017 16:49:05 +1000 Message-Id: <20170725064910.31478-8-sam@mendozajonas.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170725064910.31478-1-sam@mendozajonas.com> References: <20170725064910.31478-1-sam@mendozajonas.com> X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" Update the pb-plugin utility to create a 'plugin' pb-event when it successfully scans or installs a pb-plugin. To aid invoking pb-plugin from pb-discover there following two commands are updated: - `pb-plugin scan` can now be called for a single directory. - `pb-plugin install` now has an optional "auto" argument that will skip asking for confirmation before installation. Signed-off-by: Samuel Mendoza-Jonas --- utils/pb-plugin | 54 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/utils/pb-plugin b/utils/pb-plugin index e107f96..a42d051 100755 --- a/utils/pb-plugin +++ b/utils/pb-plugin @@ -16,7 +16,7 @@ Usage: $0 Where is one of: install - install plugin from FILE/URL - scan - look for available plugins on attached devices + scan - look for available plugins on attached devices create - create a new plugin archive from DIR lint - perform a pre-distribution check on FILE EOF @@ -150,7 +150,12 @@ EOF do_install() { - local url name file __dest + local url name file __dest auto + + if [ "$1" == "auto" ]; then + auto=y + shift; + fi url=$1 @@ -186,17 +191,20 @@ do_install() sha256sum "$file" | cut -f1 -d' ' echo - echo "Do you want to install this plugin? (y/N)" - read resp + if [ -z "$auto" ] + then + echo "Do you want to install this plugin? (y/N)" + read resp - case $resp in - [yY]|[yY][eE][sS]) - ;; - *) - echo "Cancelled" - exit 0 - ;; - esac + case $resp in + [yY]|[yY][eE][sS]) + ;; + *) + echo "Cancelled" + exit 0 + ;; + esac + fi __dest=$(mktemp -d) gunzip -c "$file" | ( cd $__dest && cpio -i -d) @@ -223,6 +231,12 @@ do_install() __create_wrapper "$__dest" "$binary" done + pb-event plugin@local \ + name=$PLUGIN_NAME id=$PLUGIN_ID version=$PLUGIN_VERSION \ + vendor=$PLUGIN_VENDOR vendor_id=$PLUGIN_VENDOR_ID \ + date=$PLUGIN_DATE executables="$PLUGIN_EXECUTABLES" \ + source_file=$url installed="yes" + echo "Plugin installed" plugin_info } @@ -260,6 +274,9 @@ do_scan_mount() printf "To run this plugin:\n" printf " $0 install $plugin_path\n" printf "\n" + + pb-event plugin@$dev name=$PLUGIN_NAME \ + path=$plugin_path installed="no" ) if [ $? = 0 ] then @@ -271,9 +288,18 @@ do_scan_mount() do_scan() { - local found mnt + local found mnt dev locations found=0 - for mnt in $__pb_mount_dir/* + dev=$1 + + if [ -z $dev ]; then + locations=$__pb_mount_dir/* + else + echo "Scanning device $dev" + locations=$dev + fi + + for mnt in $locations do do_scan_mount $mnt done