From 98ed79df0165c953d7fd6b011246e3499d1cff55 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 29 Dec 2025 01:37:30 -0500 Subject: [PATCH 1/2] about/infradocs: grammar --- src/about/infradocs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/about/infradocs.md b/src/about/infradocs.md index 9fb53abcf..b0cca906c 100644 --- a/src/about/infradocs.md +++ b/src/about/infradocs.md @@ -1,4 +1,4 @@ # InfraDocs [InfraDocs](https://infradocs.voidlinux.org/) is the meta-manual for the Void -project systems management. +project's systems management. From 6bbb77958589ce998a7e09a88f3850c6c7bde5ae Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 29 Dec 2025 01:39:10 -0500 Subject: [PATCH 2/2] installation/**: grammar/typo/consistency fixes, general updates closes: #851 --- src/installation/guides/chroot.md | 24 ++++----- src/installation/guides/fde.md | 4 +- src/installation/guides/index.md | 2 +- src/installation/index.md | 71 ++++++++++++--------------- src/installation/live-images/guide.md | 4 +- src/installation/live-images/index.md | 10 ++-- src/installation/musl.md | 2 +- 7 files changed, 56 insertions(+), 61 deletions(-) diff --git a/src/installation/guides/chroot.md b/src/installation/guides/chroot.md index 0104c8be7..653322e07 100644 --- a/src/installation/guides/chroot.md +++ b/src/installation/guides/chroot.md @@ -1,7 +1,7 @@ -# Installation via chroot (x86/x86_64/aarch64) +# Installation via chroot (x86_64/i686/aarch64) This guide details the process of manually installing Void via a chroot on an -x86, x86_64 or aarch64 architecture. It is assumed that you have a familiarity +x86_64, i686, or aarch64 architecture. It is assumed that you have a familiarity with Linux, but not necessarily with installing a Linux system via a chroot. This guide can be used to create a "typical" setup, using a single partition on a single SATA/IDE/USB disk. Each step may be modified to create less typical @@ -41,9 +41,9 @@ for partitioning, but you may wish to use [gdisk(8)](https://man.voidlinux.org/gdisk.8) (from the package `gptfdisk`) or [parted(8)](https://man.voidlinux.org/parted.8) instead. -For a UEFI booting system, make sure to create an EFI System Partition (ESP). -The ESP should have the partition type "EFI System" (code `EF00`) and be -formatted as FAT32 using [mkfs.vfat(8)](https://man.voidlinux.org/mkfs.vfat.8). +For a UEFI system, make sure to create an EFI System Partition (ESP). The ESP +should have the partition type "EFI System" (code `EF00`) and be formatted as +FAT32 using [mkfs.vfat(8)](https://man.voidlinux.org/mkfs.vfat.8). If you're unsure what partitions to create, create a 1GB partition of type "EFI System" (code `EF00`), then create a second partition of type "Linux Filesystem" @@ -96,8 +96,7 @@ variable. A glibc installation, for example, would use: ``` XBPS also needs to know what architecture is being installed. Available options -are `x86_64`, `x86_64-musl`, `i686` for PC architecture computers and `aarch64`. -For example: +are `x86_64`, `x86_64-musl`, `i686`, `aarch64`, and `aarch64-musl`. For example: ``` # ARCH=x86_64 @@ -105,8 +104,8 @@ For example: This architecture must be compatible with your current operating system, but does not need to be the same. If your host is running an x86_64 operating -system, any of the three architectures can be installed (whether the host is -musl or glibc), but an i686 host can only install i686 distributions. +system, x86_64, x86_64-musl, or i686 architectures can be installed (whether the +host is musl or glibc), but an i686 host can only install i686 distributions. Copy the RSA keys from the installation medium to the target root directory: @@ -233,7 +232,7 @@ used by your computer's firmware when manually selecting a boot device): ### Troubleshooting GRUB installation -It may be necessary to mount the `efivarfs` filesystem. +On UEFI systems, it may be necessary to mount the `efivarfs` filesystem. ``` [xchroot /mnt] # mount -t efivarfs none /sys/firmware/efi/efivars @@ -244,7 +243,7 @@ If EFI variables are still not available, add the option `--no-nvram` to the #### Installing on removable media or non-compliant UEFI systems -Unfortunately, not all systems have a fully standards compliant UEFI +Unfortunately, not all systems have a fully standards-compliant UEFI implementation. In some cases, it is necessary to "trick" the firmware into booting by using the default fallback location for the bootloader instead of a custom one. In that case, or if installing onto a removable disk (such as USB), @@ -260,6 +259,9 @@ located in `/boot/efi/EFI/Void/grubx64.efi` (its location can be found using [xchroot /mnt] # cp /boot/efi/EFI/Void/grubx64.efi /boot/efi/EFI/boot/bootx64.efi ``` +On i686, these files should be called `grubia32.efi` and `bootia32.efi`. On +aarch64, these files should be called `grubaa64.efi` and `bootaa64.efi`. + ## Finalization Use [xbps-reconfigure(1)](https://man.voidlinux.org/xbps-reconfigure.1) to diff --git a/src/installation/guides/fde.md b/src/installation/guides/fde.md index 727c51cde..8780fea1d 100644 --- a/src/installation/guides/fde.md +++ b/src/installation/guides/fde.md @@ -1,7 +1,7 @@ # Full Disk Encryption -**Warning**: Your drive's block device and other information may be different, -so make sure it is correct. +> **Warning**: Your drive's block devices and other information may be +> different, so make sure it is correct instead of copying and pasting directly. ## Partitioning diff --git a/src/installation/guides/index.md b/src/installation/guides/index.md index 5db119b52..07dcd1342 100644 --- a/src/installation/guides/index.md +++ b/src/installation/guides/index.md @@ -4,7 +4,7 @@ This section contains guides for more specific or complex use-cases. ## Section Contents -- [Installing Void via chroot (x86 or x86_64)](./chroot.md) +- [Installing Void via chroot (x86_64, i686, or aarch64)](./chroot.md) - [Installing Void with Full Disk Encryption](./fde.md) - [Installing Void on a ZFS Root](./zfs.md) - [ARM Devices](./arm-devices/index.md) diff --git a/src/installation/index.md b/src/installation/index.md index 826f8fe61..d15f1c78c 100644 --- a/src/installation/index.md +++ b/src/installation/index.md @@ -6,18 +6,22 @@ section. ## Base system requirements -Void can be installed on very minimalist hardware, though we recommend the +Void can be installed on very low-powered hardware, though we recommend the following minimums for most installations: -| Architecture | CPU | RAM | Storage | -|--------------|------------------|------|---------| -| x86_64-glibc | x86_64 | 96MB | 700MB | -| x86_64-musl | x86_64 | 96MB | 600MB | -| i686-glibc | Pentium 4 (SSE2) | 96MB | 700MB | +| Architecture | CPU | RAM | Storage | +|--------------|------------------|-------|---------| +| x86_64-glibc | x86_64 | 520MB | 700MB | +| x86_64-musl | x86_64 | 520MB | 600MB | +| i686-glibc | Pentium 4 (SSE2) | 520MB | 700MB | -Note that xfce image installations require more resources. +Note that Xfce installation images require more resources, and more resources +may be required depending on the software being run. -Void is not available for the i386, i486, or i586 architectures. +Void is available on x86_64, i686, aarch64, armv7l, and armv6l architectures. +Both glibc and musl editions are available on all architectures except i686, +where only glibc is available. Void is *not* available for the i386, i486, or +i586 architectures. Before installing musl Void, please read [the "musl" section](./musl.md) of this Handbook, so that you are aware of software incompatibilities. @@ -41,26 +45,12 @@ you download. First, there is a `sha256sum.txt` file containing image checksums to verify the integrity of the downloaded images. Second is the `sha256sum.sig` file, used to verify the authenticity of the checksums. -It is necessary to verify both the image's integrity and authenticity. It is, -therefore, recommended that you download both files. - -### Verifying image integrity - -You can verify the integrity of a downloaded file using -[sha256sum(1)](https://man.voidlinux.org/sha256sum.1) with the `sha256sum.txt` -file downloaded above. The following command will check the integrity of only -the image(s) you have downloaded: - -``` -$ sha256sum -c --ignore-missing sha256sum.txt -void-live-x86_64-musl-20170220.iso: OK -``` - -This verifies that the image is not corrupt. +It is necessary to verify both the image's integrity and authenticity, so it is +recommended that you download both files. ### Verifying digital signature -Prior to using any image you're strongly encouraged to validate the signatures +Prior to using any image, you're strongly encouraged to validate the signatures on the image to ensure they haven't been tampered with. Current images are signed using a minisign key that is specific to the release. @@ -71,33 +61,36 @@ with your mirror and package signatures. You will also need a copy of by the `minisign` package. The `minisign` executable is usually provided by a package of the same name, and -can also be installed on Windows, even without WSL or MinGW. +can also be installed on Windows, even without WSL or MinGW. Binaries are also +[available from minisign's authors](https://jedisct1.github.io/minisign/). If you are not currently using Void Linux, it will also be necessary to obtain -the appropriate signing key from our Git repository -[here](https://github.com/void-linux/void-packages/tree/master/srcpkgs/void-release-keys/files/). +the appropriate signing key from our [Git +repository](https://github.com/void-linux/void-packages/tree/master/srcpkgs/void-release-keys/files/). Once you've obtained the key, you can verify your image with the `sha256sum.sig` and `sha256sum.txt` files. First, you need to verify the authenticity of the `sha256sum.txt` file. The following example demonstrates the verification of the `sha256sum.txt` file -for the 20230628 images with `minisign`: +for the 20250202 images with `minisign`: ``` -$ minisign -V -p /usr/share/void-release-keys/void-release-20230628.pub -x sha256sum.sig -m sha256sum.txt +$ minisign -V -p /usr/share/void-release-keys/void-release-20250202.pub -x sha256sum.sig -m sha256sum.txt Signature and comment signature verified -Trusted comment: This key is only valid for images with date 20230628. +Trusted comment: This key is only valid for images with date 20250202. ``` +### Verifying image integrity + Finally, you need to verify that the checksum for your image matches the one in the `sha256sum.txt` file. This can be done with the [sha256(1)](https://man.voidlinux.org/md5.1) utility from the `outils` package, -as demonstrated below for the 20230628 `x86_64` base image: +as demonstrated below for the 20250202 `x86_64` base image: ``` -$ sha256 -C sha256sum.txt void-live-x86_64-20230628-base.iso -(SHA256) void-live-x86_64-20230628-base.iso: OK +$ sha256 -C sha256sum.txt void-live-x86_64-20250202-base.iso +(SHA256) void-live-x86_64-20250202-base.iso: OK ``` Alternatively, if the `sha256` utility isn't available to you, you can use @@ -105,12 +98,12 @@ Alternatively, if the `sha256` utility isn't available to you, you can use ``` $ sha256sum -c sha256sum.txt --ignore-missing -void-live-x86_64-20230628-base.iso: OK +void-live-x86_64-20250202-base.iso: OK ``` If neither program is available to you, you can compute the SHA256 hash of the -file and compare it to the value contained in `sha256sum.txt`. +file by hand and compare it to the value contained in `sha256sum.txt`. -If the verification process does not produce the expected "OK" status, do not -use it! Please alert the Void Linux team of where you got the image and how you -verified it, and we will follow up on it. +If the verification process does not produce the expected "OK" status, **do not +use it**! Please alert the Void Linux team of where you got the image and how +you verified it, and we will follow up on it. diff --git a/src/installation/live-images/guide.md b/src/installation/live-images/guide.md index 6b2a01d1d..5405cdda5 100644 --- a/src/installation/live-images/guide.md +++ b/src/installation/live-images/guide.md @@ -51,12 +51,12 @@ To install packages provided on the install image, select `Local`. Otherwise, you may select `Network` to download the latest packages from the Void repository. -> **Warning:** If you are installing the desktop environment from the xfce +> **Warning:** If you are installing the desktop environment from the Xfce > image, you MUST choose `Local` for the source! ## Hostname -Select a hostname for your computer (that is all lowercase, with no spaces.) +Select a hostname for your computer (that is all lowercase, with no spaces). ## Locale diff --git a/src/installation/live-images/index.md b/src/installation/live-images/index.md index 99f34aaf5..b2171b367 100644 --- a/src/installation/live-images/index.md +++ b/src/installation/live-images/index.md @@ -17,8 +17,8 @@ manually. ## Installer images -Void releases two types of images: base images and xfce images. Linux beginners -are encouraged to try one of the more full-featured xfce images, but more +Void releases two types of images: base images and Xfce images. Linux beginners +are encouraged to try one of the more full-featured Xfce images, but more advanced users may often prefer to start from a base image to install only the packages they need. @@ -30,7 +30,7 @@ update the system, and install additional packages from repositories. ### Xfce image -The xfce image includes a full desktop environment, web browser, and basic +The Xfce image includes a full desktop environment, web browser, and basic applications configured for that environment. The only difference from the base images is the additional packages and services installed. @@ -45,7 +45,7 @@ The following software is included: - **Other:** Bulk rename, Orage Globaltime, Orage Calendar, Task Manager, Parole Media Player, Audio Mixer, MIME type editor, Application finder -The install process for the xfce image is the same as the base images, except +The install process for the Xfce image is the same as the base images, except that you **must** select the `Local` source when installing. If you select `Network` instead, the installer will download and install the latest version of the base system, without any additional packages included on the live image. @@ -80,7 +80,7 @@ If the `Local` installation source is selected in the installer, `espeakup` and `brltty` will also be installed and enabled on the installed system if enabled in the live environment. -The xfce image also supports the graphical screenreader +The Xfce image also supports the graphical screenreader [orca](https://man.voidlinux.org/orca.1). This can be enabled by pressing `Win + R` and entering `orca -r`. Orca will also be available on the installed system if the `Local` installation source is selected. diff --git a/src/installation/musl.md b/src/installation/musl.md index 2586848a6..7f6f87cc0 100644 --- a/src/installation/musl.md +++ b/src/installation/musl.md @@ -13,7 +13,7 @@ multilib sub-repo. ## Incompatible software -musl practices very strict and minimal standard compliance. Many commonly used +musl practices very strict standards compliance. Many commonly used platform-specific extensions are not present. Because of this, it is common for software to need modification to compile and/or function properly. Void developers work to patch such software and hopefully get portability/correctness