From 366318fb8208c62c2f6f53021f95a489c2d449bc Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Thu, 3 Nov 2022 16:06:14 +0100
Subject: [PATCH] Rename 'standard' partition layout to 'advanced'.

* parameters.list: Adjust description.
* create (create_filesystems, prep_init_mount_point): s/standard/advanced.
* verify (OSP_LAYOUT): Adjust accordingly.
---
 create          | 8 ++++----
 parameters.list | 2 +-
 verify          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/create b/create
index 83ab43a..a3ea019 100755
--- a/create
+++ b/create
@@ -172,7 +172,7 @@ create_filesystems(){
         "${BTRFS}" subvolume create "$BTRFS_ROOT/var/log"
         "${BTRFS}" subvolume create "$BTRFS_ROOT/home"
         "$UMOUNT" "$TARGET_ROOT"
-    elif [[ "$LAYOUT" == standard ]]; then
+    elif [[ "$LAYOUT" == "advanced" ]]; then
         # Assume LVM.
         command -v "${PVCREATE}" || {
             log "LVM requested but lvm2 is not available"
@@ -235,11 +235,11 @@ prep_init_mount_point(){
         CLEANUP+=("$UMOUNT $TARGET_ROOT")
     else
         if [[ "$FS_TYPE" == "btrfs" ]]; then
-            # The standard btrfs layout uses a system-root subvolume.
+            # The advanced btrfs layout uses a system-root subvolume.
             "$MOUNT" -o "subvol=system-root" "$TARGET_DEV_PART2" "$TARGET_ROOT"
             CLEANUP+=("$UMOUNT $TARGET_ROOT")
         else
-            # The standard layout for non-btrfs filesystems is setup with LVM
+            # The advanced layout for non-btrfs filesystems is setup with LVM
             log Mounting LVM logical volumes from "${INSTANCE_NAME}"_vg01 \
                 of "$TARGET_DEV_PART2"
             "$MOUNT" "/dev/${INSTANCE_NAME}_vg01/lv_root" "$TARGET_ROOT"
@@ -285,7 +285,7 @@ main(){
     # NIC_0_NETWORK_SUBNET=1.2.3.4/24 \
     # NIC_0_NETWORK_GATEWAY=1.2.3.1 \
     # TARGET_DEVICE=/dev/mapper/vg--drbd-e7deba31--7f30--4475--9ff3--2565f232f780.disk0 \
-    # OSP_LAYOUT=standard OSP_FILESYSTEM=xfs \
+    # OSP_LAYOUT=advanced OSP_FILESYSTEM=xfs \
     # OSP_VARIANT_CONFIG=$(pwd)/examples/dynamic-lvm.scm \
     # ./create
     local DEFAULT_VARIANT_CONFIG="${EXAMPLEDIR}/dynamic.scm"
diff --git a/parameters.list b/parameters.list
index 8065145..703068a 100644
--- a/parameters.list
+++ b/parameters.list
@@ -4,5 +4,5 @@ branch Optionally use the specified branch to build the image.
 commit Optionally use this specific commit to build the image.
 repo_uri If set, build the image using this Guix repository URL.  If commit and branch are omitted, the master branch is used.
 disable_authentication Do not authenticate the repository when using a custom repo, branch or commit.
-layout A partitioning layout option. Only basic and standard are supported, and basic is the default.
+layout A partitioning layout option, either basic or advanced.  Defaults to basic.
 filesystem Defaults to ext4 if unset. Supported values are ext2, ext3, ext4, f2fs, xfs and btrfs.
diff --git a/verify b/verify
index 3d3c357..02c4c23 100755
--- a/verify
+++ b/verify
@@ -73,7 +73,7 @@ case "${OSP_FILESYSTEM}" in
 esac
 
 case "${OSP_LAYOUT}" in
-  ""|basic|standard)
+  ""|basic|advanced)
       ;;
   *)
     echo "Invalid value '$OSP_LAYOUT' for the layout parameter" 1>&2