mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-24 15:36:27 +00:00
Merge pull request #53 from myhro/tasksel
Add option to install packages from tasksel
This commit is contained in:
commit
8495a5a421
3 changed files with 19 additions and 1 deletions
|
@ -71,6 +71,9 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"minItems": 1
|
"minItems": 1
|
||||||
|
},
|
||||||
|
"install_standard": {
|
||||||
|
"type": "boolean"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"additionalProperties": false
|
"additionalProperties": false
|
||||||
|
|
|
@ -65,6 +65,8 @@ def get_apt_set(manifest):
|
||||||
base.append(apt.InstallTrustedKeys)
|
base.append(apt.InstallTrustedKeys)
|
||||||
if 'install' in manifest.packages:
|
if 'install' in manifest.packages:
|
||||||
base.append(packages.AddManifestPackages)
|
base.append(packages.AddManifestPackages)
|
||||||
|
if manifest.packages.get('install_standard', False):
|
||||||
|
base.append(packages.AddTaskselStandardPackages)
|
||||||
return base
|
return base
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
from base import Task
|
from base import Task
|
||||||
from common import phases
|
from common import phases
|
||||||
from common.tasks import apt
|
from common.tasks import apt
|
||||||
|
from common.tools import log_check_call
|
||||||
|
|
||||||
|
|
||||||
class AddManifestPackages(Task):
|
class AddManifestPackages(Task):
|
||||||
|
@ -74,7 +75,6 @@ class InstallPackages(Task):
|
||||||
@classmethod
|
@classmethod
|
||||||
def install_local(cls, info, local_packages):
|
def install_local(cls, info, local_packages):
|
||||||
from shutil import copy
|
from shutil import copy
|
||||||
from common.tools import log_check_call
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
absolute_package_paths = []
|
absolute_package_paths = []
|
||||||
|
@ -97,3 +97,16 @@ class InstallPackages(Task):
|
||||||
|
|
||||||
for path in absolute_package_paths:
|
for path in absolute_package_paths:
|
||||||
os.remove(path)
|
os.remove(path)
|
||||||
|
|
||||||
|
|
||||||
|
class AddTaskselStandardPackages(Task):
|
||||||
|
description = 'Adding standard packages from tasksel'
|
||||||
|
phase = phases.package_installation
|
||||||
|
predecessors = [apt.AptUpdate]
|
||||||
|
successors = [InstallPackages]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def run(cls, info):
|
||||||
|
tasksel_packages = log_check_call(['chroot', info.root, 'tasksel', '--task-packages', 'standard'])
|
||||||
|
for pkg in tasksel_packages:
|
||||||
|
info.packages.add(pkg)
|
||||||
|
|
Loading…
Add table
Reference in a new issue