From patchwork Tue Jul 2 13:38:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3643 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Jul 2024 15:38:41 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dce8j029395 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:40 +0200 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-42567dbbd20sf31379515e9.0 for ; Tue, 02 Jul 2024 06:38:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927515; cv=pass; d=google.com; s=arc-20160816; b=ybEgN6YKmwYcZ/JL6lsSG2A1ERF1oL4kEziUj8AxCxQJpqhmjeC+nqEex3EmV8nyto mlYU5GNrOlZx+YpwzHqwMmfsosvEsdONiU777VqdjETRrV3VYeSnsM75R4Fx7xhgeycn cN33n8NugpCaGipol40RgQ0W/vuF00wSwx+9uRz7tX2JakPoxZZa5wyMIeZ/wilLd70v HpC/r+D56x7EvBPO9Zd7NWsAB4LBwbqjq01u7jmtoL63+2/l0d4ig9DF4/Wz2th/EoYn XMResRNRPMICLkqPLeEVhXWGJIGZtX55rPqvEKyagr65f7m7UPJDWiSoAlwmp9A6MCGz nQUA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tyFEGWJxkGrSCptMBdODXirPzhH2vgDyVwNv+dOPWNg=; fh=8IQnAD7XeFgZo7I6Fmf9TZ4q4CYMrbuTI3KGppUdOXc=; b=JZMnXVydpL/hPKeDZTxB48LSmaTPpPFQkzOI4ZBC41tuaxNwepkiJeGHkdPN18/6Wc AavibCSmuq0KtQJ9I7KFBEA5UUMPTVinffgV8sPfYxqxE4hYA9Pu0vuxbE4+ONAwtgB5 vK6y/+jq5QP9yNj5Ozwk9O6+hOq3Ydj84547XwbtP3SpJqKyviJbLJpO5KXazVXnijdC MqktNsoiUKfYtboqsURt/IFOTAndVT9LMDfxfGi7wItH5cb3sWSmLV0JoKGLTx35kPZ6 lCHqTadU4DNFDchK3LjW3nG6GzwaI4RS/G3zMsesoFVLT0pYSS4kQ13GkoI3ZcfdWhu0 gMUA==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1719927515; x=1720532315; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=tyFEGWJxkGrSCptMBdODXirPzhH2vgDyVwNv+dOPWNg=; b=VDC90Uin4FQH8peYGgEUL6JhhZlSK8vUm1jyQ7q2gthuDdy5S3Ssz2YGee/Ehw0H0v B/HPeqXeavjdVraSzFM88hieO9qtDsKkvYfmvOXCt+bT6SvkmRkd6x2RXmXc8kg9a8HT nnG3+QQrLp5xH1i9uA3xDaYEuK010b5ARlNr5FP0a+jbo2obaFpZGgBFkwXWOU1SUe/h pJ1qPxASFrLgQgyCEiAEb2FIbv5laCgQxxW/0DSRtdzEBHEagWkcR+PVkS/mhElUZp3q 364gC1T3LZZmt/b0mbRWnNi90UiIRjCc2/FotmDMF8nrpiI2+fgZLw1V1+YMST3d5DQ/ gQ+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927515; x=1720532315; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tyFEGWJxkGrSCptMBdODXirPzhH2vgDyVwNv+dOPWNg=; b=YKRN7br90BItwWhRYPbKV6w26gEoQWYVCXAJ48xqBU/Rfp88TC8+sDIHbm6iE8yKJ5 Y8LBNZ8A5PouSOATch3wQQBXrLIl8WsZEIUzLir//M5Jz/LRIlKq4rsNR6CZRLbZ8SVg hHEj3eHZ0CpzUr66lILRKu1pJhda9H2uWm4zEZUUMFOwf1r+wZscwdaqmptIo180Th8d NLsEgtlxMpW16kChXxXSjgPbbDSDFn0prNgnPlzIsPxx/NlV55l6fbEdSJmWYkyu4bpy sD4IlzAoqyQmE6OlVopZwKZqBwASZckVhHkIkg4YXPhWWH1nkHeoX8eClzLzalgV2/k8 HaYw== X-Forwarded-Encrypted: i=2; AJvYcCVxtlCQIWGemgWO6xsWMMrk61F8d8nNq+UGNkRvFu8nOrjvdldHt2GmBuGvLr0KEJ3Xnk6EE80ZyN+YPC0+YBMx0erbc8k= X-Gm-Message-State: AOJu0YycK/yYlh0spLz5jIDkPOEi3H38ETrCtq7HE/JJpifZ98+tQyXD ORo1jNur/t9a8FPhFMZmnML0ltOU06OC+LI6TuQEvaWufAlY259Z X-Google-Smtp-Source: AGHT+IFSJwZdh+4tWuTw9XXhAOszv9dG5Q1h3xDEDKnqmLZRcrJKTjMi6Ax/kGphOGhuw899P+yY8w== X-Received: by 2002:a05:600c:448a:b0:425:77ad:93cd with SMTP id 5b1f17b1804b1-4257a009818mr55002295e9.14.1719927515138; 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-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 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; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20240702133832a9bd763c4249d66f07 for ; Tue, 02 Jul 2024 15:38:33 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-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 X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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