Skip to content

Commit

Permalink
Handle filesystem labels containing blanks correctly.
Browse files Browse the repository at this point in the history
Signed-off-by: Volker Theile <votdev@gmx.de>
  • Loading branch information
votdev committed Sep 16, 2019
1 parent 32cc512 commit 435b171
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion deb/openmediavault/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
openmediavault (5.0.7-1) unstable; urgency=low
openmediavault (5.0.8-1) unstable; urgency=low

* Handle filesystem labels containing blanks correctly.

-- Volker Theile <volker.theile@openmediavault.org> Mon, 16 Sep 2019 18:45:51 +0200

openmediavault (5.0.7-1) unstable; urgency=low

* Fix various bugs in Postfix configuration.
* Issue #431: Fix bug in monit configuration.
* Issue #434: The environment variable OMV_SAMBA_SHARE_VFSOBJECTS was
Expand Down
4 changes: 2 additions & 2 deletions deb/openmediavault/srv/salt/omv/deploy/fstab/default.sls
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ include:
{% for mountpoint in no_bind_mountpoints %}
mount_no_bind_mountpoint_{{ mountpoint.uuid }}:
mount.mounted:
- name: {{ mountpoint.dir | escape_blank(True) | replace('\\', '\\\\') }}
- name: {{ mountpoint.dir | replace(' ', '\\ ') }}
- device: {{ mountpoint.fsname | replace('\\', '\\\\') }}
- fstype: {{ mountpoint.type }}
- mkmnt: True
Expand All @@ -59,7 +59,7 @@ mount_no_bind_mountpoint_{{ mountpoint.uuid }}:
{% for mountpoint in bind_mountpoints %}
mount_bind_mountpoint_{{ mountpoint.uuid }}:
mount.mounted:
- name: {{ mountpoint.dir | escape_blank(True) | replace('\\', '\\\\') }}
- name: {{ mountpoint.dir | replace(' ', '\\ ') }}
- device: {{ mountpoint.fsname | replace('\\', '\\\\') }}
- fstype: none
- opts: bind
Expand Down

0 comments on commit 435b171

Please sign in to comment.