diff options
| -rw-r--r-- | Makefile-man.am | 5 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | man/systemd-mount.xml | 20 | ||||
| -rw-r--r-- | src/mount/mount-tool.c | 2 |
4 files changed, 34 insertions, 2 deletions
diff --git a/Makefile-man.am b/Makefile-man.am index c47bedd0df..6f59658445 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -481,6 +481,7 @@ MANPAGES_ALIAS += \ man/systemd-udevd-control.socket.8 \ man/systemd-udevd-kernel.socket.8 \ man/systemd-udevd.8 \ + man/systemd-umount.1 \ man/systemd-update-done.8 \ man/systemd-user.conf.5 \ man/systemd-volatile-root.8 \ @@ -837,6 +838,7 @@ man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8 man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8 man/systemd-udevd.8: man/systemd-udevd.service.8 +man/systemd-umount.1: man/systemd-mount.1 man/systemd-update-done.8: man/systemd-update-done.service.8 man/systemd-user.conf.5: man/systemd-system.conf.5 man/systemd-volatile-root.8: man/systemd-volatile-root.service.8 @@ -1787,6 +1789,9 @@ man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html man/systemd-udevd.html: man/systemd-udevd.service.html $(html-alias) +man/systemd-umount.html: man/systemd-mount.html + $(html-alias) + man/systemd-update-done.html: man/systemd-update-done.service.html $(html-alias) diff --git a/Makefile.am b/Makefile.am index c87c547e05..9a435e3a66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -673,6 +673,15 @@ EXTRA_DIST += \ @INTLTOOL_POLICY_RULE@ +systemd-mount-install-hook: + -$(LN_S) systemd-mount $(DESTDIR)$(bindir)/systemd-umount + +systemd-mount-uninstall-hook: + -rm $(DESTDIR)$(bindir)/systemd-umount + +INSTALL_EXEC_HOOKS += systemd-mount-install-hook +UNINSTALL_EXEC_HOOKS += systemd-mount-uninstall-hook + # ------------------------------------------------------------------------------ MANPAGES = diff --git a/man/systemd-mount.xml b/man/systemd-mount.xml index 06b7c85bd8..ab85dc5640 100644 --- a/man/systemd-mount.xml +++ b/man/systemd-mount.xml @@ -45,7 +45,8 @@ <refnamediv> <refname>systemd-mount</refname> - <refpurpose>Establish a mount or auto-mount point transiently</refpurpose> + <refname>systemd-umount</refname> + <refpurpose>Establish and destroy transient mount or auto-mount points</refpurpose> </refnamediv> <refsynopsisdiv> @@ -60,6 +61,11 @@ <arg choice="opt" rep="repeat"><replaceable>OPTIONS</replaceable></arg> <arg choice="plain"><option>--list</option></arg> </cmdsynopsis> + <cmdsynopsis> + <command>systemd-umount</command> + <arg choice="opt" rep="repeat"><replaceable>OPTIONS</replaceable></arg> + <arg choice="plain" rep="repeat"><replaceable>WHERE</replaceable></arg> + </cmdsynopsis> </refsynopsisdiv> <refsect1> @@ -91,6 +97,9 @@ <para>Use the <option>--list</option> command to show a terse table of all local, known block devices with file systems that may be mounted with this command.</para> + + <para><command>systemd-umount</command> can be used to unmount a mount or automount point. It is the same + as <command>systemd-mount</command> <option>--unmount</option>.</para> </refsect1> <refsect1> @@ -239,6 +248,15 @@ such as labels, etc.</para></listitem> </varlistentry> + <varlistentry> + <term><option>-u</option></term> + <term><option>--unmount</option></term> + + <listitem><para>Stop the mount and automount units corresponding to the specified mount points + <replaceable>WHERE</replaceable>.</para> + </listitem> + </varlistentry> + <xi:include href="user-system-options.xml" xpointer="user" /> <xi:include href="user-system-options.xml" xpointer="system" /> <xi:include href="user-system-options.xml" xpointer="host" /> diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index e66c2fe5f3..a277724029 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -100,7 +100,7 @@ static void help(void) { " Set automount unit property\n" " --bind-device Bind automount unit to device\n" " --list List mountable block devices\n" - " -u --umount Unmount a mount point\n" + " -u --umount Unmount mount points\n" , program_invocation_short_name); } |