Skip to content

GitLab

Commit 3fc7e7c5 authored by Joel Alarcón's avatar Joel Alarcón Committed by Francesc Guasch
Browse files

* feat: new Ubuntu Bionic ISOs 

issue #709

* 709_bionic: feat: new Lubuntu Bionic ISOs

issue #709

* 709_bionic: feat: new Xubuntu Bionic ISOs issue #709

* 709_bionic: feat: Added Bionic's XMLs and volumes. issue #706

* 709_bionic: fix: Added cdrom controller. issue #709.

* Change this
for this

* 709_bionic: feat: new Kubuntu Bionic ISOs. issue #709.

* 709_bionic: fix: new xml for 32 bit bionic machines. issue #709

* replaced kubuntu by bionic

* 709_bionic: fix: new xml for Bionic 32 bits. issue #709

* Changing architecture and machine type

issue #709

* 709_bionic: fix: Changes to both bionic xml. issue #709.

* Changing HDD IDE to VirtIO in Bionic 32 and 64 bits

issue #709

* fix(iso): SWAP volume appears as VDA

When adding the new disk, it hunts for firs free slot.
As slot 5 was not in use, as in other XMLs, it is chosen.

issue #709
parent 1659e9fc
Hide whitespace changes
Inline Side-by-side
etc/xml/bionic-amd64.xml 0 → 100644
View file @ 3fc7e7c5
<domain type='kvm'>
<name>generic64</name>
<uuid>f481aa6f-3371-49eb-9fa4-f8576c9cfe54</uuid>
<memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
</os>
<features>
<acpi/>
<apic/>
<vmport state='off'/>
</features>
<cpu mode='custom' match='exact' check='partial'>
<model fallback='allow'>Penryn</model>
</cpu>
<clock offset='utc'>
<timer name='rtc' tickpolicy='catchup'/>
<timer name='pit' tickpolicy='delay'/>
<timer name='hpet' present='no'/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<pm>
<suspend-to-mem enabled='no'/>
<suspend-to-disk enabled='no'/>
</pm>
<devices>
<emulator>/usr/bin/kvm-spice</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/generic64.qcow2'/>
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
<boot order='1'/>
</disk>
<disk type='file' device='cdrom'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/ubuntu-18.04-desktop-amd64.iso'/>
<target dev='hdb' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
<boot order='2'/>
</disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x7'/>
</controller>
<controller type='usb' index='0' model='ich9-uhci1'>
<master startport='0'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0' multifunction='on'/>
</controller>
<controller type='usb' index='0' model='ich9-uhci2'>
<master startport='2'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x1'/>
</controller>
<controller type='usb' index='0' model='ich9-uhci3'>
<master startport='4'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller>
<controller type='virtio-serial' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
</controller>
<interface type='network'>
<mac address='52:54:00:80:91:92'/>
<source network='default'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
<serial type='pty'>
<target type='isa-serial' port='0'>
<model name='isa-serial'/>
</target>
</serial>
<console type='pty'>
<target type='serial' port='0'/>
</console>
<channel type='spicevmc'>
<target type='virtio' name='com.redhat.spice.0'/>
<address type='virtio-serial' controller='0' bus='0' port='1'/>
</channel>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='spice' autoport='yes'>
<listen type='address'/>
<image compression='off'/>
</graphics>
<sound model='ich6'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</sound>
<video>
<model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</video>
<redirdev bus='usb' type='spicevmc'>
<address type='usb' bus='0' port='1'/>
</redirdev>
<redirdev bus='usb' type='spicevmc'>
<address type='usb' bus='0' port='2'/>
</redirdev>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</memballoon>
</devices>
</domain>
etc/xml/bionic-i386.xml 0 → 100644
View file @ 3fc7e7c5
<domain type='kvm'>
<name>ubuntu32</name>
<uuid>09418fe0-d69f-4e5a-8f2b-0b5c8795f361</uuid>
<memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='i686' machine='pc'>hvm</type>
</os>
<features>
<acpi/>
<apic/>
<vmport state='off'/>
</features>
<cpu mode='custom' match='exact' check='partial'>
<model fallback='allow'>Penryn</model>
</cpu>
<clock offset='utc'>
<timer name='rtc' tickpolicy='catchup'/>
<timer name='pit' tickpolicy='delay'/>
<timer name='hpet' present='no'/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<pm>
<suspend-to-mem enabled='no'/>
<suspend-to-disk enabled='no'/>
</pm>
<devices>
<emulator>/usr/bin/kvm-spice</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/ubuntu32.qcow2'/>
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
<boot order='1'/>
</disk>
<disk type='file' device='cdrom'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/lubuntu-18.04-desktop-i386.iso'/>
<target dev='hdb' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
<boot order='2'/>
</disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x7'/>
</controller>
<controller type='usb' index='0' model='ich9-uhci1'>
<master startport='0'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0' multifunction='on'/>
</controller>
<controller type='usb' index='0' model='ich9-uhci2'>
<master startport='2'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x1'/>
</controller>
<controller type='usb' index='0' model='ich9-uhci3'>
<master startport='4'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller>
<controller type='virtio-serial' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
</controller>
<interface type='network'>
<mac address='52:54:00:ab:2f:19'/>
<source network='default'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
<serial type='pty'>
<target type='isa-serial' port='0'>
<model name='isa-serial'/>
</target>
</serial>
<console type='pty'>
<target type='serial' port='0'/>
</console>
<channel type='spicevmc'>
<target type='virtio' name='com.redhat.spice.0'/>
<address type='virtio-serial' controller='0' bus='0' port='1'/>
</channel>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='spice' autoport='yes'>
<listen type='address'/>
<image compression='off'/>
</graphics>
<sound model='ich6'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</sound>
<video>
<model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</video>
<redirdev bus='usb' type='spicevmc'>
<address type='usb' bus='0' port='1'/>
</redirdev>
<redirdev bus='usb' type='spicevmc'>
<address type='usb' bus='0' port='2'/>
</redirdev>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</memballoon>
</devices>
</domain>
etc/xml/bionic32-volume.xml 0 → 100644
View file @ 3fc7e7c5
<volume type='file'>
<name>__name__.img</name>
<key>/var/lib/libvirt/images/__name__.img</key>
<source>
</source>
<capacity unit='bytes'>9442450944</capacity>
<allocation unit='bytes'>5395775488</allocation>
<target>
<path>/var/lib/libvirt/images/__name__.img</path>
<format type='qcow2'/>
<permissions>
<mode>0600</mode>
<owner>0</owner>
<group>0</group>
</permissions>
<timestamps>
<atime>1461924534.956408726</atime>
<mtime>1461672183.623804946</mtime>
<ctime>1461672193.267892180</ctime>
</timestamps>
</target>
</volume>
etc/xml/bionic64-volume.xml 0 → 100644
View file @ 3fc7e7c5
<volume type='file'>
<name>__name__.img</name>
<key>/var/lib/libvirt/images/__name__.img</key>
<source>
</source>
<capacity unit='bytes'>9442450944</capacity>
<allocation unit='bytes'>5395775488</allocation>
<target>
<path>/var/lib/libvirt/images/__name__.img</path>
<format type='qcow2'/>
<permissions>
<mode>0600</mode>
<owner>0</owner>
<group>0</group>
</permissions>
<timestamps>
<atime>1461924534.956408726</atime>
<mtime>1461672183.623804946</mtime>
<ctime>1461672193.267892180</ctime>
</timestamps>
</target>
</volume>
lib/Ravada.pm
View file @ 3fc7e7c5
......@@ -183,6 +183,25 @@ sub _update_isos {
,md5_url => '$url/MD5SUMS'
,min_disk_size => '10'
},
mate_bionic => {
name => 'Ubuntu Mate Bionic 64 bits'
,description => 'Ubuntu Mate 18.04 (Bionic Beaver) 64 bits'
,arch => 'amd64'
,xml => 'bionic-amd64.xml'
,xml_volume => 'bionic64-volume.xml'
,url => 'http://cdimage.ubuntu.com/ubuntu-mate/releases/18.04.*/release/ubuntu-mate-18.04.*-desktop-amd64.iso'
,md5_url => '$url/MD5SUMS'
},
mate_bionic_i386 => {
name => 'Ubuntu Mate Bionic 32 bits'
,description => 'Ubuntu Mate 18.04 (Bionic Beaver) 32 bits'
,arch => 'i386'
,xml => 'bionic-i386.xml'
,xml_volume => 'bionic32-volume.xml'
,url => 'http://cdimage.ubuntu.com/ubuntu-mate/releases/18.04.*/release/ubuntu-mate-18.04.*-desktop-i386.iso'
,md5_url => '$url/MD5SUMS'
},
mate_xenial => {
name => 'Ubuntu Mate Xenial'
,description => 'Ubuntu Mate 16.04.3 (Xenial) 64 bits'
......@@ -215,6 +234,18 @@ sub _update_isos {
,md5_url => '$url/MD5SUMS'
,min_disk_size => '10'
}
,bionic=> {
name => 'Ubuntu Bionic Beaver'
,description => 'Ubuntu 18.04 Bionic Beaver 64 bits'
,arch => 'amd64'
,xml => 'bionic-amd64.xml'
,xml_volume => 'bionic64-volume.xml'
,url => 'http://releases.ubuntu.com/18.04/'
,file_re => 'ubuntu-18.04.*desktop-amd64.iso'
,md5_url => '$url/MD5SUMS'
,min_disk_size => '9'
}
,zesty => {
name => 'Ubuntu Zesty Zapus'
,description => 'Ubuntu 17.04 Zesty Zapus 64 bits'
......@@ -269,6 +300,50 @@ sub _update_isos {
,sha256_url => 'http://fedora.mirrors.ovh.net/linux/releases/27/Workstation/x86_64/iso/Fedora-Workstation-27-.*-x86_64-CHECKSUM'
,min_disk_size => '10'
}
,kubuntu_64 => {
name => 'Kubuntu Bionic Beaver 64 bits'
,description => 'Kubuntu 18.04 Bionic Beaver 64 bits'
,arch => 'amd64'
,xml => 'bionic-amd64.xml'
,xml_volume => 'bionic64-volume.xml'
,md5_url => '$url/MD5SUMS'
,url => 'http://cdimage.ubuntu.com/kubuntu/releases/18.04/release/'
,file_re => 'kubuntu-18.04-desktop-amd64.iso'
,rename_file => 'kubuntu_bionic_64.iso'
}
,kubuntu_32 => {
name => 'Kubuntu Bionic Beaver 32 bits'
,description => 'Kubuntu 18.04 Bionic Beaver 32 bits'
,arch => 'i386'
,xml => 'bionic-i386.xml'
,xml_volume => 'bionic32-volume.xml'
,md5_url => '$url/MD5SUMS'
,url => 'http://cdimage.ubuntu.com/kubuntu/releases/18.04/release/'
,file_re => 'kubuntu-18.04-desktop-i386.iso'
,rename_file => 'kubuntu_bionic_32.iso'
}
,xubuntu_beaver_64 => {
name => 'Xubuntu Bionic Beaver 64 bits'
,description => 'Xubuntu 18.04 Bionic Beaver 64 bits'
,arch => 'amd64'
,xml => 'bionic-amd64.xml'
,xml_volume => 'bionic64-volume.xml'
,md5_url => '$url/../MD5SUMS'
,url => 'http://archive.ubuntu.com/ubuntu/dists/bionic/main/installer-amd64/current/images/netboot/'
,file_re => 'mini.iso'
,rename_file => 'xubuntu_bionic_64.iso'
}
,xubuntu_beaver_32 => {
name => 'Xubuntu Bionic Beaver 32 bits'
,description => 'Xubuntu 18.04 Bionic Beaver 32 bits'
,arch => 'amd64'
,xml => 'bionic-i386.xml'
,xml_volume => 'bionic32-volume.xml'
,md5_url => '$url/../MD5SUMS'
,url => 'http://archive.ubuntu.com/ubuntu/dists/bionic/main/installer-i386/current/images/netboot/'
,file_re => 'mini.iso'
,rename_file => 'xubuntu_bionic_32.iso'
}
,xubuntu_artful => {
name => 'Xubuntu Artful Aardvark'
,description => 'Xubuntu 17.10 Artful Aardvark 64 bits'
......@@ -303,7 +378,24 @@ sub _update_isos {
,rename_file => 'xubuntu_xenial_mini.iso'
,min_disk_size => '10'
}
,lubuntu_aardvark => {
,lubuntu_bionic_64 => {
name => 'Lubuntu Bionic Beaver 64 bits'
,description => 'Lubuntu 18.04 Bionic Beaver 64 bits'
,url => 'http://cdimage.ubuntu.com/lubuntu/releases/18.04.*/release/lubuntu-18.04.*-desktop-amd64.iso'
,md5_url => '$url/MD5SUMS'
,xml => 'bionic-amd64.xml'
,xml_volume => 'bionic64-volume.xml'
}
,lubuntu_bionic_32 => {
name => 'Lubuntu Bionic Beaver 32 bits'
,description => 'Lubuntu 18.04 Bionic Beaver 32 bits'
,arch => 'i386'
,url => 'http://cdimage.ubuntu.com/lubuntu/releases/18.04.*/release/lubuntu-18.04.*-desktop-i386.iso'
,md5_url => '$url/MD5SUMS'
,xml => 'bionic-i386.xml'
,xml_volume => 'bionic32-volume.xml'
}
,lubuntu_aardvark => {
name => 'Lubuntu Artful Aardvark'
,description => 'Lubuntu 17.10 Artful Aardvark 64 bits'
,url => 'http://cdimage.ubuntu.com/lubuntu/releases/17.10.*/release/lubuntu-17.10.*-desktop-amd64.iso'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment