Skip to content

Commit

Permalink
Replace Fedora 39 with Fedora 41
Browse files Browse the repository at this point in the history
  • Loading branch information
amezin committed Nov 1, 2024
1 parent 7a96e24 commit e86eb66
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ jobs:
- alpine319
- alpine320
- debian12
- fedora39
- fedora41
- fedora40
- opensuseleap156
- opensusetumbleweed
- silverblue39
- silverblue41
- silverblue40
- ubuntu2204
- ubuntu2404
Expand Down
16 changes: 8 additions & 8 deletions fedora-39.pkr.hcl → fedora-41.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "qemu" "fedora39" {
iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/39/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-39-1.5.iso"
iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/39/Everything/x86_64/iso/Fedora-Everything-39-1.5-x86_64-CHECKSUM"
source "qemu" "fedora41" {
iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-41-1.4.iso"
iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/41/Everything/x86_64/iso/Fedora-Everything-41-1.4-x86_64-CHECKSUM"
vga = "virtio"
cpus = 2
memory = 4096
Expand All @@ -9,7 +9,7 @@ source "qemu" "fedora39" {
qmp_enable = true
disk_discard = "unmap"
http_content = {
"/fedora.ks" = templatefile("${path.root}/fedora.ks", { path = path, hostname = "fedora39" })
"/fedora.ks" = templatefile("${path.root}/fedora.ks", { path = path, hostname = "fedora41" })
}
ssh_handshake_attempts = 1000
ssh_timeout = "2h"
Expand All @@ -31,9 +31,9 @@ source "qemu" "fedora39" {
"insmod part_gpt<enter><wait>",
"insmod ext2<enter><wait>",
"insmod chain<enter><wait>",
"search --no-floppy --set=root -l 'Fedora-E-dvd-x86_64-39'<enter><wait>",
"search --no-floppy --set=root -l 'Fedora-E-dvd-x86_64-41'<enter><wait>",
"linux /images/pxeboot/vmlinuz console=ttyS0 inst.notmux inst.cmdline ",
"inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-39 ",
"inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-41 ",
"inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/fedora.ks<enter><wait>",
"initrd /images/pxeboot/initrd.img<enter><wait10>",
"boot<enter><wait>"
Expand All @@ -43,7 +43,7 @@ source "qemu" "fedora39" {

build {
sources = [
"source.qemu.fedora39"
"source.qemu.fedora41"
]

post-processors {
Expand All @@ -53,7 +53,7 @@ build {
}

post-processor "vagrant-registry" {
box_tag = "gnome-shell-box/fedora39"
box_tag = "gnome-shell-box/fedora41"
version = var.version
}
}
Expand Down
16 changes: 8 additions & 8 deletions silverblue-39.pkr.hcl → silverblue-41.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "qemu" "silverblue39" {
iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/39/Silverblue/x86_64/iso/Fedora-Silverblue-ostree-x86_64-39-1.5.iso"
iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/39/Silverblue/x86_64/iso/Fedora-Silverblue-39-1.5-x86_64-CHECKSUM"
source "qemu" "silverblue41" {
iso_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Silverblue/x86_64/iso/Fedora-Silverblue-ostree-x86_64-41-1.4.iso"
iso_checksum = "file:https://download.fedoraproject.org/pub/fedora/linux/releases/41/Silverblue/x86_64/iso/Fedora-Silverblue-41-1.4-x86_64-CHECKSUM"
vga = "virtio"
cpus = 2
memory = 4096
Expand All @@ -9,7 +9,7 @@ source "qemu" "silverblue39" {
qmp_enable = true
disk_discard = "unmap"
http_content = {
"/silverblue.ks" = templatefile("${path.root}/silverblue.ks", { path = path, hostname = "silverblue39", version = "39" })
"/silverblue.ks" = templatefile("${path.root}/silverblue.ks", { path = path, hostname = "silverblue41", version = "41" })
}
ssh_handshake_attempts = 1000
ssh_timeout = "2h"
Expand All @@ -31,9 +31,9 @@ source "qemu" "silverblue39" {
"insmod part_gpt<enter><wait>",
"insmod ext2<enter><wait>",
"insmod chain<enter><wait>",
"search --no-floppy --set=root -l 'Fedora-SB-ostree-x86_64-39'<enter><wait>",
"search --no-floppy --set=root -l 'Fedora-SB-ostree-x86_64-41'<enter><wait>",
"linux /images/pxeboot/vmlinuz console=ttyS0 inst.notmux inst.cmdline ",
"inst.stage2=hd:LABEL=Fedora-SB-ostree-x86_64-39 ",
"inst.stage2=hd:LABEL=Fedora-SB-ostree-x86_64-41 ",
"inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/silverblue.ks<enter><wait>",
"initrd /images/pxeboot/initrd.img<enter><wait10>",
"boot<enter><wait>"
Expand All @@ -43,7 +43,7 @@ source "qemu" "silverblue39" {

build {
sources = [
"source.qemu.silverblue39"
"source.qemu.silverblue41"
]

post-processors {
Expand All @@ -53,7 +53,7 @@ build {
}

post-processor "vagrant-registry" {
box_tag = "gnome-shell-box/silverblue39"
box_tag = "gnome-shell-box/silverblue41"
version = var.version
}
}
Expand Down

0 comments on commit e86eb66

Please sign in to comment.