fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-diskman: bump to 0.2.7

Browse Source
This commit is contained in:
CN_SZTL 2020-04-01 23:09:40 +08:00
parent 2fda412016
commit 5b7fa4ea6c
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/ctcgfw/luci-app-diskman/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-diskman
PKG_VERSION:=v0.2.5
PKG_VERSION:=v0.2.7
PKG_RELEASE:=beta
PKG_MAINTAINER:=lisaac <https://github.com/lisaac/luci-app-diskman>
PKG_LICENSE:=AGPL-3.0
@ -19,10 +19,10 @@ include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)/config
config PACKAGE_$(PKG_NAME)_INCLUDE_btrfs_progs
bool "Include btrfs-progs"
default n
default y
config PACKAGE_$(PKG_NAME)_INCLUDE_lsblk
bool "Include lsblk"
default n
default y
config PACKAGE_$(PKG_NAME)_INCLUDE_mdadm
bool "Include mdadm"
default n

2
package/ctcgfw/luci-app-diskman/depends.lst
View File

@ -1 +1 @@
e2fsprogs parted smartmontools blkid mdadm btrfs-progs util-linux mergerfs snapraid
e2fsprogs parted smartmontools blkid mdadm btrfs-progs util-linux

11
package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua
View File

@ -311,10 +311,8 @@ if not disk_info.p_table:match("Raid") then
return
end
local part_type = "primary"
-- create partition table if no partition table
if disk_info.p_table == "UNKNOWN" then
local cmd = dm.command.parted .. " -s /dev/" .. dev .. " mktable gpt"
elseif disk_info.p_table == "MBR" and disk_info["extended_partition_index"] then
if disk_info.p_table == "MBR" and disk_info["extended_partition_index"] then
if tonumber(disk_info.partitions[disk_info["extended_partition_index"]].sec_start) <= tonumber(start_sec:sub(1,-2)) and tonumber(disk_info.partitions[disk_info["extended_partition_index"]].sec_end) >= tonumber(end_sec:sub(1,-2)) then
part_type = "logical"
if tonumber(start_sec:sub(1,-2)) - tonumber(disk_info.partitions[section].sec_start) < 2048 then
@ -322,6 +320,11 @@ if not disk_info.p_table:match("Raid") then
start_sec = start_sec .."s"
end
end
elseif disk_info.p_table == "GPT" then
-- AUTOMATIC FIX GPT PARTITION TABLE
-- Not all of the space available to /dev/sdb appears to be used, you can fix the GPT to use all of the space (an extra 16123870 blocks) or continue with the current setting?
local cmd = ' printf "ok\nfix\n" | parted ---pretend-input-tty /dev/'.. dev ..' print'
luci.util.exec(cmd .. " 2>&1")
end
-- partiton