kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #430 from octivi/cleaning_machine_id

Browse source 
Cleaning machine ID
This commit is contained in:
Anders Ingemann 2018-01-14 17:20:09 +01:00 • committed by GitHub
commit 4c8529569c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bootstrapvz/common/task_groups.py
View file

@ -35,7 +35,7 @@ def get_standard_groups(manifest):
group.extend(security_group) group.extend(security_group)
group.extend(get_locale_group(manifest)) group.extend(get_locale_group(manifest))
group.extend(get_bootloader_group(manifest)) group.extend(get_bootloader_group(manifest))
group.extend(cleanup_group) group.extend(get_cleanup_group(manifest))
return group return group
@ -200,10 +200,18 @@ def get_fs_specific_group(manifest):
return list(group) return list(group)
cleanup_group = [cleanup.ClearMOTD, def get_cleanup_group(manifest):
from bootstrapvz.common.releases import jessie
group = [cleanup.ClearMOTD,
cleanup.CleanTMP, cleanup.CleanTMP,
] ]
if manifest.release >= jessie:
group.append(cleanup.ClearMachineId)
return group
rollback_map = {workspace.CreateWorkspace: workspace.DeleteWorkspace, rollback_map = {workspace.CreateWorkspace: workspace.DeleteWorkspace,
loopback.Create: volume.Delete, loopback.Create: volume.Delete,

17
bootstrapvz/common/tasks/cleanup.py
View file

@ -30,3 +30,20 @@ class CleanTMP(Task):
log = os.path.join(info.root, 'var/log/') log = os.path.join(info.root, 'var/log/')
os.remove(os.path.join(log, 'bootstrap.log')) os.remove(os.path.join(log, 'bootstrap.log'))
os.remove(os.path.join(log, 'dpkg.log')) os.remove(os.path.join(log, 'dpkg.log'))
class ClearMachineId(Task):
description = 'Clearing the Machine ID'
phase = phases.system_cleaning
@classmethod
def run(cls, info):
import logging
log = logging.getLogger(__name__)
for machineid_file in [os.path.join(info.root, f) for f in ['etc/machine-id', 'var/lib/dbus/machine-id']]:
if os.path.isfile(machineid_file):
log.debug(machineid_file + ' found, clearing')
with open(machineid_file, 'w'):
pass
else:
log.debug(machineid_file + ' not found, not clearing')

2
bootstrapvz/providers/docker/__init__.py
View file

@ -21,7 +21,7 @@ def resolve_tasks(taskset, manifest):
taskset.update(task_groups.get_apt_group(manifest)) taskset.update(task_groups.get_apt_group(manifest))
taskset.update(task_groups.get_locale_group(manifest)) taskset.update(task_groups.get_locale_group(manifest))
taskset.update(task_groups.security_group) taskset.update(task_groups.security_group)
taskset.update(task_groups.cleanup_group) taskset.update(task_groups.get_cleanup_group(manifest))
# Let the autostart of daemons by apt remain disabled # Let the autostart of daemons by apt remain disabled
taskset.discard(apt.EnableDaemonAutostart) taskset.discard(apt.EnableDaemonAutostart)