gnu: system: Update examples.

* gnu/system/examples/asus-c201.tmpl (bootloader): Use new depthcharge
bootloader name scheme and update to new target system.
* gnu/system/examples/bare-bones.tmpl (bootloader),
gnu/system/examples/bare-hurd.tmpl (bootloader),
gnu/system/examples/beaglebone-black.tmpl (bootloader),
gnu/system/examples/desktop.tmpl (bootloader),
gnu/system/examples/lightweight-desktop.tmpl (bootloader),
gnu/system/examples/plasma.tmpl (bootloader): Use new target system.
* gnu/system/examples/docker-image.tmpl (bootloader): Delete.
* gnu/system/examples/vm-image.tmpl (bootloader): Use auto image target.

Change-Id: I3675f17ae9cd94cff99328762600fb4e491bc9f2
This commit is contained in:
Lilah Tascheter 2024-08-06 19:11:25 -05:00 committed by Ryan Schanzenbacher
parent e2e20d4002
commit 40e19b3be0
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
9 changed files with 28 additions and 16 deletions

View file

@ -14,8 +14,10 @@
;; Assuming /dev/mmcblk0p1 is the kernel partition, and ;; Assuming /dev/mmcblk0p1 is the kernel partition, and
;; "my-root" is the label of the target root file system. ;; "my-root" is the label of the target root file system.
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader depthcharge-bootloader) (bootloader depthcharge-veyron-speedy-bootloader)
(targets '("/dev/mmcblk0p1")))) (targets (list (bootloader-target
(type 'part)
(device "/dev/mmcblk0p1"))))))
;; The ASUS C201PA requires a very particular kernel to boot, ;; The ASUS C201PA requires a very particular kernel to boot,
;; as well as the following arguments. ;; as well as the following arguments.

View file

@ -13,10 +13,13 @@
;; Boot in "legacy" BIOS mode, assuming /dev/sdX is the ;; Boot in "legacy" BIOS mode, assuming /dev/sdX is the
;; target hard disk, and "my-root" is the label of the target ;; target hard disk, and "my-root" is the label of the target
;; root file system. ;; root file system. If you're just building an image, the
;; 'targets' field may be omitted.
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets '("/dev/sdX")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/sdX"))))))
;; It's fitting to support the equally bare bones -nographic ;; It's fitting to support the equally bare bones -nographic
;; QEMU option, which also nicely sidesteps forcing QWERTY. ;; QEMU option, which also nicely sidesteps forcing QWERTY.
(kernel-arguments (list "console=ttyS0,115200")) (kernel-arguments (list "console=ttyS0,115200"))

View file

@ -32,7 +32,9 @@
(inherit %hurd-default-operating-system) (inherit %hurd-default-operating-system)
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-minimal-bootloader) (bootloader grub-minimal-bootloader)
(targets '("/dev/sdX")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/sdX"))))))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (device (file-system-label "my-root"))
(mount-point "/") (mount-point "/")

View file

@ -15,7 +15,9 @@
;; the label of the target root file system. ;; the label of the target root file system.
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader u-boot-beaglebone-black-bootloader) (bootloader u-boot-beaglebone-black-bootloader)
(targets '("/dev/mmcblk1")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/mmcblk1"))))))
;; This module is required to mount the SD card. ;; This module is required to mount the SD card.
(initrd-modules (cons "omap_hsmmc" %base-initrd-modules)) (initrd-modules (cons "omap_hsmmc" %base-initrd-modules))

View file

@ -20,7 +20,9 @@
;; Partition mounted on /boot/efi. ;; Partition mounted on /boot/efi.
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-efi-bootloader) (bootloader grub-efi-bootloader)
(targets '("/boot/efi")) (targets (list (bootloader-target
(type 'esp)
(path "/boot/efi"))))
(keyboard-layout keyboard-layout))) (keyboard-layout keyboard-layout)))
;; Specify a mapped device for the encrypted root partition. ;; Specify a mapped device for the encrypted root partition.

View file

@ -9,6 +9,8 @@
(timezone "Europe/Berlin") (timezone "Europe/Berlin")
(locale "en_US.utf8") (locale "en_US.utf8")
;; Bootloader can be left blank!
;; This is where user accounts are specified. The "root" account is ;; This is where user accounts are specified. The "root" account is
;; implicit, and is initially created with the empty password. ;; implicit, and is initially created with the empty password.
(users (cons (user-account (users (cons (user-account
@ -34,10 +36,6 @@
;; similar services for us. ;; similar services for us.
;; This will be ignored. ;; This will be ignored.
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(targets '("does-not-matter"))))
;; This will be ignored, too.
(file-systems (list (file-system (file-systems (list (file-system
(device "does-not-matter") (device "does-not-matter")
(mount-point "/") (mount-point "/")

View file

@ -17,7 +17,9 @@
;; Partition mounted on /boot/efi. ;; Partition mounted on /boot/efi.
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-efi-bootloader) (bootloader grub-efi-bootloader)
(targets '("/boot/efi")))) (targets (list (bootloader-target
(type 'esp)
(path "/boot/efi"))))))
;; Assume the target root file system is labelled "my-root", ;; Assume the target root file system is labelled "my-root",
;; and the EFI System Partition has UUID 1234-ABCD. ;; and the EFI System Partition has UUID 1234-ABCD.

View file

@ -15,7 +15,9 @@
;; is the label of the target root file system. ;; is the label of the target root file system.
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/sdX")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/sdX"))))))
(file-systems (cons (file-system (file-systems (cons (file-system
(device "my-root") (device "my-root")

View file

@ -38,11 +38,10 @@ accounts.\x1b[0m
(firmware '()) (firmware '())
;; Below we assume /dev/vda is the VM's hard disk. ;; Images automatically get the 'root, 'esp, and 'disk targets configured as
;; Adjust as needed. ;; needed.
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets '("/dev/vda"))
(terminal-outputs '(console)))) (terminal-outputs '(console))))
(file-systems (cons (file-system (file-systems (cons (file-system
(mount-point "/") (mount-point "/")