Skip to content

Commit 28749e5

Browse files
committed
fix(resolute): remove obsolete metadata_csum workaround and update Azure package list
Ubuntu 26.04 ships with GRUB 2.12+ which supports metadata_csum_seed natively (fixed upstream June 2021). The sed workaround in system_alicloud/apply.sh was a no-op on Resolute (pattern 'metadata_csum,' does not match 'metadata_csum_seed,') and is no longer needed. Update the Azure stemcell package list to reflect Ubuntu 26.04 (Resolute) changes: kernel cloud-tools bumped from 6.8 to 7.0, python3-pyrsistent replaced by python3-rpds-py, cloud-init-base split added, new jsonschema dependencies added (python3-jsonschema-specifications, python3-referencing), python3-passlib added, python3-setuptools removed (not installed by default in 26.04).
1 parent 8aa0512 commit 28749e5

4 files changed

Lines changed: 8 additions & 18 deletions

File tree

bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
azure-vm-utils
22
cloud-init
3-
linux-cloud-tools-6.8
4-
linux-cloud-tools-6.8-generic
3+
cloud-init-base
4+
libjs-sphinxdoc
5+
linux-cloud-tools-7.0
6+
linux-cloud-tools-7.0-generic
57
linux-cloud-tools-common
68
linux-cloud-tools-generic
79
netplan.io
@@ -16,10 +18,12 @@ python3-jinja2
1618
python3-json-pointer
1719
python3-jsonpatch
1820
python3-jsonschema
21+
python3-jsonschema-specifications
1922
python3-markupsafe
23+
python3-passlib
2024
python3-pyasn1
21-
python3-pyrsistent:amd64
25+
python3-referencing
2226
python3-requests
27+
python3-rpds-py
2328
python3-serial
24-
python3-setuptools
2529
python3-urllib3

bosh-stemcell/spec/assets/dpkg-list-ubuntu.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,6 @@ python3-pkg-resources
458458
python3-pygments
459459
python3-pyparsing
460460
python3-rich
461-
python3-setuptools
462461
python3-software-properties
463462
python3-typeguard
464463
python3-typing-extensions

bosh-stemcell/spec/stemcells/alicloud_spec.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,4 @@
1616
its(:content) { should match(/^PasswordAuthentication no$/) }
1717
end
1818
end
19-
20-
context "ext4 filesystems" do
21-
describe "should not contain ext4 feature metadata_csum" do
22-
subject { file("/etc/mke2fs.conf") }
23-
24-
its(:content) { should_not match(/metadata_csum/) }
25-
end
26-
end
2719
end

stemcell_builder/stages/system_alicloud/apply.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,3 @@ set -e
44

55
base_dir=$(readlink -nf $(dirname $0)/../..)
66
source $base_dir/lib/prelude_apply.bash
7-
8-
# Alicloud does not support ext4 feature 'metadata_csum'.
9-
# Remove it from root image and also disable it inside image for all ext4 filesystems created afterwards.
10-
sed -i "s/metadata_csum,//g" /etc/mke2fs.conf
11-
sed -i "s/metadata_csum,//g" $chroot/etc/mke2fs.conf

0 commit comments

Comments
 (0)