From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7387032429685374976 X-Received: by 2002:a05:600c:5126:b0:424:a56d:83a with SMTP id 5b1f17b1804b1-42579fc4c70mr73099945e9.0.1719927515226; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5586:b0:425:7633:847f with SMTP id 5b1f17b1804b1-425763385f3ls16389715e9.0.-pod-prod-02-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4yg1frNtNIJ2tyZf5bPk2jkW0f5IuAuwcanntjbS0PxkCuxR/kFrtz6LC7hyW/y+I9Uec X-Received: by 2002:a7b:cb8a:0:b0:425:7aad:c2c2 with SMTP id 5b1f17b1804b1-4257aadc3c6mr56470185e9.19.1719927513163; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927513; cv=none; d=google.com; s=arc-20160816; b=sroABHJj7aMXBHob30SI/op+6y6TUrSc+8EqQgPauBWM9Oej2waaF/bu+R1tMbFeES /vA4M1HLGRox+/P5mXaIzEWQ67Eo6770cKTUIJSGRgaRLDsZSI8s6hlRYBvw2scMhG8p pn14yXnM5yQLBs5L9IZjuaYWNoECIDOc/0iyCAGaLcRJrj1FnlgcbfP5NWPaRA+t0R13 1OQ3COO3q1vQIHXZWztAeq9sRgZahXo0z87h0MtxGccmqQId/CYvaC1QkMLxSVYyrAmD GukdyGWhGdyVACarFIERUok1NrdDM5gjREa+dQHo8i47MQO42aT7+evAoiC1xVqwCFGk WpHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=M5EXTI+p2o6jdcoVWaXzPxyU+j0uAAl+3f2F3+6CHUY=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=iTkVFmxtcTeb8GhgBkTSQ9bZGdL0T2CMaik4ZIytzRC1OGe72YFhqEb788T59+nzNx RAZ+f26rPazmtqE8vA8nWJzYIVd1j/HRLbMkv+fs5RY3t63S0f5FCz1LLBj7CUIXVsHa kfca35BldBF89hMadbElvkTMMnlZs9htSVXXD2YO+CWYEwegxhS+ITltnQvYlMiMIo4t 9iXVG50uUAzUSccwQfo/B7u5RsiF+3dABeJ0cHYfn9u5C4us3+Y9go1+RPBM30BCsXsz mzhKQLVBIJSaWEOXKc+PZ3DeV0bYPnIELQx7bsfadJWfWDikHrJiz6nCH7zTPd+wMY1M 08lw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=GEURARN4; spf=pass (google.com: domain of fm-294854-20240702133832a9bd763c4249d66f07-i_youx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832a9bd763c4249d66f07-i_youX@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-4256b090706si2040335e9.1.2024.07.02.06.38.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:33 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240702133832a9bd763c4249d66f07-i_youx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=GEURARN4; spf=pass (google.com: domain of fm-294854-20240702133832a9bd763c4249d66f07-i_youx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832a9bd763c4249d66f07-i_youX@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20240702133832a9bd763c4249d66f07 for ; Tue, 02 Jul 2024 15:38:33 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=M5EXTI+p2o6jdcoVWaXzPxyU+j0uAAl+3f2F3+6CHUY=; b=GEURARN4IbvAfjePlcJdEyEmGoA+jopqFCcuhK5NDQ/jlMk2oyxZe7/Qv+BLqzfkqSy4sw OEu2EsBjd+t+ChAq8dNfF9efY3aQ6SWL/5Jx74sGe7vnITzOuCMbLqBOECI71RfuQznF7ykM MSJT22s+YbE7xHDCPzZQlFEtm7pIA=; From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 07/17] meta-isar: deploy-image: Make TARGET_DEVICE a complete path Date: Tue, 2 Jul 2024 15:38:21 +0200 Message-ID: <5325fbed9d19e6680cc4ce49eb1608c29730065c.1719927511.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: 9jTbHINt+9V7 From: Jan Kiszka Avoids having to prepend /dev/ at every user. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh index f73a48a9..5c362bcf 100644 --- a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh +++ b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh @@ -78,16 +78,16 @@ if [ "$(echo "$target_device_list" | wc -w)" -gt 1 ]; then array=() for target in $target_device_list; do target_size=$(lsblk --nodeps --noheadings -o SIZE /dev/"$target") - array+=("$target" "/dev/$target $target_size") + array+=("/dev/$target" "/dev/$target $target_size") done TARGET_DEVICE=$(dialog --clear \ --no-tags --menu "Select device to install $DISK_IMAGE" 10 60 3 \ "${array[@]}" --output-fd 1) else - TARGET_DEVICE=$(echo "$target_device_list" | tr -d " ") + TARGET_DEVICE=/dev/$(echo "$target_device_list" | tr -d " ") fi -TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE /dev/"$TARGET_DEVICE") +TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE "$TARGET_DEVICE") dialog --msgbox "Start installing '$DISK_IMAGE' to '$TARGET_DEVICE'(Size: '$TARGET_DEVICE_SIZE' )." 7 60 bmap_options="" @@ -95,7 +95,7 @@ if [ -z "$DISK_BMAP" ]; then bmap_options="--nobmap" fi clear -if ! bmaptool copy ${bmap_options} "$installdata/$DISK_IMAGE" "/dev/${TARGET_DEVICE}"; then +if ! bmaptool copy ${bmap_options} "$installdata/$DISK_IMAGE" "${TARGET_DEVICE}"; then exit 1 fi -- 2.43.0