diff options
| author | Franck Bui <fbui@suse.com> | 2016-12-16 17:13:58 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-12-16 17:13:58 +0100 |
| commit | ebc8968bc0b6fc460099041f5ae1262ca17eeb6e (patch) | |
| tree | a1c3593e691fae26283c8bf2f38649c1e33b15d8 /rules | |
| parent | d6ccb4f9428102ac784f8ebd5d937d5363146c1d (diff) | |
core: make mount units from /proc/self/mountinfo possibly bind to a device (#4515)
Since commit 9d06297, mount units from mountinfo are not bound to their devices
anymore (they use the "Requires" dependency instead).
This has the following drawback: if a media is mounted and the eject button is
pressed then the media is unconditionally ejected leaving some inconsistent
states.
Since udev is the component that is reacting (no matter if the device is used
or not) to the eject button, users expect that udev at least try to unmount the
media properly.
This patch introduces a new property "SYSTEMD_MOUNT_DEVICE_BOUND". When set on
a block device, all units that requires this device will see their "Requires"
dependency upgraded to a "BindTo" one. This is currently only used by cdrom
devices.
This patch also gives the possibility to the user to restore the previous
behavior that is bind a mount unit to a device. This is achieved by passing the
"x-systemd.device-bound" option to mount(8). Please note that currently this is
not working because libmount treats the x-* options has comments therefore
they're not available in utab for later application retrievals.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/60-cdrom_id.rules | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rules/60-cdrom_id.rules b/rules/60-cdrom_id.rules index 5c3b52ebb9..f91d8cb456 100644 --- a/rules/60-cdrom_id.rules +++ b/rules/60-cdrom_id.rules @@ -8,6 +8,10 @@ ENV{DEVTYPE}!="disk", GOTO="cdrom_end" # unconditionally tag device as CDROM KERNEL=="sr[0-9]*", ENV{ID_CDROM}="1" +# stop automatically any mount units bound to the device if the media eject +# button is pressed. +ENV{ID_CDROM}=="1", ENV{SYSTEMD_MOUNT_DEVICE_BOUND}="1" + # media eject button pressed ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdrom_id --eject-media $devnode", GOTO="cdrom_end" |