From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7325872962512355328 X-Received: by 2002:a05:6214:c65:b0:681:5aa6:46f1 with SMTP id t5-20020a0562140c6500b006815aa646f1mr303869qvj.29.1705687717393; Fri, 19 Jan 2024 10:08:37 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a0c:b345:0:b0:67a:203f:dbc7 with SMTP id a5-20020a0cb345000000b0067a203fdbc7ls1779770qvf.1.-pod-prod-06-us; Fri, 19 Jan 2024 10:08:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEtq9WPqLqrYZh4sfdnP6uz5KqOL4VEklIVY9qGUuLZIHfsJsjtIr0AaHQK9I55iWJ0XiE6 X-Received: by 2002:ac5:cbf5:0:b0:4b7:8d7c:347d with SMTP id i21-20020ac5cbf5000000b004b78d7c347dmr107283vkn.10.1705687716283; Fri, 19 Jan 2024 10:08:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705687716; cv=none; d=google.com; s=arc-20160816; b=0T2XutiM6S1PBc2/Q8pc70URDxdWrGuel5qpqG3ElPSEajK5G8rXWIDYqSMCKrYhyg c2uHGsSx/lMT6/tggEe2c4p9l+bBq6A+YM5Nd5i1SCaD42a1vAZ4dPQvevp5BOyCGZkM KU6geWmIUgWpHpG2lTDL25gmQeH2PWbFsU2gRidRLPA38nCVXSRlR6tEBBxqxsYExvTT ZCJVe1PSENyxZnxDG/ybuFr/dLhx2rIMqnU28IdHZxBX+g8SEJN4zLghTrFVFrgp02i+ MJT/gIuQUXETWM/nXOx+YAaLPjMyzNWpepSxWu+FXX/oPsarefq9iQ4hoNSLibKmSZqN H8iA== 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:message-id:date :subject:to:from:dkim-signature; bh=o6Y7c4e3ZNLDbqJT/P1smMpCN4kasX4z9vq5OGIJRx8=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=QkX8urrP7PvC7SKynOWhxwrpqY+wUAfDSw+uc/edbtyq65uFs/wys+dvL7oDjrSJVg GYr3JjiKxMyVILK8ryPDPCqfjre6KGtaLOFKsxLA88emK7ZPRAZu5k5TLsaPH/imQK78 wYEAuCnjQ5w0o6ejh3ipyU19rs/O4OqcWFI7CxxThUr2PpJSMgz66DzLZJMNOUOdB3YJ QgDnnjIA34Qu2+vpg4sEh0R2igMNWEqilqwGhnmSY1DaIdon317U+bneCrEBaAbBm9O0 d7ZXI2BOr5mDmqKnOkkTK0p/m/RNcYZv72cpkILPLgmV184bi2azhbaBDbaMqM2qjMk8 K8dA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=kQt4hjPm; spf=pass (google.com: domain of fm-51332-202401191808349bf79a3469ad0e7f00-_vzd9p@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-51332-202401191808349bf79a3469ad0e7f00-_VZd9P@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id p129-20020a1fd887000000b004b7487bda5asi2223635vkg.3.2024.01.19.10.08.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jan 2024 10:08:36 -0800 (PST) Received-SPF: pass (google.com: domain of fm-51332-202401191808349bf79a3469ad0e7f00-_vzd9p@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=kQt4hjPm; spf=pass (google.com: domain of fm-51332-202401191808349bf79a3469ad0e7f00-_vzd9p@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-51332-202401191808349bf79a3469ad0e7f00-_VZd9P@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202401191808349bf79a3469ad0e7f00 for ; Fri, 19 Jan 2024 19:08:34 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=o6Y7c4e3ZNLDbqJT/P1smMpCN4kasX4z9vq5OGIJRx8=; b=kQt4hjPmaNIDOALmDJZt50HNRphRjq53Y+UyJcbNmN7qqiUZuONpV1ydbOFumixO72pdKw aBJhqF+0i/71qxEfZU4LJaUKakbp2oe8t95FdH9NAGIsxClVJL9sZWT1ceCjS7c6z7PgtjvK 5/0ury1RXzSI02oP46N2B3xqagwmk=; From: Quirin Gylstorff To: isar-users@googlegroups.com Subject: [PATCH] expand-on-first-boot: Expand crypto_LUKS partition Date: Fri, 19 Jan 2024 19:08:11 +0100 Message-ID: <20240119180833.2097721-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-TUID: kFp45erh9lQ0 From: Quirin Gylstorff Add the option to expand a encrypted LUKS partition. A passphrase is required to resize the partition. If cryptsetup is not installed the service still fails with an error message. Signed-off-by: Quirin Gylstorff --- .../files/expand-last-partition.sh | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh index 7d658864..94962e40 100755 --- a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh +++ b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh @@ -65,14 +65,28 @@ fi # some filesystems need to be mounted i.e. btrfs, but mounting also helps # detect the filesystem type without having to wait for udev # mount $LAST_PART out of tree, so we won't conflict with other mounts -MOUNT_POINT=$(mktemp -d -p "" "$(basename "$0").XXXXXXXXXX") -mount "${LAST_PART}" "${MOUNT_POINT}" - ret=0 # Determine the filesystem type and perform the appropriate resize function -FS_TYPE=$(findmnt -fno FSTYPE "${MOUNT_POINT}" ) +FS_TYPE=$(blkid --output value --match-tag TYPE "${LAST_PART}" ) +MOUNT_POINT=$(mktemp -d -p "" "$(basename "$0").XXXXXXXXXX") +if [ "$FS_TYPE" = "crypto_LUKS" ]; then + if [ ! -x /usr/sbin/cryptsetup ]; then + echo "'cryptsetup' is missing cannot resize last partition as it is from type 'crypto_LUKS'" + exit 1 + fi + last_part_device_name=${LAST_PART#\/dev/} + + mapping_name=$(cat /sys/class/block/"$last_part_device_name"/holders/*/dm/name) + cryptsetup resize "$mapping_name" + mount /dev/mapper/"$mapping_name" "${MOUNT_POINT}" + FS_TYPE=$(findmnt -fno FSTYPE "${MOUNT_POINT}" ) + LAST_PART=/dev/mapper/"$mapping_name" +else + mount "${LAST_PART}" "${MOUNT_POINT}" +fi case ${FS_TYPE} in ext*) + # Do not fail resize2fs if no mtab entry is found, e.g., # when using systemd mount units. export EXT2FS_NO_MTAB_OK=1 -- 2.43.0