a5acc17a3c
The 'title' field was easily overlooked and was an endless source of confusion. Now, the value of the 'device' field is self-contained. * gnu/system/file-systems.scm (<file-system>): Change constructor name to '%file-system'. [title]: Remove. (<file-system-label>): New record type with printer. (report-deprecation, device-expression) (process-file-system-declaration, file-system): New macros. (file-system-title): New procedure. (file-system->spec, spec->file-system): Adjust to handle <file-system-label>. * gnu/system.scm (bootable-kernel-arguments): Add case for 'file-system-label?'. (read-boot-parameters): Likewise. (mapped-device-user): Avoid 'file-system-title'. (fs->boot-device): Remove. (operating-system-boot-parameters): Use 'file-system-device' instead of 'fs->boot-device'. (device->sexp): Add case for 'file-system-label?'. * gnu/bootloader/grub.scm (grub-root-search): Add case for 'file-system-label?'. * gnu/system/examples/bare-bones.tmpl, gnu/system/examples/beaglebone-black.tmpl, gnu/system/examples/lightweight-desktop.tmpl, gnu/system/examples/vm-image.tmpl: Remove uses of 'title'. * gnu/system/vm.scm (virtualized-operating-system): Remove uses of 'file-system-title'. * guix/scripts/system.scm (check-file-system-availability): Likewise, and adjust fix-it hint. (check-initrd-modules)[file-system-/dev]: Likewise. * gnu/build/file-systems.scm (canonicalize-device-spec): Remove 'title' parameter. [canonical-title]: Remove. Match on SPEC's type rather than on CANONICAL-TITLE. (mount-file-system): Adjust caller. * gnu/build/linux-boot.scm (boot-system): Interpret ROOT here. * gnu/services/base.scm (file-system->fstab-entry): Remove use of 'file-system-title'. * doc/guix.texi (File Systems): Remove documentation of the 'title' field. Rewrite documentation of 'device' and document 'file-system-label'.
57 lines
2.1 KiB
Cheetah
57 lines
2.1 KiB
Cheetah
;; This is an operating system configuration template
|
|
;; for a "bare bones" setup on BeagleBone Black board.
|
|
|
|
(use-modules (gnu) (gnu bootloader u-boot))
|
|
(use-service-modules networking)
|
|
(use-package-modules bootloaders screen ssh)
|
|
|
|
(operating-system
|
|
(host-name "komputilo")
|
|
(timezone "Europe/Berlin")
|
|
(locale "en_US.utf8")
|
|
|
|
;; Assuming /dev/mmcblk1 is the eMMC, and "my-root" is
|
|
;; the label of the target root file system.
|
|
(bootloader (bootloader-configuration
|
|
(bootloader u-boot-beaglebone-black-bootloader)
|
|
(target "/dev/mmcblk1")))
|
|
|
|
;; This module is required to mount the SD card.
|
|
(initrd-modules (cons "omap_hsmmc" %base-initrd-modules))
|
|
|
|
(file-systems (cons (file-system
|
|
(device (file-system-label "my-root"))
|
|
(mount-point "/")
|
|
(type "ext4"))
|
|
%base-file-systems))
|
|
|
|
;; This is where user accounts are specified. The "root"
|
|
;; account is implicit, and is initially created with the
|
|
;; empty password.
|
|
(users (cons (user-account
|
|
(name "alice")
|
|
(comment "Bob's sister")
|
|
(group "users")
|
|
|
|
;; Adding the account to the "wheel" group
|
|
;; makes it a sudoer. Adding it to "audio"
|
|
;; and "video" allows the user to play sound
|
|
;; and access the webcam.
|
|
(supplementary-groups '("wheel"
|
|
"audio" "video"))
|
|
(home-directory "/home/alice"))
|
|
%base-user-accounts))
|
|
|
|
;; Globally-installed packages.
|
|
(packages (cons* screen openssh %base-packages))
|
|
|
|
(services (cons* (dhcp-client-service)
|
|
;; mingetty does not work on serial lines.
|
|
;; Use agetty with board-specific serial parameters.
|
|
(agetty-service
|
|
(agetty-configuration
|
|
(extra-options '("-L"))
|
|
(baud-rate "115200")
|
|
(term "vt100")
|
|
(tty "ttyO0")))
|
|
%base-services)))
|