kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 09:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pulled disabling of daemonautostart into separate task

Browse source
This commit is contained in:
Anders Ingemann 2013-07-07 17:33:19 +02:00
parent eec41422fc
commit ba1fd93308
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
providers/ec2/__init__.py
View file

@ -42,6 +42,7 @@ def tasks(tasklist, manifest):
filesystem.MountSpecials(),
locale.GenerateLocale(),
locale.SetTimezone(),
apt.DisableDaemonAutostart(),
apt.AptSources(),
apt.AptUpgrade(),
boot.ConfigureGrub(),

13
providers/ec2/tasks/apt.py
View file

@ -22,10 +22,9 @@ class AptSources(Task):
release=info.manifest.system['release'])))
class AptUpgrade(Task):
description = 'Upgrading packages and fixing broken dependencies'
class DisableDaemonAutostart(Task):
description = 'Disabling daemon autostart'
phase = phases.system_modification
after = [GenerateLocale, AptSources]
def run(self, info):
rc_policy_path = os.path.join(info.root, 'usr/sbin/policy-rc.d')
@ -37,6 +36,14 @@ class AptUpgrade(Task):
stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
stat.S_IRGRP | stat.S_IXGRP |
stat.S_IROTH | stat.S_IXOTH)
class AptUpgrade(Task):
description = 'Upgrading packages and fixing broken dependencies'
phase = phases.system_modification
after = [GenerateLocale, AptSources, DisableDaemonAutostart]
def run(self, info):
log_check_call(['chroot', info.root, 'apt-get', 'update'])
log_check_call(['chroot', info.root, 'apt-get', '-f', '-y', 'install'])
log_check_call(['chroot', info.root, 'apt-get', '-y', 'upgrade'])