diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page index 85c2cc576..571763dce 100755 --- a/emhttp/plugins/dynamix/DeviceInfo.page +++ b/emhttp/plugins/dynamix/DeviceInfo.page @@ -621,11 +621,11 @@ _(File system type)_: =mk_option(_var($disk,'fsType'), "xfs", _('xfs'))?> =mk_option(_var($disk,'fsType'), "zfs", _('zfs'))?> =mk_option(_var($disk,'fsType'), "btrfs", _('btrfs'))?> - =mk_option(_var($disk,'fsType'), "reiserfs", _('reiserfs'))?> + =mk_option(_var($disk,'fsType'), "reiserfs", _('reiserfs'), "disabled")?> =mk_option(_var($disk,'fsType'), "luks:xfs", _('xfs')." - "._('encrypted'))?> =mk_option(_var($disk,'fsType'), "luks:zfs", _('zfs')." - "._('encrypted'))?> =mk_option(_var($disk,'fsType'), "luks:btrfs", _('btrfs')." - "._('encrypted'))?> - =mk_option(_var($disk,'fsType'), "luks:reiserfs", _('reiserfs')." - "._('encrypted'))?> + =mk_option(_var($disk,'fsType'), "luks:reiserfs", _('reiserfs')." - "._('encrypted'), "disabled")?> style="display:none"> _(ReiserFS is deprecated, please use another file system)_! :info_file_system_help: diff --git a/emhttp/plugins/dynamix/DiskSettings.page b/emhttp/plugins/dynamix/DiskSettings.page index b9d0a8004..f54cc2a7f 100644 --- a/emhttp/plugins/dynamix/DiskSettings.page +++ b/emhttp/plugins/dynamix/DiskSettings.page @@ -159,11 +159,11 @@ _(Default file system)_: =mk_option($var['defaultFsType'], "xfs", _('xfs'));?> =mk_option($var['defaultFsType'], "zfs", _('zfs'));?> =mk_option($var['defaultFsType'], "btrfs", _('btrfs'));?> - =mk_option($var['defaultFsType'], "reiserfs", _('reiserfs'));?> + =mk_option($var['defaultFsType'], "reiserfs", _('reiserfs'), "disabled");?> =mk_option($var['defaultFsType'], "luks:xfs", _('xfs')." - "._('encrypted'));?> =mk_option($var['defaultFsType'], "luks:zfs", _('zfs')." - "._('encrypted'));?> =mk_option($var['defaultFsType'], "luks:btrfs", _('btrfs')." - "._('encrypted'));?> - =mk_option($var['defaultFsType'], "luks:reiserfs", _('reiserfs')." - "._('encrypted'));?> + =mk_option($var['defaultFsType'], "luks:reiserfs", _('reiserfs')." - "._('encrypted'), "disabled");?> :disk_default_file_system_help: diff --git a/emhttp/plugins/dynamix/SecurityNFS.page b/emhttp/plugins/dynamix/SecurityNFS.page index 6a6223b71..ef329f743 100644 --- a/emhttp/plugins/dynamix/SecurityNFS.page +++ b/emhttp/plugins/dynamix/SecurityNFS.page @@ -17,6 +17,10 @@ Cond="(($var['shareNFSEnabled']!='no') && (isset($name)?array_key_exists($name,$ ?> $width = [123,300]; + +/* Replace spaces in NFS rule with new lines for multi line textarea. */ +$sec_nfs[$name]['hostList'] = str_replace(" ", "\n", $sec_nfs[$name]['hostList']); + ?> :nfs_security_help: @@ -73,10 +77,10 @@ _(Security)_: -