diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-05-03 16:54:00 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-05-06 12:23:51 -0700 |
| commit | 0dba628638acd2aa5d990cd1edd41ac689f808c8 (patch) | |
| tree | e6e0a60ab970eacf1dd5b16c42b226370ac9dbb9 /src/property/fstab.lisp | |
| parent | 12c1772452539f9f24d5bec01f53580dc7166972 (diff) | |
| download | consfigurator-0dba628638acd2aa5d990cd1edd41ac689f808c8.tar.gz | |
FSTAB:ENTRIES: make "PLACEHOLDER" work like "none" in fs_spec
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/fstab.lisp')
| -rw-r--r-- | src/property/fstab.lisp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/property/fstab.lisp b/src/property/fstab.lisp index 68bce6a..f89365d 100644 --- a/src/property/fstab.lisp +++ b/src/property/fstab.lisp @@ -75,7 +75,7 @@ Other properties might fill it in." procedure: existing lines of the fstab with the same mount point as any of ENTRIES are updated to match the corresponding members of ENTRIES, except that if the first field of the existing entry is not \"none\" and the corresponding -member of ENTRIES is \"none\", use the existing field value. +member of ENTRIES is \"none\", or \"PLACEHOLDER\", use the existing field value. This makes it easy to update mount options without having to specify the partition or filesystem UUID in your consfig." @@ -92,7 +92,9 @@ partition or filesystem UUID in your consfig." for line-source = (entry->source line) and line-mountpoint = (entry->mountpoint line) for entry = (let ((entry (gethash line-mountpoint pending))) - (if (and (string= (entry->source entry) "none") + (if (and (member (entry->source entry) + '("none" "PLACEHOLDER") + :test #'string=) (not (string= line-source "none"))) (format nil "~A ~{~A~^ ~}" line-source (cdr (split-string entry))) |