update examples to consider default autodetect_root

Signed-off-by: Zen <[email protected]>

Author: desultory

examples/example.toml

@@ -23,9 +23,6 @@ modules = [
 kmod_autodetect_lspci = true
 kmod_autodetect_lsmod = true
 
-# Autodetect the root mountpoint
-autodetect_root = true
-
 # Wait a few seconds for storage to settle after modules are loaded if external or slow storage is used
 #mount_wait = true
 #mount_timeout = 3

examples/raid_crypt_serial.toml

@@ -6,24 +6,17 @@
 
 modules = [
   "ugrd.base.base",
-  "ugrd.base.console",
+#  "ugrd.base.console", # implied by gpg
   "ugrd.crypto.gpg",
 ]
 
 # Set the key type for all cryptsetup keys
 cryptsetup_key_type = "gpg"
 
 # Set the primary_console to ttyS1
-# The gpg module uses agetty on tty so this must be overridden
+# The gpg module uses agetty on tty1 so this must be overridden
 primary_console = "ttyS1"
 
-# Define the root label
-[mounts.root]
-type = "btrfs"
-
-[mounts.root.source]
-label = "rootfs"
-
 # Define console information
 [console.ttyS1]
 baud = 115_200

examples/subvol.toml

@@ -1,30 +1,25 @@
-# This config will decrypt the colume fdf442da-0574-4531-98c7-55227a041f1d, mapping it to "/dev/mapper/root"
+# This config will decrypt the volume fdf442da-0574-4531-98c7-55227a041f1d, mapping it to "/dev/mapper/root"
 # It will attempt to mount the btrfs subvolume "gentoo" from the device with label "rootfs" to /root
-# It will pull all current kernel modules from the active kernel version
-# The kmod.novideo and kmod.nosound modules are pulled to help minmize pulled modules
+# It will pull kernel modules based on the hardware detected by lspci
+# The kmod novideo, nosound, and nonetwork modules will be used to restrict the kernel modules pulled
 
 
 modules = [
   "ugrd.base.base",
   "ugrd.kmod.kmod",
   "ugrd.kmod.novideo",
   "ugrd.kmod.nosound",
+  "ugrd.kmod.nonetwork",
   "ugrd.crypto.cryptsetup",
   "ugrd.fs.btrfs",
 ]
 
 # Optionally supply a kernel version
 #kernel_version = "6.1.53-gentoo-dist"
-kmod_autodetect_lsmod = true
+kmod_autodetect_lspci = true
 
 root_subvol="gentoo"
 
-[mounts.root]
-type = "btrfs"
-
-[mounts.root.source]
-label = "rootfs"
-
 # The UUID of the encrypted volume, mounted at /dev/mapper/root
 [cryptsetup.root]
 uuid = "fdf442da-0574-4531-98c7-55227a041f1d"

examples/subvol_selecttor.toml

@@ -1,30 +1,26 @@
-# This config will decrypt the colume fdf442da-0574-4531-98c7-55227a041f1d, mapping it to "/dev/mapper/root"
+# This config will decrypt the volume fdf442da-0574-4531-98c7-55227a041f1d, mapping it to "/dev/mapper/root"
 # It will pull all current kernel modules from the active kernel version
-# The kmod.novideo and kmod.nosound modules are pulled to help minmize pulled modules
-
+# The kmod novideo, nosound, and nonetwork modules are pulled to help minmize pulled modules.
 
 modules = [
   "ugrd.base.base",
   "ugrd.kmod.kmod",
   "ugrd.kmod.novideo",
   "ugrd.kmod.nosound",
+  "ugrd.kmod.nonetwork",
   "ugrd.crypto.cryptsetup",
   "ugrd.fs.btrfs",
 ]
 
 # Optionally supply a kernel version
 #kernel_version = "6.1.53-gentoo-dist"
 kmod_autodetect_lsmod = true
+# Optionally kmod_autodetect_lspci could be used
+#kmod_autodetect_lspci = true
 
 # Allows you to dynamically select root subvol at UGRD runtime
 subvol_selector = true
 
-[mounts.root]
-type = "btrfs"
-
-[mounts.root.source]
-label = "rootfs"
-
 # The UUID of the encrypted volume, mounted at /dev/mapper/root
 [cryptsetup.root]
 uuid = "fdf442da-0574-4531-98c7-55227a041f1d"

examples/vm.toml

@@ -12,8 +12,6 @@ modules = [
 # Optionally supply a kernel version
 #kernel_version = "6.1.57-gentoo-custom"
 
-autodetect_root = true
-
 # The UUID of the encrypted volume, mounted at /dev/mapper/root
 #[cryptsetup.root]
 #uuid = "38a5c4d2-f5af-404a-a663-d789e443a40c"

examples/yubikey.toml

@@ -27,13 +27,6 @@ type = "vfat"
   [mounts.boot.source]
   uuid = "4886-A631"
 
-# The label of the volume under the LUKS partition, a UUID could be used
-[mounts.root]
-type = "btrfs"
-
-[mounts.root.source]
-label = "rootfs"
-
 # Information about the LUKS volume
 [cryptsetup.root]
 uuid = "eee3611d-9b36-42b3-8ed2-62173064c76a"

readme.md

@@ -261,7 +261,7 @@ Similarly `ugrd.kmod.novideo` `nonetwork`, and `nosound` exist to ignore video,
 
 ### Filesystem modules
 
-`autodetect_root` (false) Can be enabled with `--autodetect-root` and will set the root mount parameter automatatically based on the current root label or uuid.
+`autodetect_root` (true) Set the root mount parameter based on the current root label or uuid.
 
 #### ugrd.fs.mounts
 

src/ugrd/fs/mounts.toml

@@ -8,6 +8,7 @@ binaries = [
 ]
 
 mount_wait = false
+autodetect_root = true
 
 [imports.config_processing]
 "ugrd.fs.mounts" = [ "_process_mounts_multi" ]