aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/manual.cli15
-rwxr-xr-xinit4
2 files changed, 10 insertions, 9 deletions
diff --git a/doc/manual.cli b/doc/manual.cli
index ec29fcd..1b9abed 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -199,13 +199,14 @@ mkfs.ext4 -L buildos.machines -O ^has_journal /dev/sdX
\h2#config-storage-machines|Machines|
For virtual machine and container storage we can use a single disk, in which
-case it should be labeled \c{buildos.machines} or multiple disks, in which
-case they should be labeled \c{buildos.machines.<volume>}. In both cases the
-disks must be formatted as \c{btrfs}.
-
-In a single disk configuration, the disk is mounted as \c{/build/machines}. In
-a multi-disk configuration, each disk is mounted as
-\c{/build/machines/<volume>}.
+case it can be labeled just \c{buildos.machines}. If we would like to use
+multiple disks, then they should be labeled \c{buildos.machines.<volume>}. In
+both cases the disks must be formatted as \c{btrfs}.
+
+In a single disk configuration, the disk is mounted as
+\c{/build/machines/default/} (in other words, as the default valume called
+\c{default}). In a multi-disk configuration, each disk is mounted as
+\c{/build/machines/<volume>/}.
If no disks are found for required storage, then the boot process is
interrupted with a shell prompt where you can format and/or lable a suitable
diff --git a/init b/init
index 89191de..9c068c8 100755
--- a/init
+++ b/init
@@ -266,7 +266,7 @@ while read l || [ -n "$l" ]; do
l="$(sed -re 's/.*LABEL=\"([^\"]*)\".*/\1/' <<<"$l")"
# Strip the buildos prefix from the label. If the result is empty then this
- # disk/patition hasn't been labeled for use by buildos.
+ # disk/patition hasn't been labeled for use by us.
#
l="$(sed -n -re 's/^buildos\.([^ ]+)$/\1/p' <<<"$l")"
@@ -322,7 +322,7 @@ while read l || [ -n "$l" ]; do
error "multiple disks labeled with buildos.machines/machines.*"
fi
- m=/build/machines
+ m=/build/machines/default
machines="single"
else
# Multiple mounts.