diff --git a/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt b/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt index 826f382eb1..5738a635bc 100644 --- a/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt +++ b/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt @@ -1,7 +1,9 @@ azure-vm-utils cloud-init -linux-cloud-tools-6.8 -linux-cloud-tools-6.8-generic +cloud-init-base +libjs-sphinxdoc +linux-cloud-tools-7.0 +linux-cloud-tools-7.0-generic linux-cloud-tools-common linux-cloud-tools-generic netplan.io @@ -16,10 +18,12 @@ python3-jinja2 python3-json-pointer python3-jsonpatch python3-jsonschema +python3-jsonschema-specifications python3-markupsafe +python3-passlib python3-pyasn1 -python3-pyrsistent:amd64 +python3-referencing python3-requests +python3-rpds-py python3-serial -python3-setuptools python3-urllib3 diff --git a/bosh-stemcell/spec/assets/dpkg-list-ubuntu.txt b/bosh-stemcell/spec/assets/dpkg-list-ubuntu.txt index 4a3135842b..68338916e9 100644 --- a/bosh-stemcell/spec/assets/dpkg-list-ubuntu.txt +++ b/bosh-stemcell/spec/assets/dpkg-list-ubuntu.txt @@ -458,7 +458,6 @@ python3-pkg-resources python3-pygments python3-pyparsing python3-rich -python3-setuptools python3-software-properties python3-typeguard python3-typing-extensions diff --git a/bosh-stemcell/spec/stemcells/alicloud_spec.rb b/bosh-stemcell/spec/stemcells/alicloud_spec.rb index f1002ca0dc..6a161b8a5f 100644 --- a/bosh-stemcell/spec/stemcells/alicloud_spec.rb +++ b/bosh-stemcell/spec/stemcells/alicloud_spec.rb @@ -16,12 +16,4 @@ its(:content) { should match(/^PasswordAuthentication no$/) } end end - - context "ext4 filesystems" do - describe "should not contain ext4 feature metadata_csum" do - subject { file("/etc/mke2fs.conf") } - - its(:content) { should_not match(/metadata_csum/) } - end - end end diff --git a/stemcell_builder/stages/system_alicloud/apply.sh b/stemcell_builder/stages/system_alicloud/apply.sh index d6a4ad7d2b..a214eeaf9d 100755 --- a/stemcell_builder/stages/system_alicloud/apply.sh +++ b/stemcell_builder/stages/system_alicloud/apply.sh @@ -4,8 +4,3 @@ set -e base_dir=$(readlink -nf $(dirname $0)/../..) source $base_dir/lib/prelude_apply.bash - -# Alicloud does not support ext4 feature 'metadata_csum'. -# Remove it from root image and also disable it inside image for all ext4 filesystems created afterwards. -sed -i "s/metadata_csum,//g" /etc/mke2fs.conf -sed -i "s/metadata_csum,//g" $chroot/etc/mke2fs.conf