From 12c9b1f6947f6cfc9d38bf75601f31d2be96d0e3 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Mon, 9 Mar 2020 04:00:46 +0800
Subject: [PATCH] luci-app-diskman: sync with upstream source

---
 package/ctcgfw/luci-app-diskman/Makefile      | 31 +++++++++++++++++--
 .../luasrc/model/cbi/diskman/disks.lua        |  1 +
 .../luci-app-diskman/po/zh-cn/diskman.po      |  2 +-
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/package/ctcgfw/luci-app-diskman/Makefile b/package/ctcgfw/luci-app-diskman/Makefile
index bacc213c50..e02fe04f21 100644
--- a/package/ctcgfw/luci-app-diskman/Makefile
+++ b/package/ctcgfw/luci-app-diskman/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-diskman
-PKG_VERSION:=v0.2.3
+PKG_VERSION:=v0.2.4
 PKG_RELEASE:=beta
 PKG_MAINTAINER:=lisaac <https://github.com/lisaac/luci-app-diskman>
 PKG_LICENSE:=AGPL-3.0
@@ -11,18 +11,43 @@ PKG_SOURCE_URL:=https://github.com/lisaac/luci-app-diskman.git
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/$(PKG_NAME)/config
+config PACKAGE_$(PKG_NAME)_INCLUDE_btrfs_progs
+	bool "Include btrfs-progs"
+	default y
+config PACKAGE_$(PKG_NAME)_INCLUDE_lsblk
+	bool "Include lsblk"
+	default y
+config PACKAGE_$(PKG_NAME)_INCLUDE_mdadm
+	bool "Include mdadm"
+	default n
+config PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456
+	bool "Include kmod-md-raid456"
+	default n
+config PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linear
+	bool "Include kmod-md-linear"
+	default n
+endef
+
 define Package/$(PKG_NAME)
 	SECTION:=luci
 	CATEGORY:=LuCI
 	SUBMENU:=3. Applications
 	TITLE:=Disk Manager interface for LuCI
 	PKGARCH:=all
-	DEPENDS:=+e2fsprogs +parted +smartmontools +blkid
+	DEPENDS:=+e2fsprogs +parted +smartmontools +blkid \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_btrfs_progs:btrfs-progs \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_lsblk:lsblk \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_mdadm:mdadm \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456:kmod-md-mod \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456:kmod-md-raid456 \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linears:kmod-md-mod \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linears:kmod-md-linear
 endef
 
 define Package/$(PKG_NAME)/description
diff --git a/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua b/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua
index 40c8cb3659..427920a82b 100644
--- a/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua
+++ b/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua
@@ -265,6 +265,7 @@ btn_umount.render = function(self, section, scope)
 end
 btn_umount.write = function(self, section, value)
   local res
+  if not _mount_point.mount_point or not _mount_point.device then return end
   if value == translate("Mount") then
     luci.util.exec("mkdir -p ".. _mount_point.mount_point)
     res = luci.util.exec(dm.command.mount .. " ".. _mount_point.device .. (_mount_point.fs and (" -t ".. _mount_point.fs )or "") .. (_mount_point.mount_options and (" -o " .. _mount_point.mount_options.. " ") or  " ").._mount_point.mount_point .. " 2>&1")
diff --git a/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po b/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po
index c79b6d3038..75ac896302 100644
--- a/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po
+++ b/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po
@@ -125,7 +125,7 @@ msgid "Device Info"
 msgstr "设备信息"
 
 msgid "Disk Man"
-msgstr "DiskMan 磁盘管理"
+msgstr "磁盘管理"
 
 msgid "Partitions Info"
 msgstr "分区信息"