Fixed handling of comma-separated mount options in fstab and ignition overlays

- Fixed: #1950

Signed-off-by: Jonathon Anderson <janderson@ciq.com>

overlays/fstab/internal/fstab_test.go

@@ -61,7 +61,8 @@ sysfs /sys sysfs defaults 0 0
 proc /proc proc defaults 0 0
 # mounts for local file systems created with ignition in nodes.conf
 # all with noauto as mounts happens with systemd units
-/dev/disk/by-partlabel/scratch /scratch btrfs noauto,defaults 0 0
+/dev/disk/by-partlabel/scratch /scratch btrfs noauto,nondefault 0 0
+/dev/disk/by-partlabel/scratch2 /scratch2 btrfs noauto,defaults 0 0
 /dev/disk/by-partlabel/swap swap swap noauto,defaults 0 0
 warewulf:/home /home nfs defaults 0 0
 `

overlays/fstab/internal/nodes.conf

@@ -18,6 +18,11 @@ nodes:
         format: btrfs
         path: /scratch
         wipe_filesystem: true
+        mount_options: "nondefault"
+      /dev/disk/by-partlabel/scratch2:
+        format: btrfs
+        path: /scratch2
+        wipe_filesystem: true
       /dev/disk/by-partlabel/swap:
         format: swap
         path: swap

overlays/fstab/rootfs/etc/fstab.ww

@@ -9,7 +9,7 @@ proc /proc proc defaults 0 0
 # all with noauto as mounts happens with systemd units
 {{- range $fsdevice,$fs := .FileSystems }}
 {{ $fsdevice }} {{ $fs.Path }} {{ $fs.Format }}
-{{- if $fs.MountOptions }} noauto{{range $index,$opt := $fs.MountOptions }},{{ $opt }}{{ end }} 0 0
+{{- if $fs.MountOptions }} noauto,{{ $fs.MountOptions }} 0 0
 {{- else }} noauto,defaults 0 0
 {{- end }}{{ end }}{{ end }}
 {{- with $fstab := index .Resources "fstab" }}

overlays/ignition/internal/ignition_test.go

@@ -111,6 +111,7 @@ nodes:
         format: btrfs
         path: /scratch
         wipe_filesystem: true
+        mount_options: "nondefault"
       /dev/disk/by-partlabel/swap:
         format: swap
         path: swap`,
@@ -129,6 +130,7 @@ After=ignition-ww4-disks.service
 Where=/scratch
 What=/dev/disk/by-partlabel/scratch
 Type=btrfs
+Options=nondefault
 [Install]
 RequiredBy=local-fs.target
 backupFile: true

overlays/ignition/rootfs/etc/systemd/system/ww4-mounts.ww

@@ -27,7 +27,7 @@ Where={{ $fs.Path }}
 What={{ $fsdevice }}
 Type={{ $fs.Format }}
 {{- if $fs.MountOptions }}
-Options={{ $fs.MountOptions | join "." }}
+Options={{ $fs.MountOptions }}
 {{- end }}
 [Install]
 RequiredBy=local-fs.target