From patchwork Tue Jul 2 13:38:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3653 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:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dckmc029561 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:46 +0200 Received: by mail-wm1-f61.google.com with SMTP id 5b1f17b1804b1-42566fb83c5sf7140975e9.2 for ; Tue, 02 Jul 2024 06:38:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927516; cv=pass; d=google.com; s=arc-20160816; b=OZ1FVNu2dUVvYnTTVYyXtdG1DgFoQJxoD15fH/Vs+s1Ze/Rj/d16VSbxP3D5typ/7T As9drQYFLDppvQYIanOtCb5ps5zz+CZfWSfypMikYGZOi0LRiNMX4YZSMAg2pE52mOxn h/ho5T/RTjuXdv5HlldqhYnPS58/sJ9Q1n+xpr01Ww5sRWEM2QxSIbhiERGSWWZOVzie LJIP4NGUMVlxFlkilfpzD2kamHzPqckyQly23m6meFAPWchFtZO5uXM26FulKp5vRJG+ yUePwJV/0cpCjh8aN50bNE2ob/zvb2xGX3Imtje3NgTerIiydP1JCDy8vmd6pe3fzpHV khGA== 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=u7SeSXqXmIXecWfkRayVIT9eZt13l/VdcGIYRy6mJxQ=; fh=AglkW81VytrYJENyWiZLapV/t22ve1AzPjgf1/t0EDQ=; b=kgeXk3gsqUANSF8BbCzFfyHsprzX86uDJVoTZp+y/PY/Zx2OPFO9xIEOIgPjJxCaOb FErSsDJA8ObwV8imwk90yqQAQ5mmCfcDQ0WnyHXs/F9vAtDtFg5qr5sxXeyo/X0o5NUu 74TZR3TiSOgtDxkMkgJdZK8JS5T/UGuZW/pFDvlCBJUpFxSiKILG9ofKUjb3WyA0WriC cFsBDvyUpILpiPwahU5BDLlqLtvF92r4s29OwJz3SerjnZ61OVZVOHgB4g80eVFd2U+o lfioBSRdGHFLTXfe+9FulV+Yg45lDkx+VIb3Fbam6o8qIULousdISt3y8RR2/99GJ+rs OU/w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=f6HNJtd0; spf=pass (google.com: domain of fm-294854-20240702133833ac4f4bf762155cd973-xg2zvw@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133833ac4f4bf762155cd973-xG2zVw@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=1719927516; x=1720532316; 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=u7SeSXqXmIXecWfkRayVIT9eZt13l/VdcGIYRy6mJxQ=; b=ipnku5/cxpd0Ka7tJ3slR/ofYb5IEJ4DQH6bTeaJmLRNQcWgI+mQtkIEob4b4STOiw 3+rAqXpPWCp7rp4LtAixXpoZPP4Au2SbVIVc2WkLJskPJtFmijCQFWPm//LwJwm012iW QtsScDbaUzNSaBQKLOE6SWc1XLFSkiQpz+BDyd8gawI3tLFEf/ECW1EZR7AyMO4nKoJf NA8tgE6qhnJj1no0OR+biMw5XrD8RN00Yk/x8JdGKfZYqeEhoE/6jiA1f2ED3e0hpiWc wI7ltecsC584ErnNx2rsdueceSpf2FAR9MUGTT7pRzsYpOk1wizDZmUkg+KBjfl0MQer CvAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927516; x=1720532316; 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=u7SeSXqXmIXecWfkRayVIT9eZt13l/VdcGIYRy6mJxQ=; b=lqrvFzFiv6kO/aNm4yyJa9BVK+03UmmdDcaGWAOHDbeP6s2suVHD3YEBIWYYHlZVZf 9KwMbpl49D0+E0bwoWjx+o0O+OR7OqU1pKw92FLr+gggFdVvZ0UHmFMFe+rBG5CE8O3r J9EspB7J7IqBqVE3GzoWIQihJ7A4Zzms1r6DUvE1efEy24v94kVD9GtTwH0c93/avAiG lyHO8VcauV8f1Tf/k6YMvlElxMWYNrQT2d1P0TCSnY+x/yL7mLlagQWrXZqPg+HdC6Ze CC+fa1y35atxnjWQhoEjRxIHL6qU6EBa90Sd+RutI4IVkuobzrMxeErmaX0p/VqswM0d aK8A== X-Forwarded-Encrypted: i=2; AJvYcCUynZTr3yA5x63W4vUUrxVg8fFIAF475cRNxnUOadMj7vAjMoELEPMrfktPyAkXklwF8gzyvuG1fg10eMMkxWC0VHgHa0w= X-Gm-Message-State: AOJu0YwwFpNCld5ynGZGGBrzqbiszSZpqLFC9T/lvFCAjaDw9eHqr8s+ jWUcx/m0A9t35As6kTl0rAPVqrG/mYiVw/U5s4ZaJFeJ3GpF2AvG X-Google-Smtp-Source: AGHT+IHPjZ89BsZESnk95MmVdQdP9ZiXoaleXEskuXxXNguTCU6bZ3qCUlw3Ge/Y2lFK4zOp5aBkUQ== X-Received: by 2002:a05:600c:2e49:b0:425:7ac6:96f9 with SMTP id 5b1f17b1804b1-4257ac69974mr55617145e9.0.1719927515963; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c07:b0:421:a575:99a8 with SMTP id 5b1f17b1804b1-4256c1c7067ls21930105e9.2.-pod-prod-00-eu; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-Received: by 2002:a05:600c:47d0:b0:424:aa5a:280e with SMTP id 5b1f17b1804b1-4256d4d3117mr105807165e9.8.1719927513894; 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=JRpaxbrwOMm8BdK03hiZpo3+FSCTnfbpMRGzns2hp5+Qzg/uE/kg+RU+gMtv/r4Ft2 VhuaKWxadm8Ga9+kGJUBcUN5Xef76vCgKa5TykjBUpqBiL8MlL51G7eEZjIiiU0UnfXO 6tZwJIaGA7m9QSDMkBG1WY7U2YZtWrzV31zOm1mXuZZuZV7im8fjYYgr2ZUnB8+KwvHn kIQwUiKFap2PDkrVjOmw+hZtZj18rrLFTG/NgTxC61hXwxfYqH+Oh+nPTSXrpf9VW3Dw 7NDnN0SYeQp6Oj/pWOfSPLZhpOsbwj43250xNmkplQvGnB/0glCXEVlwsA2NZxU47E/0 j1pg== 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=X6YlzVNV7WoD0qOJd9kRd7wiNN0kYOErySKQR5E5n4I=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=jbMsXxcMzR3sPUR5gNPuGq8O7tczeGtqBGIZi9dI+Lbp90PuoHy1lDMPcJ5fWgLmMm 9rTZr6TvBU/9AQtZjbLNJLtielcOmH+rY5RUyqi8pACihQ44RPFS9a7ngqfK4saVsQJb 0IZBaAvYkZnLwNl5yBMFB13N4zbB7Bvdw2V2HFZnazL9LGVM9sBNkqCHaRkCLI/N+LDa 76WzKmNcTLIOu1Pqb+8Ew2tan2hHeHjlKApa2lZc8q4+/fSG/30iE7eiawpT3VcdyU/W KY/1sEpytOFxGQZ5TbMuBco93ekW3FwFaLp69A3mUNnQaFRfD4Y5qQVkt9eFQ5Rrr7+2 SSYg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=f6HNJtd0; spf=pass (google.com: domain of fm-294854-20240702133833ac4f4bf762155cd973-xg2zvw@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133833ac4f4bf762155cd973-xG2zVw@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-20240702133833ac4f4bf762155cd973-xg2zvw@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 20240702133833ac4f4bf762155cd973 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 12/17] meta-isar: deploy-image: Improve target device list dialog Date: Tue, 2 Jul 2024 15:38:26 +0200 Message-ID: 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=f6HNJtd0; spf=pass (google.com: domain of fm-294854-20240702133833ac4f4bf762155cd973-xg2zvw@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133833ac4f4bf762155cd973-xG2zVw@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 Sort the list by device name to make navigation easier. Show also if a device probably still contains data. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 35029728..673b2eb3 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 @@ -80,9 +80,14 @@ fi 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+=("/dev/$target" "/dev/$target $target_size") + for target in $(echo "$target_device_list" | xargs -n1 | sort); do + target_size=$(lsblk --nodeps --noheadings -o SIZE /dev/"$target" | tr -d " ") + if cmp /dev/zero /dev/"$target" -n 1M; then + state="empty" + else + state="contains data" + fi + array+=("/dev/$target" "/dev/$target ($target_size, $state)") done if ! TARGET_DEVICE=$(dialog --no-tags \ --menu "Select device to install image to" 10 60 3 \