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

Merge pull request #461 from mwhudson/hostname-ffs 

write hostname/hosts/machine-id earlier
This commit is contained in:
Michael Hudson-Doyle 2019-04-16 11:34:59 +12:00 committed by GitHub
parent f1061785d2 496c3dcb2e
commit 8be843c2a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
subiquity/models/subiquity.py
View File

@ -93,7 +93,6 @@ class SubiquityModel:
def _cloud_init_config(self): def _cloud_init_config(self):
user = self.identity.user user = self.identity.user
hostname = self.identity.hostname.strip()
users_and_groups_path = ( users_and_groups_path = (
os.path.join(os.environ.get("SNAP", "."), os.path.join(os.environ.get("SNAP", "."),
"users-and-groups")) "users-and-groups"))
@ -122,26 +121,6 @@ class SubiquityModel:
'preserve_hostname': True, 'preserve_hostname': True,
'resize_rootfs': False, 'resize_rootfs': False,
'users': [user_info], 'users': [user_info],
'write_files': [
{
'path': '/etc/hostname',
'content': hostname + '\n',
'permissions': 0o644,
'owner': 'root:root',
},
{
'path': '/etc/hosts',
'content': HOSTS_CONTENT.format(hostname=hostname),
'permissions': 0o644,
'owner': 'root:root',
},
{
'path': '/etc/machine-id',
'content': open('/etc/machine-id').read(),
'permissions': 0o444,
'owner': 'root:root',
},
],
} }
if self.ssh.install_server: if self.ssh.install_server:
config['ssh_pwauth'] = self.ssh.pwauth config['ssh_pwauth'] = self.ssh.pwauth
@ -166,10 +145,13 @@ class SubiquityModel:
# (mwhudson does not entirely know what the above means!) # (mwhudson does not entirely know what the above means!)
userdata = '#cloud-config\n' + yaml.dump(self._cloud_init_config()) userdata = '#cloud-config\n' + yaml.dump(self._cloud_init_config())
metadata = yaml.dump({'instance-id': str(uuid.uuid4())}) metadata = yaml.dump({'instance-id': str(uuid.uuid4())})
hostname = self.identity.hostname.strip()
return [ return [
('var/lib/cloud/seed/nocloud-net/meta-data', metadata, 0o644), ('var/lib/cloud/seed/nocloud-net/meta-data', metadata, 0o644),
('var/lib/cloud/seed/nocloud-net/user-data', userdata, 0o600), ('var/lib/cloud/seed/nocloud-net/user-data', userdata, 0o600),
('etc/cloud/ds-identify.cfg', 'policy: enabled\n', 0o644), ('etc/cloud/ds-identify.cfg', 'policy: enabled\n', 0o644),
('etc/hostname', hostname + "\n", 0o644),
('etc/hosts', HOSTS_CONTENT.format(hostname=hostname), 0o644),
] ]
def configure_cloud_init(self): def configure_cloud_init(self):
@ -238,6 +220,12 @@ class SubiquityModel:
'etc_default_keyboard': { 'etc_default_keyboard': {
'path': 'etc/default/keyboard', 'path': 'etc/default/keyboard',
'content': self.keyboard.setting.render(), 'content': self.keyboard.setting.render(),
'permissions': 0o644,
},
'etc_machine_id': {
'path': 'etc/machine-id',
'content': open('/etc/machine-id').read(),
'permissions': 0o444,
}, },
}, },
} }