Skip to content

Commit 1b68be2

Browse files
committed
Assorted aarch64 fixups
1 parent a8fd161 commit 1b68be2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
run: |
4646
$HOME/packer/packer validate packer/ubuntu-build.json
4747
$HOME/packer/packer validate packer/mint-build.json
48+
$HOME/packer/packer validate packer/ubuntu-kvm.json
4849
$HOME/packer/packer validate -var-file=packer/beta-vars.json packer/mint-build.json
4950
Python:
5051
name: Run Python lint tests

packer/ubuntu-kvm.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
2-
"min_packer_version": "1.7.1",
2+
"min_packer_version": "1.6.0",
33
"variables": {
4-
"vm_name": "JMU Linux Mint",
54
"semester": "Fa21",
65
"version": "20",
76

@@ -12,7 +11,7 @@
1211

1312
"headless": "false",
1413

15-
"output_dir": "{{pwd}}/artifacts_mint",
14+
"output_dir": "{{pwd}}/artifacts_ubuntu",
1615
"mirror_url": "http://cdimage.ubuntu.com/focal/daily-live/current",
1716
"iso_file": "focal-desktop-arm64.iso",
1817

@@ -27,9 +26,9 @@
2726
"accelerator": "kvm",
2827
"memory": 4096,
2928
"machine_type": "virt",
30-
"firmware": "/usr/share/qemu-efi-aarch64/QEMU_EFI.fd",
3129
"qemu_binary": "qemu-system-aarch64",
3230
"qemuargs": [
31+
[ "-bios", "/usr/share/qemu-efi-aarch64/QEMU_EFI.fd" ],
3332
[ "-boot", "strict=off" ],
3433
[ "-vga", "vmware" ],
3534
[ "-cpu", "host" ],
@@ -53,7 +52,7 @@
5352
"ssh_username": "{{user `ssh_user`}}",
5453
"ssh_password": "{{user `ssh_pass`}}",
5554
"ssh_timeout": "100m",
56-
"vm_name": "{{user `vm_name`}} {{user `semester`}}",
55+
"vm_name": "image-{{user `semester` | lower }}",
5756
"net_device": "virtio-net",
5857
"disk_interface": "virtio",
5958
"boot_wait": "15s",

0 commit comments

Comments
 (0)