Skip to content

Commit

Permalink
Merge pull request #276 from JuliusLongmind/master
Browse files Browse the repository at this point in the history
Fedora 38 support
  • Loading branch information
ladar authored Aug 31, 2023
2 parents db0bafb + 0dd2026 commit 6d4bbe9
Show file tree
Hide file tree
Showing 28 changed files with 1,655 additions and 1 deletion.
99 changes: 99 additions & 0 deletions generic-hyperv.json
Original file line number Diff line number Diff line change
Expand Up @@ -2990,6 +2990,56 @@
"generic-fedora37-hyperv"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/fedora38/fixdns.sh",
"scripts/fedora38/hostname.sh",
"scripts/fedora38/dnf.sh"
],
"start_retry_timeout": "15m",
"expect_disconnect": "true",
"only": [
"generic-fedora38-hyperv"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/fedora38/fixtmp.sh",
"scripts/fedora38/base.sh"
],
"pause_before": "120s",
"start_retry_timeout": "15m",
"expect_disconnect": "true",
"only": [
"generic-fedora38-hyperv"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/fedora38/kernel.sh",
"scripts/fedora38/updatedb.sh",
"scripts/fedora38/vga.sh",
"scripts/fedora38/virtualbox.sh",
"scripts/fedora38/parallels.sh",
"scripts/fedora38/vmware.sh",
"scripts/fedora38/qemu.sh",
"scripts/fedora38/vagrant.sh",
"scripts/fedora38/tuning.sh",
"scripts/fedora38/cleanup.sh"
],
"pause_before": "120s",
"start_retry_timeout": "15m",
"expect_disconnect": "true",
"only": [
"generic-fedora38-hyperv"
]
},
{
"type": "shell",
"timeout": "120m",
Expand Down Expand Up @@ -6489,6 +6539,55 @@
"guest_additions_mode": "disable",
"enable_virtualization_extensions": false
},
{
"type": "hyperv-iso",
"name": "generic-fedora38-hyperv",
"vm_name": "generic-fedora38-hyperv",
"temp_path": "output/",
"output_directory": "output/generic-fedora38-hyperv",
"boot_wait": "20s",
"boot_keygroup_interval": "1s",
"boot_command": [
"c<wait>",
"insmod all_video<enter><wait>",
"set gfxpayload=keep<enter><wait>",
"insmod increment<enter><wait>",
"insmod xfs<enter><wait>",
"insmod diskfilter<enter><wait>",
"insmod mdraid1x<enter><wait>",
"insmod fat<enter><wait>",
"insmod blscfg<enter><wait>",
"insmod gzio<enter><wait>",
"insmod part_gpt<enter><wait>",
"insmod ext2<enter><wait>",
"insmod chain<enter><wait>",
"search --no-floppy --set=root -l 'Fedora-S-dvd-x86_64-38'<enter><wait>",
"linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-S-dvd-x86_64-38 rd.live.check ",
"net.ifnames=0 inst.text inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/generic.fedora38.vagrant.ks<enter><wait>",
"initrd /images/pxeboot/initrd.img<enter><wait10>",
"boot<enter><wait>"
],
"disk_size": 131072,
"memory": 2048,
"cpus": 2,
"http_directory": "http",
"iso_url": "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Server/x86_64/iso/Fedora-Server-netinst-x86_64-38-1.6.iso",
"iso_checksum": "sha256:192af621553aa32154697029e34cbe30152a9e23d72d55f31918b166979bbcf5",
"ssh_username": "root",
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_timeout": "7200s",
"shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now",
"generation": 1,
"headless": true,
"communicator": "ssh",
"skip_compaction": false,
"enable_secure_boot": false,
"enable_mac_spoofing": false,
"enable_dynamic_memory": false,
"guest_additions_mode": "disable",
"enable_virtualization_extensions": false
},
{
"type": "hyperv-iso",
"name": "generic-alpine317-hyperv",
Expand Down
99 changes: 99 additions & 0 deletions generic-libvirt.json
Original file line number Diff line number Diff line change
Expand Up @@ -2990,6 +2990,56 @@
"generic-fedora37-libvirt"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/fedora38/fixdns.sh",
"scripts/fedora38/hostname.sh",
"scripts/fedora38/dnf.sh"
],
"start_retry_timeout": "15m",
"expect_disconnect": "true",
"only": [
"generic-fedora38-libvirt"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/fedora38/fixtmp.sh",
"scripts/fedora38/base.sh"
],
"pause_before": "120s",
"start_retry_timeout": "15m",
"expect_disconnect": "true",
"only": [
"generic-fedora38-libvirt"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/fedora38/kernel.sh",
"scripts/fedora38/updatedb.sh",
"scripts/fedora38/vga.sh",
"scripts/fedora38/virtualbox.sh",
"scripts/fedora38/parallels.sh",
"scripts/fedora38/vmware.sh",
"scripts/fedora38/qemu.sh",
"scripts/fedora38/vagrant.sh",
"scripts/fedora38/tuning.sh",
"scripts/fedora38/cleanup.sh"
],
"pause_before": "120s",
"start_retry_timeout": "15m",
"expect_disconnect": "true",
"only": [
"generic-fedora38-libvirt"
]
},
{
"type": "shell",
"timeout": "120m",
Expand Down Expand Up @@ -6487,6 +6537,55 @@
"ssh_timeout": "3600s",
"shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now"
},
{
"type": "qemu",
"name": "generic-fedora38-libvirt",
"vm_name": "generic-fedora38-libvirt",
"output_directory": "output/generic-fedora38-libvirt",
"qemu_binary": "qemu-system-x86_64",
"boot_wait": "20s",
"boot_keygroup_interval": "1s",
"boot_command": [
"c<wait>",
"insmod all_video<enter><wait>",
"set gfxpayload=keep<enter><wait>",
"insmod increment<enter><wait>",
"insmod xfs<enter><wait>",
"insmod diskfilter<enter><wait>",
"insmod mdraid1x<enter><wait>",
"insmod fat<enter><wait>",
"insmod blscfg<enter><wait>",
"insmod gzio<enter><wait>",
"insmod part_gpt<enter><wait>",
"insmod ext2<enter><wait>",
"insmod chain<enter><wait>",
"search --no-floppy --set=root -l 'Fedora-S-dvd-x86_64-38'<enter><wait>",
"linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-S-dvd-x86_64-38 rd.live.check ",
"net.ifnames=0 inst.text inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/generic.fedora38.vagrant.ks<enter><wait>",
"initrd /images/pxeboot/initrd.img<enter><wait10>",
"boot<enter><wait>"
],
"format": "qcow2",
"disk_size": "131072",
"disk_discard": "unmap",
"disk_detect_zeroes": "on",
"disk_cache": "unsafe",
"disk_image": false,
"disk_compression": true,
"disk_interface": "virtio-scsi",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
"http_directory": "http",
"headless": true,
"iso_url": "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Server/x86_64/iso/Fedora-Server-netinst-x86_64-38-1.6.iso",
"iso_checksum": "sha256:192af621553aa32154697029e34cbe30152a9e23d72d55f31918b166979bbcf5",
"ssh_username": "root",
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_timeout": "3600s",
"shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now"
},
{
"type": "qemu",
"name": "generic-alpine317-libvirt",
Expand Down
80 changes: 80 additions & 0 deletions generic-parallels.json
Original file line number Diff line number Diff line change
Expand Up @@ -8822,6 +8822,86 @@
"parallels_tools_guest_path": "/root/parallels-tools-linux.iso",
"prlctl_version_file": "/root/parallels-tools-version.txt"
},

{
"type": "parallels-iso",
"name": "generic-fedora38-parallels",
"vm_name": "generic-fedora38-parallels",
"output_directory": "output/generic-fedora38-parallels",
"boot_wait": "20s",
"boot_keygroup_interval": "1s",
"boot_command": [
"c<wait>",
"insmod all_video<enter><wait>",
"set gfxpayload=keep<enter><wait>",
"insmod increment<enter><wait>",
"insmod xfs<enter><wait>",
"insmod diskfilter<enter><wait>",
"insmod mdraid1x<enter><wait>",
"insmod fat<enter><wait>",
"insmod blscfg<enter><wait>",
"insmod gzio<enter><wait>",
"insmod part_gpt<enter><wait>",
"insmod ext2<enter><wait>",
"insmod chain<enter><wait>",
"search --no-floppy --set=root -l 'Fedora-S-dvd-x86_64-38'<enter><wait>",
"linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-S-dvd-x86_64-38 rd.live.check ",
"net.ifnames=0 inst.text inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/generic.fedora38.vagrant.ks<enter><wait>",
"initrd /images/pxeboot/initrd.img<enter><wait10>",
"boot<enter><wait>"
],
"disk_size": 32768,
"cpus": 2,
"memory": 2048,
"prlctl": [
[
"set",
"{{.Name}}",
"--adaptive-hypervisor",
"on"
],
[
"set",
"{{.Name}}",
"--3d-accelerate",
"off"
],
[
"set",
"{{.Name}}",
"--videosize",
"16"
],
[
"set",
"{{.Name}}",
"--pmu-virt",
"on"
],
[
"set",
"{{.Name}}",
"--faster-vm",
"on"
]
],
"hard_drive_interface": "ide",
"guest_os_type": "linux",
"skip_compaction": false,
"http_directory": "http",
"iso_url": "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Server/x86_64/iso/Fedora-Server-netinst-x86_64-38-1.6.iso",
"iso_checksum": "sha256:192af621553aa32154697029e34cbe30152a9e23d72d55f31918b166979bbcf5",
"ssh_username": "root",
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_timeout": "3600s",
"shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now",
"parallels_tools_flavor": "lin",
"parallels_tools_mode": "upload",
"parallels_tools_guest_path": "/root/parallels-tools-linux.iso",
"prlctl_version_file": "/root/parallels-tools-version.txt"
},

{
"type": "parallels-iso",
"name": "generic-alpine317-parallels",
Expand Down
58 changes: 58 additions & 0 deletions generic-virtualbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -7261,6 +7261,64 @@
"guest_additions_mode": "upload",
"virtualbox_version_file": "VBoxVersion.txt"
},
{
"type": "virtualbox-iso",
"name": "generic-fedora38-virtualbox",
"vm_name": "generic-fedora38-virtualbox",
"output_directory": "output/generic-fedora38-virtualbox",
"boot_wait": "20s",
"boot_keygroup_interval": "1s",
"boot_command": [
"c<wait>",
"insmod all_video<enter><wait>",
"set gfxpayload=keep<enter><wait>",
"insmod increment<enter><wait>",
"insmod xfs<enter><wait>",
"insmod diskfilter<enter><wait>",
"insmod mdraid1x<enter><wait>",
"insmod fat<enter><wait>",
"insmod blscfg<enter><wait>",
"insmod gzio<enter><wait>",
"insmod part_gpt<enter><wait>",
"insmod ext2<enter><wait>",
"insmod chain<enter><wait>",
"search --no-floppy --set=root -l 'Fedora-S-dvd-x86_64-38'<enter><wait>",
"linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-S-dvd-x86_64-38 rd.live.check ",
"net.ifnames=0 inst.text inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/generic.fedora38.vagrant.ks<enter><wait>",
"initrd /images/pxeboot/initrd.img<enter><wait10>",
"boot<enter><wait>"
],
"disk_size": 131072,
"cpus": 2,
"memory": 2048,
"vboxmanage": [
[
"modifyvm",
"{{.Name}}",
"--vram",
"64"
]
],
"hard_drive_interface": "sata",
"guest_os_type": "Fedora_64",
"http_directory": "http",
"headless": true,
"vrdp_bind_address": "127.0.0.1",
"vrdp_port_min": 11000,
"vrdp_port_max": 12000,
"iso_url": "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Server/x86_64/iso/Fedora-Server-netinst-x86_64-38-1.6.iso",
"iso_checksum": "sha256:192af621553aa32154697029e34cbe30152a9e23d72d55f31918b166979bbcf5",
"ssh_username": "root",
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_timeout": "3600s",
"shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now",
"guest_additions_url": "https://download.virtualbox.org/virtualbox/7.0.2/VBoxGuestAdditions_7.0.2.iso",
"guest_additions_sha256": "9cf5413399f59cfa4ba9ed89a9295b1b2ef3b997cb526a100637b5c59a526872",
"guest_additions_path": "VBoxGuestAdditions.iso",
"guest_additions_mode": "upload",
"virtualbox_version_file": "VBoxVersion.txt"
},
{
"type": "virtualbox-iso",
"name": "generic-alpine317-virtualbox",
Expand Down
Loading

0 comments on commit 6d4bbe9

Please sign in to comment.