From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7387032429685374976 X-Received: by 2002:a05:600c:3b88:b0:424:8acb:7d53 with SMTP id 5b1f17b1804b1-4257984deb1mr82384965e9.1.1719927516088; Tue, 02 Jul 2024 06:38:36 -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-Google-Smtp-Source: AGHT+IGiPT5fEUmCQ6AUpja6EusKwYoVoxYv+C/ySBsvox38W8WMZtBQ+txIZlTs7+PxABly+S3A 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 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-20240702133833ac4f4bf762155cd973-xg2zvw@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=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: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20240702133833ac4f4bf762155cd973 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=X6YlzVNV7WoD0qOJd9kRd7wiNN0kYOErySKQR5E5n4I=; b=f6HNJtd0V+s0jxiMwUkwZrJAQ1TXHQf8eJ8veXNQ8XgoPxtnrFcDGrRDx0pGylBnm0jhvT 5Jz5UK3O1bxQXPRopV2P7CpI8aKA5Xynq4soX+qHknPPokhwT6mTF2BWyewtEx5elrg2DRw4 xLkhZAfS7oIykBdG3neWSnqXS09J8=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: Wcn9FSipDXgT 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 \ -- 2.43.0