system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 18:24:38 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

build-sys,man: describe systemd-umount and hook it up to installation (#5227)

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-02-05 16:27:38 -05:00 committed by Martin Pitt
parent 1b52793d5d
commit d20a328f97
4 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile-man.am
View file

@ -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)

9
Makefile.am
View file

@ -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 =

20
man/systemd-mount.xml
View file

@ -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" />

2
src/mount/mount-tool.c
View file

@ -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);
}