StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1970 from dbungert/lp-2060695-dpkg-grub 

models/subiquity: disable cc_dpkg_grub
This commit is contained in:
Olivier Gayot 2024-04-12 10:08:48 +02:00 committed by GitHub
parent 1b7fc279ec 037a8c2ece
commit 01f4db5894
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subiquity/models/subiquity.py
View File

@ -437,7 +437,9 @@ class SubiquityModel:
}, },
} }
) )
grub_dpkg = yaml.dump({"grub_dpkg": {"enabled": False}})
files = [ files = [
("etc/cloud/cloud.cfg.d/20-disable-cc-dpkg-grub.cfg", grub_dpkg, 0o644),
("etc/cloud/cloud.cfg.d/99-installer.cfg", config, 0o600), ("etc/cloud/cloud.cfg.d/99-installer.cfg", config, 0o600),
("etc/cloud/ds-identify.cfg", "policy: enabled\n", 0o644), ("etc/cloud/ds-identify.cfg", "policy: enabled\n", 0o644),
] ]

4
subiquity/models/tests/test_subiquity.py
View File

@ -277,6 +277,10 @@ class TestSubiquityModel(unittest.IsolatedAsyncioTestCase):
model.identity.add_user(main_user) model.identity.add_user(main_user)
model.userdata = {} model.userdata = {}
expected_files = { expected_files = {
"etc/cloud/cloud.cfg.d/20-disable-cc-dpkg-grub.cfg": """\
grub_dpkg:
enabled: false
""",
"etc/cloud/cloud.cfg.d/99-installer.cfg": re.compile( "etc/cloud/cloud.cfg.d/99-installer.cfg": re.compile(
"datasource:\n None:\n metadata:\n instance-id: .*\n userdata_raw: \"#cloud-config\\\\ngrowpart:\\\\n mode: \\'off\\'\\\\npreserve_hostname: true\\\\n\\\\\n" # noqa "datasource:\n None:\n metadata:\n instance-id: .*\n userdata_raw: \"#cloud-config\\\\ngrowpart:\\\\n mode: \\'off\\'\\\\npreserve_hostname: true\\\\n\\\\\n" # noqa
), ),