fix(bootloader): use correct limine path/cmdline keys, nested /+ format with //Snapshots, no default_entry
- commit
- 8bc21b388e85b5e3e8442b38cd821d715a6adf2b
- author
- brice · · 2026-02-28 06:11 UTC
- parent
- d1575ab
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
2 files · +6 -7
M install/configs/limine.conf.template +5 -6
| @@ -1,6 +1,5 @@ | |||
| 1 | 1 | timeout: {{TIMEOUT}} | |
| 2 | - | default_entry: 1 | |
| 3 | - | quiet: yes | |
| 2 | + | quiet: no | |
| 4 | 3 | interface_branding: {{BRANDING}} | |
| 5 | 4 | interface_branding_colour: {{COLOR}} | |
| 6 | 5 | graphics: yes | |
| @@ -11,14 +10,14 @@ comment: machine-id={{MACHINE_ID}} | |||
| 11 | 10 | ||
| 12 | 11 | //{{KERNEL}} | |
| 13 | 12 | protocol: linux | |
| 14 | - | kernel_path: boot():/vmlinuz-{{KERNEL}} | |
| 15 | - | kernel_cmdline: {{KERNEL_PARAMS}} | |
| 13 | + | path: boot():/vmlinuz-{{KERNEL}} | |
| 14 | + | cmdline: {{KERNEL_PARAMS}} | |
| 16 | 15 | module_path: boot():/initramfs-{{KERNEL}}.img | |
| 17 | 16 | ||
| 18 | 17 | //{{KERNEL}}-fallback | |
| 19 | 18 | protocol: linux | |
| 20 | - | kernel_path: boot():/vmlinuz-{{KERNEL}} | |
| 21 | - | kernel_cmdline: {{KERNEL_PARAMS}} | |
| 19 | + | path: boot():/vmlinuz-{{KERNEL}} | |
| 20 | + | cmdline: {{KERNEL_PARAMS}} | |
| 22 | 21 | module_path: boot():/initramfs-{{KERNEL}}-fallback.img | |
| 23 | 22 | ||
| 24 | 23 | //Snapshots | |
| @@ -1,6 +1,5 @@ | |||||
| 1 | timeout: {{TIMEOUT}} | 1 | timeout: {{TIMEOUT}} | ||
| 2 | - | default_entry: 1 | 2 | + | quiet: no |
| 3 | - | quiet: yes | |||
| 4 | interface_branding: {{BRANDING}} | 3 | interface_branding: {{BRANDING}} | ||
| 5 | interface_branding_colour: {{COLOR}} | 4 | interface_branding_colour: {{COLOR}} | ||
| 6 | graphics: yes | 5 | graphics: yes | ||
| @@ -11,14 +10,14 @@ comment: machine-id={{MACHINE_ID}} | |||||
| 11 | 10 | ||||
| 12 | //{{KERNEL}} | 11 | //{{KERNEL}} | ||
| 13 | protocol: linux | 12 | protocol: linux | ||
| 14 | - | kernel_path: boot():/vmlinuz-{{KERNEL}} | 13 | + | path: boot():/vmlinuz-{{KERNEL}} |
| 15 | - | kernel_cmdline: {{KERNEL_PARAMS}} | 14 | + | cmdline: {{KERNEL_PARAMS}} |
| 16 | module_path: boot():/initramfs-{{KERNEL}}.img | 15 | module_path: boot():/initramfs-{{KERNEL}}.img | ||
| 17 | 16 | ||||
| 18 | //{{KERNEL}}-fallback | 17 | //{{KERNEL}}-fallback | ||
| 19 | protocol: linux | 18 | protocol: linux | ||
| 20 | - | kernel_path: boot():/vmlinuz-{{KERNEL}} | 19 | + | path: boot():/vmlinuz-{{KERNEL}} |
| 21 | - | kernel_cmdline: {{KERNEL_PARAMS}} | 20 | + | cmdline: {{KERNEL_PARAMS}} |
| 22 | module_path: boot():/initramfs-{{KERNEL}}-fallback.img | 21 | module_path: boot():/initramfs-{{KERNEL}}-fallback.img | ||
| 23 | 22 | ||||
| 24 | //Snapshots | 23 | //Snapshots | ||
M test/vm/push-binary-to-vm.sh +1 -1
| @@ -52,7 +52,7 @@ scp_cmd() { | |||
| 52 | 52 | } | |
| 53 | 53 | ||
| 54 | 54 | rsync_cmd() { | |
| 55 | - | $SSHPASS rsync -az --no-perms -e "ssh $SSH_OPTS" "$@" 2>&1 | grep -v "Warning: Permanently added" || true | |
| 55 | + | $SSHPASS rsync -az --checksum --no-perms -e "ssh $SSH_OPTS" "$@" 2>&1 | grep -v "Warning: Permanently added" || true | |
| 56 | 56 | } | |
| 57 | 57 | ||
| 58 | 58 | echo "Pushing $BINARY_NAME to VM..." | |
| @@ -52,7 +52,7 @@ scp_cmd() { | |||||
| 52 | } | 52 | } | ||
| 53 | 53 | ||||
| 54 | rsync_cmd() { | 54 | rsync_cmd() { | ||
| 55 | - | $SSHPASS rsync -az --no-perms -e "ssh $SSH_OPTS" "$@" 2>&1 | grep -v "Warning: Permanently added" || true | 55 | + | $SSHPASS rsync -az --checksum --no-perms -e "ssh $SSH_OPTS" "$@" 2>&1 | grep -v "Warning: Permanently added" || true |
| 56 | } | 56 | } | ||
| 57 | 57 | ||||
| 58 | echo "Pushing $BINARY_NAME to VM..." | 58 | echo "Pushing $BINARY_NAME to VM..." | ||