diff options
| author |  Neal Gompa <ngompa@fedoraproject.org>
| 2023-10-14 16:30:57 -0400 |
|---|---|---|
| committer | Neal Gompa <ngompa@fedoraproject.org>
| 2023-10-14 16:30:57 -0400 |
| commit | 118e70f9dbf2c3b60cad0ddaaec2917e8aa13745 (patch) | |
| tree | d1accb9a4301de56a58535d918a326fc83022275 | |
| parent | 48c770ad567da391ea5e4441462fa8aed26bbcde (diff) | |
| download | kiwi-descriptions-118e70f9dbf2c3b60cad0ddaaec2917e8aa13745.tar.gz kiwi-descriptions-118e70f9dbf2c3b60cad0ddaaec2917e8aa13745.zip | |
platforms/vagrant: Define Vagrant images for libvirt and VirtualBox
KIWI differentiates between libvirt and VirtualBox based Vagrant
images, especially for the box format, so now we split up the
Vagrant definition accordingly.
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | platforms/vagrant.xml | 37 |
2 files changed, 33 insertions, 6 deletions
@@ -10,7 +10,7 @@ All changes should be made via the PR workflow. * Cloud Edition (image type: `oem`, image profiles: `Cloud-OpenStack`/`Cloud-AmazonEC2`/`Cloud-Azure`/`Cloud-GCE`) * KDE Spin (image type: `iso`, image profiles: `KDE-Live`) -* Vagrant Cloud Edition (image type: `oem`, image profiles: `Vagrant`) +* Vagrant Cloud Edition (image type: `oem`, image profiles: `Vagrant-libvirt`/`Vagrant-VirtualBox`) * Workstation Edition (image type: `iso`, image profiles: `Workstation-Live`) ## Image build quickstart diff --git a/platforms/vagrant.xml b/platforms/vagrant.xml index 602f82f..5dc45bf 100644 --- a/platforms/vagrant.xml +++ b/platforms/vagrant.xml @@ -1,13 +1,20 @@ <image> <profiles> - <profile name="Vagrant" description="Vagrant guest image"> + <profile name="VagrantCore" description="Vagrant core packages"> <requires profile="CloudCore"/> </profile> + <profile name="Vagrant-libvirt" description="Vagrant guest image for libvirt"> + <requires profile="VagrantCore"/> + </profile> + <profile name="Vagrant-VirtualBox" description="Vagrant guest image for VirtualBox"> + <requires profile="VagrantCore"/> + </profile> </profiles> - <preferences profiles="Vagrant"> + <preferences profiles="Vagrant-libvirt"> <type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" format="vagrant" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora"> <bootloader name="grub2" console="serial" timeout="1"/> <size unit="G">5</size> + <vagrantconfig provider="libvirt" virtualsize="5"/> <systemdisk> <volume name="@root=root"/> <volume name="home" parent="/"/> @@ -18,20 +25,40 @@ </oemconfig> </type> </preferences> - <users profiles="Vagrant"> + <preferences profiles="Vagrant-VirtualBox"> + <type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" format="vagrant" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora"> + <bootloader name="grub2" console="serial" timeout="1"/> + <size unit="G">5</size> + <vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="5"/> + <systemdisk> + <volume name="@root=root"/> + <volume name="home" parent="/"/> + <volume name="var" parent="/"/> + </systemdisk> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <users profiles="VagrantCore"> <!-- Standard password for the vagrant user, used by all images --> <user name="vagrant" groups="vagrant" password="vagrant" home="/home/vagrant" pwdformat="plain" /> <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/> </users> - <packages type="image" patternType="plusRecommended" profiles="Vagrant"> + <packages type="image" patternType="plusRecommended" profiles="VagrantCore"> <package name="dnf-yum"/> <package name="rsync"/> <package name="fuse-sshfs"/> <package name="gdisk"/> <package name="glibc-langpack-en"/> + </packages> + <packages type="image" patternType="plusRecommended" profiles="Vagrant-libvirt"> <package name="qemu-guest-agent"/> </packages> - <packages type="uninstall" profiles="Vagrant"> + <packages type="image" patternType="plusRecommended" profiles="Vagrant-VirtualBox"> + <package name="virtualbox-guest-additions"/> + </packages> + <packages type="uninstall" profiles="VagrantCore"> <package name="cloud-init"/> </packages> </image> |