1
0
mirror of https://github.com/gryf/boxpy.git synced 2026-02-02 22:25:53 +01:00

3 Commits
1.8 ... 1.9.2

Author SHA1 Message Date
5f0def3103 Bump distribution latest version.
Also, updated mapping for the Fedora images.
2023-07-05 15:58:56 +02:00
43eabb9947 Fix nasty bug for debian images 2023-07-04 18:48:18 +02:00
55416db13d Added --type switch for start command 2023-04-20 19:42:21 +02:00

53
box.py
View File

@@ -18,11 +18,12 @@ import requests
import yaml import yaml
__version__ = "1.8" __version__ = "1.9.2"
CACHE_DIR = os.environ.get('XDG_CACHE_HOME', os.path.expanduser('~/.cache')) CACHE_DIR = os.environ.get('XDG_CACHE_HOME', os.path.expanduser('~/.cache'))
CLOUD_IMAGE = "ci.iso" CLOUD_IMAGE = "ci.iso"
FEDORA_RELEASE_MAP = {'32': '1.6', '33': '1.2', '34': '1.2'} FEDORA_RELEASE_MAP = {'32': '1.6', '33': '1.2', '34': '1.2', '35': '1.2',
'36': '1.5', '37': '1.7', '38': '1.6'}
DEBIAN_CODENAME_MAP = {'12': 'bookworm', '11': 'bullseye', '10': 'buster'} DEBIAN_CODENAME_MAP = {'12': 'bookworm', '11': 'bullseye', '10': 'buster'}
TYPE_MAP = {'HardDisk': 'disk', 'DVD': 'dvd', 'Floppy': 'floppy'} TYPE_MAP = {'HardDisk': 'disk', 'DVD': 'dvd', 'Floppy': 'floppy'}
DISTRO_MAP = {'ubuntu': 'Ubuntu', 'fedora': 'Fedora', DISTRO_MAP = {'ubuntu': 'Ubuntu', 'fedora': 'Fedora',
@@ -137,13 +138,37 @@ _boxpy() {
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
COMPREPLY=( $(compgen -W "bash" -- ${cur}) ) COMPREPLY=( $(compgen -W "bash" -- ${cur}) )
fi fi
;;
start)
items=(--type)
if [[ ${prev} == ${cmd} ]]; then
if [[ ${cmd} = "start" ]]; then
_vms_comp vms
else
COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
fi
else
_get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
case "${prev}" in
--type)
COMPREPLY=( $(compgen -W "gui headless sdl separate" \
-- ${cur}) )
;;
--*)
COMPREPLY=( )
;;
esac
fi
;; ;;
create|rebuild) create|rebuild)
items=(--cpus --disable-nested --disk-size --default-user --distro items=(--cpus --disable-nested --disk-size --default-user --distro
--forwarding --image --key --memory --hostname --port --config --forwarding --image --key --memory --hostname --port --config
--version --type) --version --type)
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
if [[ ${cmd} = "rebuild" ]]; then if [[ ${cmd} = "rebuild" || ${cmd} == "start" ]]; then
_vms_comp vms _vms_comp vms
else else
COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
@@ -195,11 +220,6 @@ _boxpy() {
_vms_comp runningvms _vms_comp runningvms
fi fi
;; ;;
start)
if [[ ${prev} == ${cmd} ]]; then
_vms_comp vms
fi
;;
stop) stop)
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
_vms_comp runningvms _vms_comp runningvms
@@ -621,6 +641,8 @@ class OsTypes:
if name not in self._ostypes: if name not in self._ostypes:
return 'Debian_64' return 'Debian_64'
return name
def get(self): def get(self):
if not hasattr(self, self._conf.distro): if not hasattr(self, self._conf.distro):
return "Linux_64" return "Linux_64"
@@ -1182,17 +1204,17 @@ DISTROS = {'ubuntu': {'username': 'ubuntu',
'realname': 'fedora', 'realname': 'fedora',
'img_class': Fedora, 'img_class': Fedora,
'amd64': 'x86_64', 'amd64': 'x86_64',
'default_version': '34'}, 'default_version': '38'},
'centos': {'username': 'centos', 'centos': {'username': 'centos',
'realname': 'centos', 'realname': 'centos',
'img_class': CentosStream, 'img_class': CentosStream,
'amd64': 'x86_64', 'amd64': 'x86_64',
'default_version': '8'}, 'default_version': '9'},
'debian': {'username': 'debian', 'debian': {'username': 'debian',
'realname': 'debian', 'realname': 'debian',
'img_class': Debian, 'img_class': Debian,
'amd64': 'amd64', 'amd64': 'amd64',
'default_version': '11'}} 'default_version': '12'}}
def get_image_object(vbox, version, image='ubuntu', arch='amd64'): def get_image_object(vbox, version, image='ubuntu', arch='amd64'):
@@ -1583,7 +1605,7 @@ def connect(args):
return Run(cmd, False).returncode return Run(cmd, False).returncode
def _set_vmstate(name, state): def _set_vmstate(name, state, guitype=None):
vbox = VBoxManage(name) vbox = VBoxManage(name)
if not vbox.get_vm_info(): if not vbox.get_vm_info():
@@ -1599,13 +1621,13 @@ def _set_vmstate(name, state):
return return
if state == "start": if state == "start":
vbox.poweron() vbox.poweron(guitype)
else: else:
vbox.acpipowerbutton() vbox.acpipowerbutton()
def vmstart(args): def vmstart(args):
_set_vmstate(args.name, 'start') _set_vmstate(args.name, 'start', args.type)
def vmstop(args): def vmstop(args):
@@ -1720,6 +1742,9 @@ def main():
start = subparsers.add_parser('start', help='start VM') start = subparsers.add_parser('start', help='start VM')
start.add_argument('name', help='name or UUID of the VM') start.add_argument('name', help='name or UUID of the VM')
start.add_argument('-t', '--type', default='headless',
help="VM run type, headless by default.",
choices=['gui', 'headless', 'sdl', 'separate'])
start.set_defaults(func=vmstart) start.set_defaults(func=vmstart)
stop = subparsers.add_parser('stop', help='stop VM') stop = subparsers.add_parser('stop', help='stop VM')