From 6fa06076aee80e5dda5a1b3f3848fb304aff64fb Mon Sep 17 00:00:00 2001 From: Dimitry Ishenko Date: Tue, 14 Jan 2025 23:22:22 -0500 Subject: [PATCH] Update manpage --- automount.7 | 31 +++++++------------------------ automount.7.md | 31 +++++++++---------------------- 2 files changed, 16 insertions(+), 46 deletions(-) diff --git a/automount.7 b/automount.7 index ec4e1c9..5c382c8 100644 --- a/automount.7 +++ b/automount.7 @@ -34,16 +34,8 @@ plain-text INI-style files with \f[V].conf\f[R] extension, consisting of section names (enclosed in \f[V][]\f[R]) followed by actions to be performed. .PP -Config files are parsed in alphabetical order from the following -directories (typically): -.IP -.nf -\f[C] -/usr/share/automount/ -/etc/automount/ -\f[R] -.fi -.PP +Config files are located in the \f[V]/etc/automount/\f[R] directory +(typically) and are parsed in alphabetical order. Actions in the most recent config files override the ones in earlier files. .PP @@ -52,7 +44,7 @@ Here is an example of the default config file that comes with .IP .nf \f[C] -/usr/share/automount/10-default.conf: +/etc/automount/10-default.conf: [ID_FS_USAGE=filesystem] auto-mount = yes @@ -181,9 +173,6 @@ ID_FS_USAGE=filesystem When a block-device event occurs, \f[B]auto-mount\f[R] extracts actions from all sections with matching conditions, with actions in later sections overriding the ones in earlier sections. -.PP -A special section called \f[V][DEFAULT]\f[R] can contain actions that -will apply (if not overridden) to any event. .SH ACTIONS .PP An action can be any of the following: @@ -219,20 +208,14 @@ on-add = /sbin/hdparm -S 240 ${DEVNAME} Commands support basic variable substitution in the form \f[V]${VARIABLE}\f[R], where \f[V]VARIABLE\f[R] can be any of the device properties. -Additional properties are accessible in certain actions: -.IP \[bu] 2 -The \f[V]on-mount\f[R] and \f[V]on-unmount\f[R] actions can use the -\f[V]${MOUNT_POINT}\f[R] property to determine the current mount point. -.RS 2 +.PP +Additionally, the \f[V]on-mount\f[R] and \f[V]on-unmount\f[R] actions +can use the \f[V]${MOUNT_POINT}\f[R] property to determine the current +mount point. .PP \f[I]Note: The same block device can be mounted at multiple mount points, and the \f[VI]on-mount\f[I] and \f[VI]on-unmount\f[I] actions will be executed for each mount point.\f[R] -.RE -.IP \[bu] 2 -The \f[V]on-add\f[R] and \f[V]on-change\f[R] actions can use the -\f[V]${SIZE}\f[R] property to detect empty or ejected media, in which -case the value of \f[V]SIZE\f[R] will be empty. .PP The \f[V]mount-options\f[R] and \f[V]mount-as\f[R] values are only applicable when \f[V]auto-mount = yes\f[R]. diff --git a/automount.7.md b/automount.7.md index 70882d5..3fb7379 100644 --- a/automount.7.md +++ b/automount.7.md @@ -21,20 +21,14 @@ containing a filesystem, when it appears in the system. INI-style files with `.conf` extension, consisting of section names (enclosed in `[]`) followed by actions to be performed. -Config files are parsed in alphabetical order from the following directories -(typically): - -``` -/usr/share/automount/ -/etc/automount/ -``` - -Actions in the most recent config files override the ones in earlier files. +Config files are located in the `/etc/automount/` directory (typically) and are +parsed in alphabetical order. Actions in the most recent config files override +the ones in earlier files. Here is an example of the default config file that comes with **auto-mount**: ```ini -/usr/share/automount/10-default.conf: +/etc/automount/10-default.conf: [ID_FS_USAGE=filesystem] auto-mount = yes @@ -144,9 +138,6 @@ When a block-device event occurs, **auto-mount** extracts actions from all sections with matching conditions, with actions in later sections overriding the ones in earlier sections. -A special section called `[DEFAULT]` can contain actions that will apply (if -not overridden) to any event. - # ACTIONS An action can be any of the following: @@ -175,17 +166,13 @@ on-add = /sbin/hdparm -S 240 ${DEVNAME} ``` Commands support basic variable substitution in the form `${VARIABLE}`, where -`VARIABLE` can be any of the device properties. Additional properties are -accessible in certain actions: +`VARIABLE` can be any of the device properties. -* The `on-mount` and `on-unmount` actions can use the `${MOUNT_POINT}` property - to determine the current mount point. +Additionally, the `on-mount` and `on-unmount` actions can use the +`${MOUNT_POINT}` property to determine the current mount point. - *Note: The same block device can be mounted at multiple mount points, and the - `on-mount` and `on-unmount` actions will be executed for each mount point.* - -* The `on-add` and `on-change` actions can use the `${SIZE}` property to detect - empty or ejected media, in which case the value of `SIZE` will be empty. +*Note: The same block device can be mounted at multiple mount points, and the +`on-mount` and `on-unmount` actions will be executed for each mount point.* The `mount-options` and `mount-as` values are only applicable when `auto-mount = yes`.