fix

2025-03-09 15:40:03 +00:00 · 2022-06-14 22:48:56 +08:00 · 2022-06-14 22:48:56 +08:00 · 97bd10af48
commit 97bd10af48
parent 1c779c2acf
678 changed files with 4 additions and 10048 deletions
--- a/6in4/Makefile
+++ b/6in4/Makefile
--- a/CLA-entity.md
+++ b/CLA-entity.md
--- a/CLA-individual.md
+++ b/CLA-individual.md
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
--- a/0
+++ b/0
--- a/README.md
+++ b/README.md
--- a/aquantia/Makefile
+++ b/aquantia/Makefile
--- a/bcm27xx-eeprom/Makefile
+++ b/bcm27xx-eeprom/Makefile
--- a/bcm27xx-eeprom/patches/0001-rpi-eeprom-update-OpenWrt-defaults.patch
+++ b/bcm27xx-eeprom/patches/0001-rpi-eeprom-update-OpenWrt-defaults.patch
--- a/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch
+++ b/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch
--- a/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch
+++ b/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch
--- a/contributors/cr3ative.md
+++ b/contributors/cr3ative.md
--- a/contributors/example.md
+++ b/contributors/example.md
--- a/cryptodev-linux/Makefile
+++ b/cryptodev-linux/Makefile
--- a/dnsforwarder/Makefile
+++ b/dnsforwarder/Makefile
@ -1,61 +0,0 @@
-#
-# Copyright (C) 2021 ImmortalWrt
-# <https://immortalwrt.org>
-#
-# This is free software, licensed under the GNU General Public License v3.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dnsforwarder
-PKG_VERSION:=6.1.15
-PKG_RELEASE:=11
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/1715173329/dnsforwarder.git
-PKG_SOURCE_DATE:=2018-06-26
-PKG_SOURCE_VERSION:=587e61ae4d75dc976f538088b715a3c8ee26c144
-PKG_MIRROR_HASH:=7c141040ae384d254d90b3c3ee502d87330c9fdcd201ff29a669336a27b176d4
-
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILE:=LICENSE
-PKG_MAINTAINER:=Dennis <openwrt@tossp.com>
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dnsforwarder
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=A simple DNS forwarder
-  URL:=https://github.com/holmium/dnsforwarder
-  DEPENDS:=+coreutils +coreutils-base64 +dnsmasq-full +libpthread +wget-ssl
-endef
-
-define Package/dnsforwarder/description
-  Forwarding queries to customized domains (and their subdomains) to specified servers
-  over a specified protocol (UDP or TCP). non-standard ports are supported.
-endef
-
-CONFIGURE_ARGS+= --enable-downloader=wget
-
-define Package/dnsforwarder/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dnsforwarder $(1)/usr/bin/dnsforwarder
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) files/etc/config/dnsforwarder $(1)/etc/config/dnsforwarder
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) files/etc/init.d/dnsforwarder $(1)/etc/init.d/dnsforwarder
-
-	$(INSTALL_DIR) $(1)/etc/dnsforwarder
-	$(INSTALL_CONF) files/etc/dnsforwarder/gfw.txt $(1)/etc/dnsforwarder/gfw.txt
-	$(INSTALL_DIR) $(1)/usr/share/dnsforwarder
-	$(INSTALL_BIN) files/usr/share/dnsforwarder/gfwlist.sh $(1)/usr/share/dnsforwarder/gfwlist.sh
-endef
-
-$(eval $(call BuildPackage,dnsforwarder))
--- a/dnsforwarder/files/etc/config/dnsforwarder
+++ b/dnsforwarder/files/etc/config/dnsforwarder
@ -1,79 +0,0 @@
-
-config arguments
-	option enabled '0'
-	option addr '127.0.0.1:5053'
-
-config config
-	option cache 'true'
-	option cache_size '102400'
-	option cache_ignore 'false'	
-	option gfw 'true'
-	list block_ip '74.125.127.102'
-	list block_ip '74.125.155.102'
-	list block_ip '74.125.39.102'
-	list block_ip '74.125.39.113'
-	list block_ip '209.85.229.138'
-	list block_ip '128.121.126.139'
-	list block_ip '159.106.121.75'
-	list block_ip '169.132.13.103'
-	list block_ip '192.67.198.6'
-	list block_ip '202.106.1.2'
-	list block_ip '202.181.7.85'
-	list block_ip '203.161.230.171'
-	list block_ip '203.98.7.65'
-	list block_ip '207.12.88.98'
-	list block_ip '208.56.31.43'
-	list block_ip '209.145.54.50'
-	list block_ip '209.220.30.174'
-	list block_ip '209.36.73.33'
-	list block_ip '211.94.66.147'
-	list block_ip '213.169.251.35'
-	list block_ip '216.221.188.182'
-	list block_ip '216.234.179.13'
-	list block_ip '243.185.187.39'
-	list block_ip '37.61.54.158'
-	list block_ip '4.36.66.178'
-	list block_ip '46.82.174.68'
-	list block_ip '59.24.3.173'
-	list block_ip '64.33.88.161'
-	list block_ip '64.33.99.47'
-	list block_ip '64.66.163.251'
-	list block_ip '65.104.202.252'
-	list block_ip '65.160.219.113'
-	list block_ip '66.45.252.237'
-	list block_ip '69.55.52.253'
-	list block_ip '72.14.205.104'
-	list block_ip '72.14.205.99'
-	list block_ip '78.16.49.15'
-	list block_ip '8.7.198.45'
-	list block_ip '93.46.8.89'
-	list block_ip '37.61.54.158'
-	list block_ip '243.185.187.39'
-	list block_ip '190.93.247.4'
-	list block_ip '190.93.246.4'
-	list block_ip '190.93.245.4'
-	list block_ip '190.93.244.4'
-	list block_ip '65.49.2.178'
-	list block_ip '189.163.17.5'
-	list block_ip '23.89.5.60'
-	list block_ip '49.2.123.56'
-	list block_ip '54.76.135.1'
-	list block_ip '77.4.7.92'
-	list block_ip '118.5.49.6'
-	list block_ip '159.24.3.173'
-	list block_ip '188.5.4.96'
-	list block_ip '197.4.4.12'
-	list block_ip '220.250.64.24'
-	list block_ip '243.185.187.30'
-	list block_ip '249.129.46.48'
-	list block_ip '253.157.14.165'
-	option block_ipv6 'false'
-	list cache_control 'tossp.com $orig'
-	list cache_control '* fixed 3600'
-	option log 'false'
-	list udp_group '9.9.9.9,119.29.29.29,223.5.5.5,114.114.114.114 * on'
-	option block_negative_resp 'true'
-	list udp_local '0.0.0.0:5053'
-	list udp_local '[::0]:5053'
-	option domain_statistic 'false'
-
--- a/dnsforwarder/files/etc/dnsforwarder/gfw.txt
+++ b/dnsforwarder/files/etc/dnsforwarder/gfw.txt
--- a/dnsforwarder/files/etc/init.d/dnsforwarder
+++ b/dnsforwarder/files/etc/init.d/dnsforwarder
@ -1,260 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=60
-
-EXTRA_COMMANDS="makeconfig makegfwlist health"
-
-CRON_FILE=/etc/crontabs/root
-PID_PATH=/var/run/dnsforwarder
-PID_FILE=${PID_PATH}/dns.pid
-DNSFORWARDER_CONF=/tmp/dnsforwarder.conf
-
-add_cron()
-{
-	sed -i '/dnsforwarder/d' $CRON_FILE
-	echo '*/5 * * * * /etc/init.d/dnsforwarder health' >> $CRON_FILE
-	echo '0 1 * * 0 /etc/init.d/dnsforwarder makegfwlist' >> $CRON_FILE
-	crontab $CRON_FILE
-}
-
-del_cron()
-{
-	sed -i '/dnsforwarder/d' $CRON_FILE
-	/etc/init.d/cron restart
-}
-
-fixturboacc(){
-    dns=$(uci get turboacc.config.dns_caching 2>/dev/null)
-    if [ $dns -eq 1 ];  then
-        uci set turboacc.config.dns_caching=0 && uci commit turboacc
-        /etc/init.d/turboacc restart
-    fi
-}
-
-makelist() {
-    [ -z "$2" ] && return
-    local i
-    local t="$1"; shift
-    for i in "$@"
-    do
-        echo "$t $i"
-    done
-}
-
-health(){
-	rm /var/log/dnsforwarder.log.* 2>/dev/null
-	local pid=$(cat ${PID_FILE} 2>/dev/null)
-	if [ -n "${pid}" -a -d /proc/$pid ]; then
-		echo "[health] process exists ${pid}"
-	else
-		echo "[health] Dnsforwarder is not running ${pid}"
-		start
-	fi
-}
-
-
-makegfwlist(){
-	local GFW_FILE='/etc/dnsforwarder/gfw.txt'
-	local GFW_TMP_FILE='/tmp/dnsforwarder-gfw.old'
-	local TSTIME=`date '+%Y-%m-%d %H:%M:%S'`
-	touch ${GFW_TMP_FILE}
-	cat /etc/config/gfw.list 2>/dev/null > /tmp/edf.ts
-	cat /etc/dnsmasq.ssr/gfw_base.conf 2>/dev/null | awk -F '/' '{print $2}' | sed 's/^.//g' >> /tmp/edf.ts
-	cat /etc/dnsmasq.ssr/gfw_list.conf 2>/dev/null | awk -F '/' '{print $2}' | sed 's/^.//g' >> /tmp/edf.ts
-	sort /tmp/edf.ts  | uniq > /tmp/edf.ts
-	/usr/share/dnsforwarder/gfwlist.sh -i -l -o /tmp/dnsforwarder-gfw.tmp --extra-domain-file /tmp/edf.ts
-	if [ $? != 0 ]; then
-        echo 'Failed to fetch gfwlist'
-		logger -t  Failed to fetch gfwlist
-        return 2
-    fi
-	local gfw=$(cat /tmp/dnsforwarder-gfw.tmp)
-	echo "# GenerationAt TS_BUILD_TIME" > ${GFW_TMP_FILE}.new
-	echo "protocol tcp" >> ${GFW_TMP_FILE}.new
-	echo "server 8.8.8.8,8.8.4.4,1.1.1.1,1.0.0.1,208.67.222.222,208.67.220.220,209.244.0.3,209.244.0.4,8.26.56.26,8.20.247.20,156.154.70.1,156.154.71.1,199.85.126.10" >> ${GFW_TMP_FILE}.new
-	echo -e 'proxy no\n\n\n' >> ${GFW_TMP_FILE}.new
-	echo "${gfw}" >> ${GFW_TMP_FILE}.new
-	if [ "`cat ${GFW_TMP_FILE}.new | md5sum`" == "`cat ${GFW_TMP_FILE} | md5sum`" ]; then
-		printf "[\e[32m%s\e[0m]\n" "hold"
-	else
-		cp ${GFW_TMP_FILE}.new ${GFW_TMP_FILE}
-		cp ${GFW_TMP_FILE} ${GFW_FILE}
-		sed -i "s/TS_BUILD_TIME/${TSTIME}/g" ${GFW_FILE}
-		printf "[\e[33m%s\e[0m]" "PID"
-		restart
-	fi
-}
-
-makeconfig () {
-    config_load dnsforwarder
-
-    local log=$(uci get dnsforwarder.@config[0].log 2>/dev/null)
-    local log_size=$(uci get dnsforwarder.@config[0].log_size 2>/dev/null)
-
-	local gfw=$(uci get dnsforwarder.@config[0].gfw 2>/dev/null)
-
-	local udp_local=$(uci -d ',' get dnsforwarder.@config[0].udp_local 2>/dev/null)
-	local udp_local_list=$(uci get dnsforwarder.@config[0].udp_local 2>/dev/null)
-	local tcp_group=$(uci get dnsforwarder.@config[0].tcp_group 2>/dev/null)
-	local udp_group=$(uci get dnsforwarder.@config[0].udp_group 2>/dev/null)
-	local group_file=$(uci get dnsforwarder.@config[0].group_file 2>/dev/null)
-	local block_ip=$(uci -d ',' get dnsforwarder.@config[0].block_ip 2>/dev/null)
-	local ip_substituting=$(uci -d ',' get dnsforwarder.@config[0].ip_substituting 2>/dev/null)
-	local block_negative_resp=$(uci get dnsforwarder.@config[0].block_negative_resp 2>/dev/null)
-	local append_host=$(uci get dnsforwarder.@config[0].append_host 2>/dev/null)
-	local block_ipv6=$(uci get dnsforwarder.@config[0].block_ipv6 2>/dev/null)
-
-	local cache=$(uci get dnsforwarder.@config[0].cache 2>/dev/null)
-	local cache_size=$(uci get dnsforwarder.@config[0].cache_size 2>/dev/null)
-	local cache_ignore=$(uci get dnsforwarder.@config[0].cache_ignore 2>/dev/null)
-	local cache_control=$(uci get dnsforwarder.@config[0].cache_control 2>/dev/null)
-
-	local domain_statistic=$(uci get dnsforwarder.@config[0].domain_statistic 2>/dev/null)
-	local udp_local_addr=$(uci get dnsforwarder.@arguments[0].addr 2>/dev/null)
-	udp_local_addr=${udp_local_addr/:/#}
-
-    echo "LogOn ${log}" > $DNSFORWARDER_CONF
-    if [ $log = "true" ]; then
-		rm /var/log/dnsforwarder.log.* 2>/dev/null
-		echo '' > /var/log/dnsforwarder.log
-        echo "LogFileThresholdLength ${log_size}" >> $DNSFORWARDER_CONF
-        echo "LogFileFolder /var/log" >> $DNSFORWARDER_CONF
-    fi
-
-    [ -n "$udp_local" ] && echo "UDPLocal ${udp_local}" >> $DNSFORWARDER_CONF
-	[ -n "$udp_local_addr" ] && eval "makelist 'server=' $udp_local_addr" > /tmp/dnsmasq.dnsforwarder.conf
-	sed -i "s/ //g" /tmp/dnsmasq.dnsforwarder.conf
-
-    eval "makelist 'TCPGroup' $tcp_group" >> $DNSFORWARDER_CONF
-    eval "makelist 'UDPGroup' $udp_group" >> $DNSFORWARDER_CONF
-    eval "makelist 'GroupFile' $group_file" >> $DNSFORWARDER_CONF
-
-	if [ $gfw = "true" ]; then
-        echo 'GroupFile /etc/dnsforwarder/gfw.txt' >> $DNSFORWARDER_CONF
-    fi
-
-    echo "BlockIP  ${block_ip}" >> $DNSFORWARDER_CONF
-    eval "makelist 'IPSubstituting' $ip_substituting" >> $DNSFORWARDER_CONF
-    echo "BlockNegativeResponse ${block_negative_resp}" >> $DNSFORWARDER_CONF
-    eval "makelist 'AppendHosts' $append_host" >> $DNSFORWARDER_CONF
-    echo "BlockIpv6WhenIpv4Exists ${block_ipv6}" >> $DNSFORWARDER_CONF
-
-    echo "UseCache ${cache}" >> $DNSFORWARDER_CONF
-    if [ $cache = "true" ]; then
-        echo "CacheSize ${cache_size}" >> $DNSFORWARDER_CONF
-        echo "MemoryCache false" >> $DNSFORWARDER_CONF
-        echo "CacheFile /tmp/dnsforwarder.cache" >> $DNSFORWARDER_CONF
-        echo "IgnoreTTL ${cache_ignore}" >> $DNSFORWARDER_CONF
-        eval "makelist 'CacheControl' $cache_control" >> $DNSFORWARDER_CONF
-        echo "ReloadCache true" >> $DNSFORWARDER_CONF
-        echo "OverwriteCache true" >> $DNSFORWARDER_CONF
-    fi
-	echo "DomainStatistic ${domain_statistic}" >> $DNSFORWARDER_CONF
-	if [ $domain_statistic = "true" ]; then
-		touch /tmp/dnsforwarder-statistic.html
-		mkdir -p /root/.dnsforwarder
-		rm /root/.dnsforwarder/statistic.html 2 > /dev/null
-		ln -s /tmp/dnsforwarder-statistic.html /root/.dnsforwarder/statistic.html
-		local domain_statistic_tag='<!-- TS DNSFORWARDER -->'
-		echo "DomainStatisticTempletFile /tmp/dnsforwarder-statistic.html" >> $DNSFORWARDER_CONF
-		echo "StatisticInsertionPosition ${domain_statistic_tag}" >> $DNSFORWARDER_CONF
-		echo "StatisticUpdateInterval 60" >> $DNSFORWARDER_CONF
-		echo "${domain_statistic_tag}"  > /tmp/dnsforwarder-statistic.html
-    fi
-}
-
-start()
-{
-    echo luci for dnsforwarder
-    local vt_enabled=$(uci get dnsforwarder.@arguments[0].enabled 2>/dev/null)
-    if [ $vt_enabled = 0 ]; then
-        echo dnsforwarder is not enabled
-        exit
-    fi
-    makeconfig
-	fixturboacc
-    dnsforwarder -f $DNSFORWARDER_CONF -d
-	sleep 10
-    mkdir -p ${PID_PATH}
-    pid=$(ps | awk '$5 ~ /\[dnsforwarder\]/ {print $1}')
-    echo "dnsforwarder running pid is ${pid}"
-    logger -t The pid of dnsforwarder is ${PID_FILE} ${pid}
-    echo ${pid} > ${PID_FILE}
-    /etc/init.d/dnsforwarder enable
-    local dnsmasq=$(uci get dnsforwarder.@arguments[0].dnsmasq 2>/dev/null)
-    local addr=$(uci get dnsforwarder.@arguments[0].addr 2>/dev/null)
-    [ -n "${addr}" ] && addr=${addr/:/#}
-
-	if [ "${dnsmasq}" = "1" ]; then
-        uci delete dhcp.@dnsmasq[0].server 2>/dev/null
-        # uci add_list dhcp.@dnsmasq[0].server=$addr
-        uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
-        uci set dhcp.@dnsmasq[0].noresolv=1
-		uci set dhcp.@dnsmasq[0].serversfile=/tmp/dnsmasq.dnsforwarder.conf
-        uci commit dhcp
-        /etc/init.d/dnsmasq restart
-    fi
-    	local dnsmasq_server_addr=$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)
-	if [ -n "${dnsmasq_server_addr}" ]; then
-		uci set dhcp.@dnsmasq[0].noresolv=1
-		uci commit dhcp 
-		/etc/init.d/dnsmasq restart
-	fi
-	add_cron
-}
-
-stop()
-{
-	del_cron
-	logger -t stopping dnsforwarder
-    local addr=$(uci get dnsforwarder.@arguments[0].addr 2>/dev/null)
-    local dnsmasq=$(uci get dnsforwarder.@arguments[0].dnsmasq 2>/dev/null)
-    addr=${addr/:/#}
-    if [ "${dnsmasq}" = "1" ]; then
-	    uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
-    fi
-    uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto 2>/dev/null
-    uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
-	uci delete dhcp.@dnsmasq[0].serversfile 2>/dev/null
-    uci commit dhcp
-    /etc/init.d/dnsmasq restart
-    [ -e ${PID_FILE} ] && {
-        pid=$(cat ${PID_FILE})
-        logger -t killing dnsforwarder pid ${pid}
-        echo killing dnsforwarder pid ${pid}
-        kill ${pid}
-        rm -f ${PID_FILE}
-    } || {
-        logger -t Cannot find dnsforwarder pid file
-    }
-}
-
-restart()
-{
-    pid=$(cat ${PID_FILE} 2>/dev/null)
-    echo Dnsforwarder pid file is ${pid}
-    [ -n "$pid" ] && {
-        echo stopping pid ${pid}
-        logger -t There is dnsforwarder pid ${pid}
-        stop
-    } || {
-        logger -t Dnsforwarder is not running
-    }
-    sleep 7
-    local vt_enabled=$(uci get dnsforwarder.@arguments[0].enabled 2>/dev/null)
-    echo dnsforwarder status is ${vt_enabled}
-    logger -t Dnsforwarder is initializing enabled is ${vt_enabled}
-    if [ ${vt_enabled} = 1 ]; then
-        [ -n "$pid" ] && {
-            logger -t There is dnsforwarder pid ${pid}
-            stop
-        } || {
-            logger -t Dnsforwarder is not running
-        }
-
-        logger -t Restarting dnsforwarder
-        start
-    else
-        /etc/init.d/dnsforwarder disable
-    fi
-}
--- a/dnsforwarder/files/usr/share/dnsforwarder/gfwlist.sh
+++ b/dnsforwarder/files/usr/share/dnsforwarder/gfwlist.sh
@ -1,313 +0,0 @@
-#/bin/sh
-
-# Name:        gfwlist2dnsmasq.sh
-# Desription:  A shell script which convert gfwlist into dnsmasq rules.
-# Version:     0.8.0 (2017.12.25)
-# Author:      Cokebar Chi
-# Website:     https://github.com/cokebar
-
-_green() {
-    printf '\033[1;31;32m'
-    printf -- "%b" "$1"
-    printf '\033[0m'
-}
-
-_red() {
-    printf '\033[1;31;31m'
-    printf -- "%b" "$1"
-    printf '\033[0m'
-}
-
-_yellow() {
-    printf '\033[1;31;33m'
-    printf -- "%b" "$1"
-    printf '\033[0m'
-}
-
-usage() {
-    cat <<-EOF
-
-Name:        gfwlist2dnsmasq.sh
-Desription:  A shell script which convert gfwlist into dnsmasq rules.
-Version:     0.8.0 (2017.12.25)
-Author:      Cokebar Chi
-Website:     https://github.com/cokebar
-
-Usage: sh gfwlist2dnsmasq.sh [options] -o FILE
-Valid options are:
-    -d, --dns <dns_ip>
-                DNS IP address for the GfwList Domains (Default: 127.0.0.1)
-    -p, --port <dns_port>
-                DNS Port for the GfwList Domains (Default: 5353)
-    -s, --ipset <ipset_name>
-                Ipset name for the GfwList domains
-                (If not given, ipset rules will not be generated.)
-    -o, --output <FILE>
-                /path/to/output_filename
-    -i, --insecure
-                Force bypass certificate validation (insecure)
-    -l, --domain-list
-                Convert Gfwlist into domain list instead of dnsmasq rules
-                (If this option is set, DNS IP/Port & ipset are not needed)
-        --exclude-domain-file <FILE>
-                Delete specific domains in the result from a domain list text file
-                Please put one domain per line
-        --extra-domain-file <FILE>
-                Include extra domains to the result from a domain list text file
-                This file will be processed after the exclude-domain-file
-                Please put one domain per line
-    -h, --help
-                Usage
-EOF
-    exit $1
-}
-
-clean_and_exit(){
-    # Clean up temp files
-    printf 'Cleaning up... '
-    rm -rf $TMP_DIR
-    _green 'Done\n\n'
-    [ $1 -eq 0 ] && _green 'Job Finished.\n\n' || _red 'Exit with Error code '$1'.\n'
-    exit $1
-}
-
-check_depends(){
-    which sed base64 curl >/dev/null
-    if [ $? != 0 ]; then
-        _red 'Error: Missing Dependency.\nPlease check whether you have the following binaries on you system:\nwhich, sed, base64, curl.\n'
-        exit 3
-    fi
-
-    SYS_KERNEL=`uname -s`
-    if [ $SYS_KERNEL = "Darwin"  -o $SYS_KERNEL = "FreeBSD" ]; then
-        BASE64_DECODE='base64 -D'
-        SED_ERES='sed -E'
-    else
-        BASE64_DECODE='base64 -d'
-        SED_ERES='sed -r'
-    fi
-}
-
-get_args(){
-    OUT_TYPE='DNSMASQ_RULES'
-    DNS_IP='127.0.0.1'
-    DNS_PORT='5353'
-    IPSET_NAME=''
-    FILE_FULLPATH=''
-    CURL_EXTARG=''
-    WITH_IPSET=0
-    EXTRA_DOMAIN_FILE=''
-    EXCLUDE_DOMAIN_FILE=''
-    IPV4_PATTERN='^((2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)\.){3}(2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)$'
-    IPV6_PATTERN='^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}))|:)))(%.+)?$'
-
-    while [ ${#} -gt 0 ]; do
-        case "${1}" in
-            --help | -h)
-                usage 0
-                ;;
-            --domain-list | -l)
-                OUT_TYPE='DOMAIN_LIST'
-                ;;
-            --insecure | -i)
-                CURL_EXTARG='--insecure'
-                ;;
-            --dns | -d)
-                DNS_IP="$2"
-                shift
-                ;;
-            --port | -p)
-                DNS_PORT="$2"
-                shift
-                ;;
-            --ipset | -s)
-                IPSET_NAME="$2"
-                shift
-                ;;
-            --output | -o)
-                OUT_FILE="$2"
-                shift
-                ;;
-            --extra-domain-file)
-                EXTRA_DOMAIN_FILE="$2"
-                shift
-                ;;
-            --exclude-domain-file)
-                EXCLUDE_DOMAIN_FILE="$2"
-                shift
-                ;;
-            *)
-                _red "Invalid argument: $1"
-                usage 1
-                ;;
-        esac
-        shift 1
-    done
-
-    # Check path & file name
-    if [ -z $OUT_FILE ]; then
-        _red 'Error: Please specify the path to the output file(using -o/--output argument).\n'
-        exit 1
-    else
-        if [ -z ${OUT_FILE##*/} ]; then
-            _red 'Error: '$OUT_FILE' is a path, not a file.\n'
-            exit 1
-        else
-            if [ ${OUT_FILE}a != ${OUT_FILE%/*}a ] && [ ! -d ${OUT_FILE%/*} ]; then
-                _red 'Error: Folder do not exist: '${OUT_FILE%/*}'\n'
-                exit 1
-            fi
-        fi
-    fi
-
-    if [ $OUT_TYPE = 'DNSMASQ_RULES' ]; then
-        # Check DNS IP
-        IPV4_TEST=$(echo $DNS_IP | grep -E $IPV4_PATTERN)
-        IPV6_TEST=$(echo $DNS_IP | grep -E $IPV6_PATTERN)
-        if [ "$IPV4_TEST" != "$DNS_IP" -a "$IPV6_TEST" != "$DNS_IP" ]; then
-            _red 'Error: Please enter a valid DNS server IP address.\n'
-            exit 1
-        fi
-
-        # Check DNS port
-        if [ $DNS_PORT -lt 1 -o $DNS_PORT -gt 65535 ]; then
-            _red 'Error: Please enter a valid DNS server port.\n'
-            exit 1
-        fi
-
-        # Check ipset name
-        if [ -z $IPSET_NAME ]; then
-            WITH_IPSET=0
-        else
-            IPSET_TEST=$(echo $IPSET_NAME | grep -E '^\w+$')
-            if [ "$IPSET_TEST" != "$IPSET_NAME" ]; then
-                _red 'Error: Please enter a valid IP set name.\n'
-                exit 1
-            else
-                WITH_IPSET=1
-            fi
-        fi
-    fi
-
-    if [ ! -z $EXTRA_DOMAIN_FILE ] && [ ! -f $EXTRA_DOMAIN_FILE ]; then
-        _yellow 'WARNING:\nExtra domain file does not exist, ignored.\n\n'
-        EXTRA_DOMAIN_FILE=''
-    fi
-
-    if [ ! -z $EXCLUDE_DOMAIN_FILE ] && [ ! -f $EXCLUDE_DOMAIN_FILE ]; then
-        _yellow 'WARNING:\nExclude domain file does not exist, ignored.\n\n'
-        EXCLUDE_DOMAIN_FILE=''
-    fi
-}
-
-
-
-process(){
-    # Set Global Var
-    BASE_URL='https://github.com/gfwlist/gfwlist/raw/master/gfwlist.txt'
-    TMP_DIR=`mktemp -d /tmp/gfwlist2dnsmasq.XXXXXX`
-    BASE64_FILE="$TMP_DIR/base64.txt"
-    GFWLIST_FILE="$TMP_DIR/gfwlist.txt"
-    DOMAIN_TEMP_FILE="$TMP_DIR/gfwlist2domain.tmp"
-    DOMAIN_FILE="$TMP_DIR/gfwlist2domain.txt"
-    CONF_TMP_FILE="$TMP_DIR/gfwlist.conf.tmp"
-    OUT_TMP_FILE="$TMP_DIR/gfwlist.out.tmp"
-
-    # Fetch GfwList and decode it into plain text
-    printf 'Fetching GfwList... '
-    local tscurl='curl -L --connect-timeout 5 -m 300 --retry 3 --retry-delay 1'
-    $tscurl $CURL_EXTARG -o$BASE64_FILE $BASE_URL \
-    || $tscurl $CURL_EXTARG -o$BASE64_FILE https://gitlab.com/gfwlist/gfwlist/raw/master/gfwlist.txt \
-    || $tscurl $CURL_EXTARG -o$BASE64_FILE https://git.tuxfamily.org/gfwlist/gfwlist.git/plain/gfwlist.txt \
-    || $tscurl $CURL_EXTARG -o$BASE64_FILE https://pagure.io/gfwlist/raw/master/f/gfwlist.txt \
-    || $tscurl $CURL_EXTARG -o$BASE64_FILE http://repo.or.cz/gfwlist.git/blob_plain/HEAD:/gfwlist.txt \
-    || $tscurl $CURL_EXTARG -o$BASE64_FILE https://bitbucket.org/gfwlist/gfwlist/raw/HEAD/gfwlist.txt \
-    || $tscurl $CURL_EXTARG -o$BASE64_FILE $BASE_URL
-    if [ $? != 0 ]; then
-        _red '\nFailed to fetch gfwlist.txt. Please check your Internet connection.\n'
-        clean_and_exit 2
-    fi
-    $BASE64_DECODE $BASE64_FILE > $GFWLIST_FILE || ( _red 'Failed to decode gfwlist.txt. Quit.\n'; clean_and_exit 2 )
-    _green 'Done.\n\n'
-
-    # Convert
-    IGNORE_PATTERN='^\!|\[|^@@|(https?://){0,1}[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+'
-    HEAD_FILTER_PATTERN='s#^(\|\|?)?(https?://)?##g'
-    TAIL_FILTER_PATTERN='s#/.*$|%2F.*$##g'
-    DOMAIN_PATTERN='([a-zA-Z0-9][-a-zA-Z0-9]*(\.[a-zA-Z0-9][-a-zA-Z0-9]*)+)'
-    HANDLE_WILDCARD_PATTERN='s#^(([a-zA-Z0-9]*\*[-a-zA-Z0-9]*)?(\.))?([a-zA-Z0-9][-a-zA-Z0-9]*(\.[a-zA-Z0-9][-a-zA-Z0-9]*)+)(\*)?#\4#g'
-
-    printf 'Converting GfwList to ' && _green $OUT_TYPE && printf ' ...\n' 
-    _yellow '\nWARNING:\nThe following lines in GfwList contain regex, and might be ignored:\n\n'
-    cat $GFWLIST_FILE | grep -n '^/.*$'
-    _yellow "\nThis script will try to convert some of the regex rules. But you should know this may not be a equivalent conversion.\nIf there's regex rules which this script do not deal with, you should add the domain manually to the list.\n\n"
-    grep -vE $IGNORE_PATTERN $GFWLIST_FILE | $SED_ERES $HEAD_FILTER_PATTERN | $SED_ERES $TAIL_FILTER_PATTERN | grep -E $DOMAIN_PATTERN | $SED_ERES $HANDLE_WILDCARD_PATTERN > $DOMAIN_TEMP_FILE
-
-    printf 'google.com\ngoogle.ad\ngoogle.ae\ngoogle.com.af\ngoogle.com.ag\ngoogle.com.ai\ngoogle.al\ngoogle.am\ngoogle.co.ao\ngoogle.com.ar\ngoogle.as\ngoogle.at\ngoogle.com.au\ngoogle.az\ngoogle.ba\ngoogle.com.bd\ngoogle.be\ngoogle.bf\ngoogle.bg\ngoogle.com.bh\ngoogle.bi\ngoogle.bj\ngoogle.com.bn\ngoogle.com.bo\ngoogle.com.br\ngoogle.bs\ngoogle.bt\ngoogle.co.bw\ngoogle.by\ngoogle.com.bz\ngoogle.ca\ngoogle.cd\ngoogle.cf\ngoogle.cg\ngoogle.ch\ngoogle.ci\ngoogle.co.ck\ngoogle.cl\ngoogle.cm\ngoogle.cn\ngoogle.com.co\ngoogle.co.cr\ngoogle.com.cu\ngoogle.cv\ngoogle.com.cy\ngoogle.cz\ngoogle.de\ngoogle.dj\ngoogle.dk\ngoogle.dm\ngoogle.com.do\ngoogle.dz\ngoogle.com.ec\ngoogle.ee\ngoogle.com.eg\ngoogle.es\ngoogle.com.et\ngoogle.fi\ngoogle.com.fj\ngoogle.fm\ngoogle.fr\ngoogle.ga\ngoogle.ge\ngoogle.gg\ngoogle.com.gh\ngoogle.com.gi\ngoogle.gl\ngoogle.gm\ngoogle.gp\ngoogle.gr\ngoogle.com.gt\ngoogle.gy\ngoogle.com.hk\ngoogle.hn\ngoogle.hr\ngoogle.ht\ngoogle.hu\ngoogle.co.id\ngoogle.ie\ngoogle.co.il\ngoogle.im\ngoogle.co.in\ngoogle.iq\ngoogle.is\ngoogle.it\ngoogle.je\ngoogle.com.jm\ngoogle.jo\ngoogle.co.jp\ngoogle.co.ke\ngoogle.com.kh\ngoogle.ki\ngoogle.kg\ngoogle.co.kr\ngoogle.com.kw\ngoogle.kz\ngoogle.la\ngoogle.com.lb\ngoogle.li\ngoogle.lk\ngoogle.co.ls\ngoogle.lt\ngoogle.lu\ngoogle.lv\ngoogle.com.ly\ngoogle.co.ma\ngoogle.md\ngoogle.me\ngoogle.mg\ngoogle.mk\ngoogle.ml\ngoogle.com.mm\ngoogle.mn\ngoogle.ms\ngoogle.com.mt\ngoogle.mu\ngoogle.mv\ngoogle.mw\ngoogle.com.mx\ngoogle.com.my\ngoogle.co.mz\ngoogle.com.na\ngoogle.com.nf\ngoogle.com.ng\ngoogle.com.ni\ngoogle.ne\ngoogle.nl\ngoogle.no\ngoogle.com.np\ngoogle.nr\ngoogle.nu\ngoogle.co.nz\ngoogle.com.om\ngoogle.com.pa\ngoogle.com.pe\ngoogle.com.pg\ngoogle.com.ph\ngoogle.com.pk\ngoogle.pl\ngoogle.pn\ngoogle.com.pr\ngoogle.ps\ngoogle.pt\ngoogle.com.py\ngoogle.com.qa\ngoogle.ro\ngoogle.ru\ngoogle.rw\ngoogle.com.sa\ngoogle.com.sb\ngoogle.sc\ngoogle.se\ngoogle.com.sg\ngoogle.sh\ngoogle.si\ngoogle.sk\ngoogle.com.sl\ngoogle.sn\ngoogle.so\ngoogle.sm\ngoogle.sr\ngoogle.st\ngoogle.com.sv\ngoogle.td\ngoogle.tg\ngoogle.co.th\ngoogle.com.tj\ngoogle.tk\ngoogle.tl\ngoogle.tm\ngoogle.tn\ngoogle.to\ngoogle.com.tr\ngoogle.tt\ngoogle.com.tw\ngoogle.co.tz\ngoogle.com.ua\ngoogle.co.ug\ngoogle.co.uk\ngoogle.com.uy\ngoogle.co.uz\ngoogle.com.vc\ngoogle.co.ve\ngoogle.vg\ngoogle.co.vi\ngoogle.com.vn\ngoogle.vu\ngoogle.ws\ngoogle.rs\ngoogle.co.za\ngoogle.co.zm\ngoogle.co.zw\ngoogle.cat\n' >> $DOMAIN_TEMP_FILE
-    printf 'Google search domains... ' && _green 'Added\n'
-
-    # Add blogspot domains
-    printf 'blogspot.ca\nblogspot.co.uk\nblogspot.com\nblogspot.com.ar\nblogspot.com.au\nblogspot.com.br\nblogspot.com.by\nblogspot.com.co\nblogspot.com.cy\nblogspot.com.ee\nblogspot.com.eg\nblogspot.com.es\nblogspot.com.mt\nblogspot.com.ng\nblogspot.com.tr\nblogspot.com.uy\nblogspot.de\nblogspot.gr\nblogspot.in\nblogspot.mx\nblogspot.ch\nblogspot.fr\nblogspot.ie\nblogspot.it\nblogspot.pt\nblogspot.ro\nblogspot.sg\nblogspot.be\nblogspot.no\nblogspot.se\nblogspot.jp\nblogspot.in\nblogspot.ae\nblogspot.al\nblogspot.am\nblogspot.ba\nblogspot.bg\nblogspot.ch\nblogspot.cl\nblogspot.cz\nblogspot.dk\nblogspot.fi\nblogspot.gr\nblogspot.hk\nblogspot.hr\nblogspot.hu\nblogspot.ie\nblogspot.is\nblogspot.kr\nblogspot.li\nblogspot.lt\nblogspot.lu\nblogspot.md\nblogspot.mk\nblogspot.my\nblogspot.nl\nblogspot.no\nblogspot.pe\nblogspot.qa\nblogspot.ro\nblogspot.ru\nblogspot.se\nblogspot.sg\nblogspot.si\nblogspot.sk\nblogspot.sn\nblogspot.tw\nblogspot.ug\nblogspot.cat\n' >> $DOMAIN_TEMP_FILE
-    printf 'Blogspot domains... ' && _green 'Added\n'
-
-    # Add twimg.edgesuite.net
-    printf 'twimg.edgesuite.net\n' >> $DOMAIN_TEMP_FILE
-    printf 'twimg.edgesuite.net... ' && _green 'Added\n'
-
-    # Delete exclude domains
-    if [ ! -z $EXCLUDE_DOMAIN_FILE ]; then
-        for line in $(cat $EXCLUDE_DOMAIN_FILE)
-        do
-            cat $DOMAIN_TEMP_FILE | grep -vF -f $EXCLUDE_DOMAIN_FILE > $DOMAIN_FILE
-        done
-        printf 'Domains in exclude domain file '$EXCLUDE_DOMAIN_FILE'... ' && _green 'Deleted\n'
-    else
-        cat $DOMAIN_TEMP_FILE > $DOMAIN_FILE
-    fi
-
-    # Add extra domains
-    if [ ! -z $EXTRA_DOMAIN_FILE ]; then
-        cat $EXTRA_DOMAIN_FILE >> $DOMAIN_FILE
-        printf 'Extra domain file '$EXTRA_DOMAIN_FILE'... ' && _green 'Added\n'
-    fi
-
-    if [ $OUT_TYPE = 'DNSMASQ_RULES' ]; then
-    # Convert domains into dnsmasq rules
-        if [ $WITH_IPSET -eq 1 ]; then
-            _green 'Ipset rules included.'
-            sort -u $DOMAIN_FILE | $SED_ERES 's#(.+)#server=/\1/'$DNS_IP'\#'$DNS_PORT'\
-            ipset=/\1/'$IPSET_NAME'#g' > $CONF_TMP_FILE
-        else
-            _green 'Ipset rules not included.'
-            sort -u $DOMAIN_FILE | $SED_ERES 's#(.+)#server=/\1/'$DNS_IP'\#'$DNS_PORT'#g' > $CONF_TMP_FILE
-        fi
-
-        # Generate output file
-        echo '# dnsmasq rules generated by gfwlist' > $OUT_TMP_FILE
-        echo "# Last Updated on $(date "+%Y-%m-%d %H:%M:%S")" >> $OUT_TMP_FILE
-        echo '# ' >> $OUT_TMP_FILE
-        cat $CONF_TMP_FILE >> $OUT_TMP_FILE
-        cp $OUT_TMP_FILE $OUT_FILE
-    else
-        sort -u $DOMAIN_FILE > $OUT_TMP_FILE
-    fi
-
-    cp $OUT_TMP_FILE $OUT_FILE
-    printf '\nConverting GfwList to '$OUT_TYPE'... ' && _green 'Done\n\n'
-
-    # Clean up
-    clean_and_exit 0
-}
-
-main() {
-    if [ -z "$1" ]; then
-        usage 0
-    else
-        check_depends
-        get_args "$@"
-        _green '\nJob Started.\n\n'
-        process
-    fi
-}
-
-main "$@"
--- a/dnsproxy/Makefile
+++ b/dnsproxy/Makefile
@ -1,59 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only
-#
-# Copyright (C) 2021 ImmortalWrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dnsproxy
-PKG_VERSION:=0.42.2
-PKG_RELEASE:=$(AUTORELEASE)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=399a7a1f7d1afef85d8557bbe445541872bfe005e15c36e242f69b78fa94f1ca
-
-PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=golang/host
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-GO_PKG:=github.com/AdguardTeam/dnsproxy
-GO_PKG_LDFLAGS_X:=main.VersionString=v$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/openmptcprouter/golang/golang-package.mk
-
-define Package/dnsproxy
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE:=Simple DNS proxy with DoH, DoT, DoQ and DNSCrypt support
-  URL:=https://github.com/AdguardTeam/dnsproxy
-  DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle
-  USERID:=dnsproxy=411:dnsproxy=411
-endef
-
-define Package/dnsproxy/description
-  A simple DNS proxy server that supports all existing DNS protocols including
-  DNS-over-TLS, DNS-over-HTTPS, DNSCrypt, and DNS-over-QUIC.Moreover, it can
-  work as a DNS-over-HTTPS, DNS-over-TLS or DNS-over-QUIC server.
-endef
-
-define Package/dnsproxy/install
-	$(call GoPackage/Package/Install/Bin,$(1))
-
-	$(INSTALL_DIR) $(1)/etc/config/
-	$(INSTALL_CONF) $(CURDIR)/files/dnsproxy.config $(1)/etc/config/dnsproxy
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) $(CURDIR)/files/dnsproxy.init $(1)/etc/init.d/dnsproxy
-endef
-
-define Package/dnsproxy/conffiles
-/etc/config/dnsproxy
-endef
-
-$(eval $(call GoBinPackage,dnsproxy))
-$(eval $(call BuildPackage,dnsproxy))
--- a/dnsproxy/files/dnsproxy.config
+++ b/dnsproxy/files/dnsproxy.config
@ -1,41 +0,0 @@
-
-# For documents, please see https://github.com/AdguardTeam/dnsproxy#usage
-
-config dnsproxy 'global'
-	option enabled '0'
-	option listen_addr '127.0.0.1'
-	option listen_port '5353'
-	option log_file ''
-	option all_servers '0'
-	option fastest_addr '0'
-	option insecure '0'
-	option ipv6_disabled '0'
-	option max_go_routines ''
-	option rate_limit ''
-	option refuse_any '0'
-	option udp_buf_size ''
-	option verbose '0'
-
-config dnsproxy 'bogus_nxdomain'
-	list ip_addr ''
-
-config dnsproxy 'cache'
-	option enabled '0'
-	option cache_optimistic '0'
-	option size '65535'
-	option min_ttl ''
-	option max_ttl ''
-
-config dnsproxy 'dns64'
-	option enabled '0'
-	option dns64_prefix '64:ff9b::'
-
-config dnsproxy 'edns'
-	option enabled '0'
-	option edns_addr ''
-
-config dnsproxy 'servers'
-	list bootstrap 'tls://8.8.8.8'
-	list fallback 'tls://9.9.9.9'
-	list upstream 'tls://1.1.1.1'
-
--- a/dnsproxy/files/dnsproxy.init
+++ b/dnsproxy/files/dnsproxy.init
@ -1,115 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2021 Tianling Shen <cnsztl@immortalwrt.org>
-
-USE_PROCD=1
-START=90
-
-CONF="dnsproxy"
-PROG="/usr/bin/dnsproxy"
-
-is_enabled() {
-	local enabled
-	config_get enabled "$1" "$2" "0"
-	if [ "$enabled" -eq "1" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-is_empty() {
-	local empty
-	config_get empty "$1" "$2" $3
-	if [ -z "$empty" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-append_param() {
-	procd_append_param command "$1" $2
-}
-
-append_param_arg() {
-	local value
-	config_get value "$1" "$2" $4
-	[ -n "$value" ] && append_param "$3" "$value"
-}
-
-append_param_bool() {
-	is_enabled "$1" "$2" && append_param "--${2//_/-}"
-}
-
-load_config_arg() {
-	append_param_bool "$1" "all_servers"
-	append_param_bool "$1" "fastest_addr"
-	append_param_bool "$1" "insecure"
-	append_param_bool "$1" "ipv6_disabled"
-	append_param_bool "$1" "refuse_any"
-	append_param_bool "$1" "verbose"
-}
-
-load_config_list() {
-	is_empty "bogus_nxdomain" "ip_addr" || config_list_foreach "bogus_nxdomain" "ip_addr" "append_param '--bogus-nxdomain'"
-
-	for i in "bootstrap" "fallback" "upstream"; do
-		is_empty "servers" "$i" || config_list_foreach "servers" "$i" "append_param '--$i'"
-	done
-}
-
-load_config_param() {
-	append_param_arg "global" "listen_addr" "--listen" "127.0.0.1"
-	append_param_arg "global" "listen_port" "--port" "5353"
-	append_param_arg "global" "log_file" "--output"
-	append_param_arg "global" "max_go_routines" "--max-go-routines"
-	append_param_arg "global" "rate_limit" "--ratelimit"
-	append_param_arg "global" "udp_buf_size" "--udp-buf-size"
-
-	is_enabled "cache" "enabled" && {
-		append_param "--cache"
-		append_param_bool "cache" "cache_optimistic"
-		append_param_arg "cache" "size" "--cache-size"
-		append_param_arg "cache" "min_ttl" "--cache-min-ttl"
-		append_param_arg "cache" "max_ttl" "--cache-max-ttl"
-	}
-
-	is_enabled "dns64" "enabled" && {
-		append_param "--dns64"
-		append_param_arg "dns64" "dns64_prefix" "--dns64-prefix"
-	}
-
-	is_enabled "edns" "enabled" && {
-		append_param "--edns"
-		append_param_arg "edns" "edns_addr" "--edns-addr"
-	}
-}
-
-start_service() {
-	config_load "$CONF"
-
-	is_enabled "global" "enabled" || exit 1
-
-	procd_open_instance "$CONF"
-	procd_set_param command "$PROG"
-
-	load_config_arg "global"
-	load_config_list
-	load_config_param
-
-	procd_set_param respawn
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-	procd_set_param user dnsproxy
-
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-	procd_add_reload_trigger "$CONF"
-}
--- a/dnsproxy/test.sh
+++ b/dnsproxy/test.sh
@ -1,3 +0,0 @@
-#!/bin/sh
-
-dnsproxy --version | grep "$PKG_VERSION"
--- a/dsvpn/Makefile
+++ b/dsvpn/Makefile
--- a/dsvpn/patches/nofirewall.patch
+++ b/dsvpn/patches/nofirewall.patch
--- a/dsvpn/patches/nostrip.patch
+++ b/dsvpn/patches/nostrip.patch
--- a/glorytun-udp/Makefile
+++ b/glorytun-udp/Makefile
--- a/glorytun-udp/patches/aegis-arm.patch
+++ b/glorytun-udp/patches/aegis-arm.patch
--- a/glorytun/Makefile
+++ b/glorytun/Makefile
--- a/glorytun/glorytun.config
+++ b/glorytun/glorytun.config
--- a/golang-protobuf/Makefile
+++ b/golang-protobuf/Makefile
--- a/golang/golang-build.sh
+++ b/golang/golang-build.sh
--- a/golang/golang-compiler.mk
+++ b/golang/golang-compiler.mk
--- a/golang/golang-golang-x-crypto/Makefile
+++ b/golang/golang-golang-x-crypto/Makefile
--- a/golang/golang-golang-x-net/Makefile
+++ b/golang/golang-golang-x-net/Makefile
--- a/golang/golang-golang-x-sys/Makefile
+++ b/golang/golang-golang-x-sys/Makefile
--- a/golang/golang-golang-x-text/Makefile
+++ b/golang/golang-golang-x-text/Makefile
--- a/golang/golang-host-build.mk
+++ b/golang/golang-host-build.mk
--- a/golang/golang-package.mk
+++ b/golang/golang-package.mk
--- a/golang/golang-values.mk
+++ b/golang/golang-values.mk
--- a/golang/golang/Config.in
+++ b/golang/golang/Config.in
--- a/golang/golang/Makefile
+++ b/golang/golang/Makefile
--- a/golang/golang/files/go-gcc-helper
+++ b/golang/golang/files/go-gcc-helper
--- a/https-dns-proxy/Makefile
+++ b/https-dns-proxy/Makefile
--- a/https-dns-proxy/files/README.md
+++ b/https-dns-proxy/files/README.md
--- a/https-dns-proxy/files/https-dns-proxy.config
+++ b/https-dns-proxy/files/https-dns-proxy.config
--- a/https-dns-proxy/test.sh
+++ b/https-dns-proxy/test.sh
--- a/ipcalc/Makefile
+++ b/ipcalc/Makefile
--- a/iperf3/Makefile
+++ b/iperf3/Makefile
--- a/iperf3/patches/remove-in6_flowlabel_req.patch
+++ b/iperf3/patches/remove-in6_flowlabel_req.patch
--- a/lcd4linux/Config.in
+++ b/lcd4linux/Config.in
--- a/lcd4linux/Makefile
+++ b/lcd4linux/Makefile
--- a/lcd4linux/files/lcd4linux.init
+++ b/lcd4linux/files/lcd4linux.init
--- a/lcd4linux/patches/120-remove-as-needed-linker-option.patch
+++ b/lcd4linux/patches/120-remove-as-needed-linker-option.patch
--- a/lcd4linux/patches/140-no_repnop_T6963.patch
+++ b/lcd4linux/patches/140-no_repnop_T6963.patch
--- a/lcd4linux/patches/150-addlibmpdclient.patch
+++ b/lcd4linux/patches/150-addlibmpdclient.patch
--- a/lcd4linux/patches/160-uinput_defs.patch
+++ b/lcd4linux/patches/160-uinput_defs.patch
--- a/lcd4linux/patches/170-add-generic-spidev-driver.patch
+++ b/lcd4linux/patches/170-add-generic-spidev-driver.patch
--- a/lcd4linux/patches/173-glcd2usb-bigendian-fix.patch
+++ b/lcd4linux/patches/173-glcd2usb-bigendian-fix.patch
--- a/libell/Makefile
+++ b/libell/Makefile
--- a/luci-app-cpufreq/Makefile
+++ b/luci-app-cpufreq/Makefile
@ -1,19 +0,0 @@
-
-# Copyright (C) 2016 Openwrt.org
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-LUCI_TITLE:=LuCI for CPU Freq Setting
-LUCI_DEPENDS:=@(aarch64||arm)
-LUCI_PKGARCH:=all
-
-PKG_NAME:=luci-app-cpufreq
-PKG_VERSION:=1
-PKG_RELEASE:=7
-
-include $(TOPDIR)/feeds/luci/luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
--- a/luci-app-cpufreq/luasrc/controller/cpufreq.lua
+++ b/luci-app-cpufreq/luasrc/controller/cpufreq.lua
@ -1,9 +0,0 @@
-module("luci.controller.cpufreq", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/cpufreq") then
-		return
-	end
-
-	entry({"admin", "services", "cpufreq"}, cbi("cpufreq"), _("CPU Freq"), 900).dependent = true
-end
--- a/luci-app-cpufreq/luasrc/model/cbi/cpufreq.lua
+++ b/luci-app-cpufreq/luasrc/model/cbi/cpufreq.lua
@ -1,60 +0,0 @@
-local fs = require "nixio.fs"
-
-cpu_freqs = fs.readfile("/sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies") or "100000"
-cpu_freqs = string.sub(cpu_freqs, 1, -3)
-
-cpu_governors = fs.readfile("/sys/devices/system/cpu/cpufreq/policy0/scaling_available_governors") or "performance"
-cpu_governors = string.sub(cpu_governors, 1, -3)
-
-function string.split(input, delimiter)
-    input = tostring(input)
-    delimiter = tostring(delimiter)
-    if (delimiter=='') then return false end
-    local pos,arr = 0, {}
-    for st,sp in function() return string.find(input, delimiter, pos, true) end do
-        table.insert(arr, string.sub(input, pos, st - 1))
-        pos = sp + 1
-    end
-    table.insert(arr, string.sub(input, pos))
-    return arr
-end
-
-freq_array = string.split(cpu_freqs, " ")
-governor_array = string.split(cpu_governors, " ")
-
-mp = Map("cpufreq", translate("CPU Freq Settings"))
-mp.description = translate("Set CPU Scaling Governor to Max Performance or Balance Mode")
-
-s = mp:section(NamedSection, "cpufreq", "settings")
-s.anonymouse = true
-
-governor = s:option(ListValue, "governor", translate("CPU Scaling Governor"))
-for _, e in ipairs(governor_array) do
-	if e ~= "" then governor:value(e, translate(e,string.upper(e))) end
-end
-
-minfreq = s:option(ListValue, "minifreq", translate("Min Idle CPU Freq"))
-for _, e in ipairs(freq_array) do
-	if e ~= "" then minfreq:value(e) end
-end
-
-maxfreq = s:option(ListValue, "maxfreq", translate("Max Turbo Boost CPU Freq"))
-for _, e in ipairs(freq_array) do
-	if e ~= "" then maxfreq:value(e) end
-end
-
-upthreshold = s:option(Value, "upthreshold", translate("CPU Switching Threshold"))
-upthreshold.datatype="range(1,99)"
-upthreshold.rmempty = false
-upthreshold.description = translate("Kernel make a decision on whether it should increase the frequency (%)")
-upthreshold.placeholder = 50
-upthreshold.default = 50
-
-factor = s:option(Value, "factor", translate("CPU Switching Sampling rate"))
-factor.datatype="range(1,100000)"
-factor.rmempty = false
-factor.description = translate("The sampling rate determines how frequently the governor checks to tune the CPU (ms)")
-factor.placeholder = 10
-factor.default = 10
-
-return mp
--- a/luci-app-cpufreq/po/zh-cn/cpufreq.po
+++ b/luci-app-cpufreq/po/zh-cn/cpufreq.po
@ -1,57 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: dingpengyu <dingpengyu06@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"X-Generator: Poedit 2.3.1\n"
-
-msgid "CPU Freq"
-msgstr "CPU 性能优化调节"
-
-msgid "CPU Freq Settings"
-msgstr "CPU 性能优化调节设置"
-
-msgid "Set CPU Scaling Governor to Max Performance or Balance Mode"
-msgstr "设置路由器的 CPU 性能模式（高性能/均衡省电）"
-
-msgid "CPU Scaling Governor"
-msgstr "CPU 工作模式"
-
-msgid "Ondemand Balance Mode"
-msgstr "Ondemand 自动平衡模式"
-
-msgid "Performance Mode"
-msgstr "Performance 高性能模式（降低游戏转发延迟）"
-
-msgid "ondemand"
-msgstr "ondemand 自动平衡模式"
-
-msgid "performance"
-msgstr "performance 高性能模式（降低游戏转发延迟）"
-
-msgid "CPU Freq from 48000 to 716000 (Khz)"
-msgstr "CPU 频率范围为 48000 到 716000 (Khz)"
-
-msgid "Min Idle CPU Freq"
-msgstr "待机 CPU 最小频率"
-
-msgid "Max Turbo Boost CPU Freq"
-msgstr "最大 Turbo Boost CPU 频率"
-
-msgid "CPU Switching Threshold"
-msgstr "CPU 切换频率触发阈值"
-
-msgid "Kernel make a decision on whether it should increase the frequency (%)"
-msgstr "当 CPU 占用率超过 (%) 的情况下触发内核切换频率"
-
-msgid "CPU Switching Sampling rate"
-msgstr "CPU 切换周期"
-
-msgid "The sampling rate determines how frequently the governor checks to tune the CPU (ms)"
-msgstr "CPU 检查切换的周期 (ms) 。注意：过于频繁的切换频率会引起网络延迟抖动"
--- a/luci-app-cpufreq/root/etc/config/cpufreq
+++ b/luci-app-cpufreq/root/etc/config/cpufreq
@ -1,8 +0,0 @@
-
-config settings 'cpufreq'
-	option maxfreq '716000'
-	option upthreshold '50'
-	option factor '10'
-	option minifreq '300000'
-	option governor 'ondemand'
-
--- a/luci-app-cpufreq/root/etc/init.d/cpufreq
+++ b/luci-app-cpufreq/root/etc/init.d/cpufreq
@ -1,30 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=50
-
-NAME=cpufreq
-
-uci_get_by_type() {
-	local ret=$(uci get $NAME.@$1[0].$2 2>/dev/null)
-	echo ${ret:=$3}
-}
-
-start()
-{
-	local min=$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies | awk -F ' ' '{print $1 }')
-	local max=$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies | awk -F ' ' '{print $NF }')
-	
-	config_load cpufreq
-	local governor=$(uci_get_by_type settings governor schedutil)
-	local minifreq=$(uci_get_by_type settings minifreq $min)
-	local maxfreq=$(uci_get_by_type settings maxfreq $max)
-	local upthreshold=$(uci_get_by_type settings upthreshold 50)
-	local factor=$(uci_get_by_type settings factor 10)
-
-	echo $governor > /sys/devices/system/cpu/cpufreq/policy0/scaling_governor
-	echo $minifreq > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
-	echo $maxfreq > /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq
-	if [ "$governor" == "ondemand" ]; then
-		echo $upthreshold > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
-		echo $factor > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor
-	fi
-}
--- a/luci-app-cpufreq/root/etc/uci-defaults/luci-cpufreq
+++ b/luci-app-cpufreq/root/etc/uci-defaults/luci-cpufreq
@ -1,11 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@cpufreq[-1]
-	add ucitrack cpufreq
-	set ucitrack.@cpufreq[-1].init=cpufreq
-	commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/luci-app-diskman/Makefile
+++ b/luci-app-diskman/Makefile
@ -1,53 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-diskman
-PKG_VERSION:=v0.2.11
-PKG_RELEASE:=2
-
-PKG_MAINTAINER:=lisaac <lisaac.cn@gmail.com>
-PKG_LICENSE:=AGPL-3.0
-
-LUCI_TITLE:=Disk Manager interface for LuCI
-LUCI_DEPENDS:=+blkid +e2fsprogs +parted +smartmontools \
-	+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:mdadm \
-	+PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456:kmod-md-raid456 \
-	+PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linears:mdadm \
-	+PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linears:kmod-md-linear
-
-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
-	depends on PACKAGE_$(PKG_NAME)_INCLUDE_mdadm
-	bool "Include kmod-md-raid456"
-	default n
-
-config PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linear
-	depends on PACKAGE_$(PKG_NAME)_INCLUDE_mdadm
-	bool "Include kmod-md-linear"
-	default n
-endef
-
-define Package/$(PKG_NAME)/postinst
-#!/bin/sh
-rm -fr /tmp/luci-indexcache /tmp/luci-modulecache
-endef
-
-include $(TOPDIR)/feeds/luci/luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
--- a/luci-app-diskman/luasrc/controller/diskman.lua
+++ b/luci-app-diskman/luasrc/controller/diskman.lua
@ -1,155 +0,0 @@
--[[
-LuCI - Lua Configuration Interface
-Copyright 2019 lisaac <https://github.com/lisaac/luci-app-diskman>
-]]--
-
-require "luci.util"
-module("luci.controller.diskman",package.seeall)
-
-function index()
-  -- check all used executables in disk management are existed
-  local CMD = {"parted", "blkid", "smartctl"}
-  local executables_all_existed = true
-  for _, cmd in ipairs(CMD) do
-    local command = luci.sys.exec("/usr/bin/which " .. cmd)
-    if not command:match(cmd) then
-      executables_all_existed = false
-      break
-    end
-  end
-
-  if not executables_all_existed then return end
-  -- entry(path, target, title, order)
-  -- set leaf attr to true to pass argument throughe url (e.g. admin/system/disk/partition/sda)
-  entry({"admin", "system", "diskman"}, alias("admin", "system", "diskman", "disks"), _("Disk Man"), 55)
-  entry({"admin", "system", "diskman", "disks"}, form("diskman/disks"), nil).leaf = true
-  entry({"admin", "system", "diskman", "partition"}, form("diskman/partition"), nil).leaf = true
-  entry({"admin", "system", "diskman", "btrfs"}, form("diskman/btrfs"), nil).leaf = true
-  entry({"admin", "system", "diskman", "format_partition"}, call("format_partition"), nil).leaf = true
-  entry({"admin", "system", "diskman", "get_disk_info"}, call("get_disk_info"), nil).leaf = true
-  entry({"admin", "system", "diskman", "mk_p_table"}, call("mk_p_table"), nil).leaf = true
-  entry({"admin", "system", "diskman", "smartdetail"}, call("smart_detail"), nil).leaf = true
-  entry({"admin", "system", "diskman", "smartattr"}, call("smart_attr"), nil).leaf = true
-end
-
-function format_partition()
-  local partation_name = luci.http.formvalue("partation_name")
-  local fs = luci.http.formvalue("file_system")
-  if not partation_name then
-    luci.http.status(500, "Partition NOT found!")
-    luci.http.write_json("Partition NOT found!")
-    return
-  elseif not nixio.fs.access("/dev/"..partation_name) then
-    luci.http.status(500, "Partition NOT found!")
-    luci.http.write_json("Partition NOT found!")
-    return
-  elseif not fs then
-    luci.http.status(500, "no file system")
-    luci.http.write_json("no file system")
-    return
-  end
-  local dm = require "luci.model.diskman"
-  code, msg = dm.format_partition(partation_name, fs)
-  luci.http.status(code, msg)
-  luci.http.write_json(msg)
-end
-
-function get_disk_info(dev)
-  if not dev then
-    luci.http.status(500, "no device")
-    luci.http.write_json("no device")
-    return
-  elseif not nixio.fs.access("/dev/"..dev) then
-    luci.http.status(500, "no device")
-    luci.http.write_json("no device")
-    return
-  end
-  local dm = require "luci.model.diskman"
-  local device_info = dm.get_disk_info(dev)
-  luci.http.status(200, "ok")
-  luci.http.prepare_content("application/json")
-  luci.http.write_json(device_info)
-end
-
-function mk_p_table()
-  local p_table = luci.http.formvalue("p_table")
-  local dev = luci.http.formvalue("dev")
-  if not dev then
-    luci.http.status(500, "no device")
-    luci.http.write_json("no device")
-    return
-  elseif not nixio.fs.access("/dev/"..dev) then
-    luci.http.status(500, "no device")
-    luci.http.write_json("no device")
-    return
-  end
-  local dm = require "luci.model.diskman"
-  if p_table == "GPT" or p_table == "MBR" then
-    p_table = p_table == "MBR" and "msdos" or "gpt"
-    local res = luci.sys.call(dm.command.parted .. " -s /dev/" .. dev .. " mktable ".. p_table)
-    if res == 0 then
-      luci.http.status(200, "ok")
-    else
-      luci.http.status(500, "command exec error")
-    end
-    luci.http.prepare_content("application/json")
-    luci.http.write_json({code=res})
-  else
-    luci.http.status(404, "not support")
-    luci.http.prepare_content("application/json")
-    luci.http.write_json({code="1"})
-  end
-end
-
-function smart_detail(dev)
-  luci.template.render("diskman/smart_detail", {dev=dev})
-end
-
-function smart_attr(dev)
-  local dm = require "luci.model.diskman"
-  local cmd = io.popen(dm.command.smartctl ..  " -H -A -i /dev/%s" % dev)
-  if cmd then
-    local attr = { }
-    if cmd:match("NVMe Version:")then
-      while true do
-        local ln = cmd:read("*l")
-        if not ln then
-          break
-        elseif ln:match("^(.-):%s+(.+)") then
-          local key, value = ln:match("^(.-):%s+(.+)")
-          attr[#attr+1]= {
-              key = key,
-              value = value
-            }
-        end
-      end
-    else
-      while true do
-        local ln = cmd:read("*l")
-        if not ln then
-          break
-        elseif ln:match("^.*%d+%s+.+%s+.+%s+.+%s+.+%s+.+%s+.+%s+.+%s+.+%s+.+") then
-          local id,attrbute,flag,value,worst,thresh,type,updated,raw = ln:match("^%s*(%d+)%s+([%a%p]+)%s+(%w+)%s+(%d+)%s+(%d+)%s+(%d+)%s+([%a%p]+)%s+(%a+)%s+[%w%p]+%s+(.+)")
-          id= "%x" % id
-          if not id:match("^%w%w") then
-            id = "0%s" % id
-          end
-          attr[#attr+1]= {
-              id = id:upper(),
-              attrbute = attrbute,
-              flag  = flag,
-              value = value,
-              worst = worst,
-              thresh  = thresh,
-              type = type,
-              updated = updated,
-              raw  = raw
-            }
-        end
-      end
-    end
-  cmd:close()
-  luci.http.prepare_content("application/json")
-  luci.http.write_json(attr)
-  end
-end
--- a/luci-app-diskman/luasrc/model/cbi/diskman/btrfs.lua
+++ b/luci-app-diskman/luasrc/model/cbi/diskman/btrfs.lua
@ -1,210 +0,0 @@
--[[
-LuCI - Lua Configuration Interface
-Copyright 2019 lisaac <https://github.com/lisaac/luci-app-diskman>
-]]--
-
-require "luci.util"
-require("luci.tools.webadmin")
-local dm = require "luci.model.diskman"
-local uuid = arg[1]
-
-if not uuid then luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman")) end
-
-- mount subv=/ to tempfs
-mount_point = "/tmp/.btrfs_tmp"
-nixio.fs.mkdirr(mount_point)
-luci.util.exec(dm.command.umount .. " "..mount_point .. " >/dev/null 2>&1")
-luci.util.exec(dm.command.mount .. " -t btrfs -o subvol=/ UUID="..uuid.." "..mount_point)
-
-m = SimpleForm("btrfs", translate("Btrfs"), translate("Manage Btrfs"))
-m.template = "diskman/cbi/xsimpleform"
-m.redirect = luci.dispatcher.build_url("admin/system/diskman")
-m.submit = false
-m.reset = false
-
-- info
-local btrfs_info = dm.get_btrfs_info(mount_point)
-local table_btrfs_info = m:section(Table, {btrfs_info}, translate("Btrfs Info"))
-table_btrfs_info:option(DummyValue, "uuid", translate("UUID"))
-table_btrfs_info:option(DummyValue, "members", translate("Members"))
-table_btrfs_info:option(DummyValue, "data_raid_level", translate("Data"))
-table_btrfs_info:option(DummyValue, "metadata_raid_lavel", translate("Metadata"))
-table_btrfs_info:option(DummyValue, "size_formated", translate("Size"))
-table_btrfs_info:option(DummyValue, "used_formated", translate("Used"))
-table_btrfs_info:option(DummyValue, "free_formated", translate("Free Space"))
-table_btrfs_info:option(DummyValue, "usage", translate("Usage"))
-local v_btrfs_label = table_btrfs_info:option(Value, "label", translate("Label"))
-local value_btrfs_label = ""
-v_btrfs_label.write = function(self, section, value)
-  value_btrfs_label = value or ""
-end
-local btn_update_label = table_btrfs_info:option(Button, "_update_label")
-btn_update_label.inputtitle = translate("Update")
-btn_update_label.inputstyle = "edit"
-btn_update_label.write = function(self, section, value)
-  local cmd = dm.command.btrfs .. " filesystem label " .. mount_point .. " " .. value_btrfs_label
-  local res = luci.util.exec(cmd)
-  luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman/btrfs/" .. uuid))
-end
-- subvolume
-local subvolume_list = dm.get_btrfs_subv(mount_point)
-subvolume_list["_"] = { ID = 0 }
-table_subvolume = m:section(Table, subvolume_list, translate("SubVolumes"))
-table_subvolume:option(DummyValue, "id", translate("ID"))
-table_subvolume:option(DummyValue, "top_level", translate("Top Level"))
-table_subvolume:option(DummyValue, "uuid", translate("UUID"))
-table_subvolume:option(DummyValue, "otime", translate("Otime"))
-table_subvolume:option(DummyValue, "snapshots", translate("Snapshots"))
-local v_path = table_subvolume:option(Value, "path", translate("Path"))
-v_path.forcewrite = true
-v_path.render = function(self, section, scope)
-  if subvolume_list[section].ID == 0 then
-    self.template = "cbi/value"
-    self.placeholder = "/my_subvolume"
-    self.forcewrite = true
-    Value.render(self, section, scope)
-  else
-    self.template = "cbi/dvalue"
-    DummyValue.render(self, section, scope)
-  end
-end
-local value_path
-v_path.write = function(self, section, value)
-  value_path = value
-end
-local btn_set_default = table_subvolume:option(Button, "_subv_set_default", translate("Set Default"))
-btn_set_default.forcewrite = true
-btn_set_default.inputstyle = "edit"
-btn_set_default.template = "diskman/cbi/disabled_button"
-btn_set_default.render = function(self, section, scope)
-  if subvolume_list[section].default_subvolume then
-    self.view_disabled = true
-    self.inputtitle = translate("Set Default")
-  elseif subvolume_list[section].ID == 0 then
-    self.template = "cbi/dvalue"
-  else
-    self.inputtitle = translate("Set Default")
-    self.view_disabled = false
-  end
-  Button.render(self, section, scope)
-end
-btn_set_default.write = function(self, section, value)
-  local cmd
-  if value == translate("Set Default") then
-    cmd = dm.command.btrfs .. " subvolume set-default " .. mount_point..subvolume_list[section].path
-  else
-    cmd = dm.command.btrfs .. " subvolume set-default " .. mount_point.."/"
-  end
-  local res = luci.util.exec(cmd.. " 2>&1")
-  if res and (res:match("ERR") or res:match("not enough arguments")) then
-    m.errmessage = res
-  else
-    luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman/btrfs/" .. uuid))
-  end
-end
-local btn_remove = table_subvolume:option(Button, "_subv_remove")
-btn_remove.template = "diskman/cbi/disabled_button"
-btn_remove.forcewrite = true
-btn_remove.render = function(self, section, scope)
-  if subvolume_list[section].ID == 0 then
-    btn_remove.inputtitle = translate("Create")
-    btn_remove.inputstyle = "add"
-    self.view_disabled = false
-  elseif subvolume_list[section].path == "/" or subvolume_list[section].default_subvolume then
-    btn_remove.inputtitle = translate("Delete")
-    btn_remove.inputstyle = "remove"
-    self.view_disabled = true
-  else
-    btn_remove.inputtitle = translate("Delete")
-    btn_remove.inputstyle = "remove"
-    self.view_disabled = false
-  end
-  Button.render(self, section, scope)
-end
-
-btn_remove.write = function(self, section, value)
-  local cmd
-  if value == translate("Delete") then
-    cmd = dm.command.btrfs .. " subvolume delete " .. mount_point .. subvolume_list[section].path
-  elseif value == translate("Create") then
-    if value_path and value_path:match("^/") then
-      cmd = dm.command.btrfs .. " subvolume create " .. mount_point .. value_path
-    else
-      m.errmessage = translate("Please input Subvolume Path, Subvolume must start with '/'")
-      return
-    end
-  end
-  local res = luci.util.exec(cmd.. " 2>&1")
-  if res and (res:match("ERR") or res:match("not enough arguments")) then
-    m.errmessage = luci.util.pcdata(res)
-  else
-    luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman/btrfs/" .. uuid))
-  end
-end
-- snapshot
-- local snapshot_list = dm.get_btrfs_subv(mount_point, 1)
-- table_snapshot = m:section(Table, snapshot_list, translate("Snapshots"))
-- table_snapshot:option(DummyValue, "id", translate("ID"))
-- table_snapshot:option(DummyValue, "top_level", translate("Top Level"))
-- table_snapshot:option(DummyValue, "uuid", translate("UUID"))
-- table_snapshot:option(DummyValue, "otime", translate("Otime"))
-- table_snapshot:option(DummyValue, "path", translate("Path"))
-- local snp_remove = table_snapshot:option(Button, "_snp_remove")
-- snp_remove.inputtitle = translate("Delete")
-- snp_remove.inputstyle = "remove"
-- snp_remove.write = function(self, section, value)
--   local cmd = dm.command.btrfs .. " subvolume delete " .. mount_point .. snapshot_list[section].path
--   local res = luci.util.exec(cmd.. " 2>&1")
--   if res and (res:match("ERR") or res:match("not enough arguments")) then
--     m.errmessage = luci.util.pcdata(res)
--   else
--     luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman/btrfs/" .. uuid))
--   end
-- end
-
-- new snapshots
-local s_snapshot = m:section(SimpleSection, translate("New Snapshot"))
-local value_sorce, value_dest, value_readonly
-local v_sorce = s_snapshot:option(Value, "_source", translate("Source Path"), translate("The source path for create the snapshot"))
-v_sorce.placeholder = "/data"
-v_sorce.forcewrite = true
-v_sorce.write = function(self, section, value)
-  value_sorce = value
-end
-
-local v_readonly = s_snapshot:option(Flag, "_readonly", translate("Readonly"), translate("The path where you want to store the snapshot"))
-v_readonly.forcewrite = true
-v_readonly.rmempty = false
-v_readonly.disabled = 0
-v_readonly.enabled = 1
-v_readonly.default = 1
-v_readonly.write = function(self, section, value)
-  value_readonly = value
-end
-local v_dest = s_snapshot:option(Value, "_dest", translate("Destination Path (optional)"))
-v_dest.forcewrite = true
-v_dest.placeholder = "/.snapshot/202002051538"
-v_dest.write = function(self, section, value)
-  value_dest = value
-end
-local btn_snp_create = s_snapshot:option(Button, "_snp_create")
-btn_snp_create.title = " "
-btn_snp_create.inputtitle = translate("New Snapshot")
-btn_snp_create.inputstyle = "add"
-btn_snp_create.write = function(self, section, value)
-  if value_sorce and value_sorce:match("^/") then
-    if not value_dest then value_dest = "/.snapshot"..value_sorce.."/"..os.date("%Y%m%d%H%M%S") end
-    nixio.fs.mkdirr(mount_point..value_dest:match("(.-)[^/]+$"))
-    local cmd = dm.command.btrfs .. " subvolume snapshot" .. (value_readonly == 1 and " -r " or " ") .. mount_point..value_sorce .. " " .. mount_point..value_dest
-    local res = luci.util.exec(cmd .. " 2>&1")
-    if res and (res:match("ERR") or res:match("not enough arguments")) then
-      m.errmessage = luci.util.pcdata(res)
-    else
-      luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman/btrfs/" .. uuid))
-    end
-  else
-    m.errmessage = translate("Please input Source Path of snapshot, Source Path must start with '/'")
-  end
-end
-
-return m
--- a/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua
+++ b/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua
@ -1,327 +0,0 @@
--[[
-LuCI - Lua Configuration Interface
-Copyright 2019 lisaac <https://github.com/lisaac/luci-app-diskman>
-]]--
-
-require "luci.util"
-require("luci.tools.webadmin")
-local dm = require "luci.model.diskman"
-
-- Use (non-UCI) SimpleForm since we have no related config file
-m = SimpleForm("diskman", translate("DiskMan"), translate("Manage Disks over LuCI."))
-m.template = "diskman/cbi/xsimpleform"
-m:append(Template("diskman/disk_info"))
-- disable submit and reset button
-m.submit = false
-m.reset = false
-- rescan disks
-rescan = m:section(SimpleSection)
-rescan_button = rescan:option(Button, "_rescan")
-rescan_button.inputtitle= translate("Rescan Disks")
-rescan_button.template = "diskman/cbi/inlinebutton"
-rescan_button.inputstyle = "add"
-rescan_button.forcewrite = true
-rescan_button.write = function(self, section, value)
-  luci.util.exec("echo '- - -' | tee /sys/class/scsi_host/host*/scan > /dev/null")
-  if dm.command.mdadm then
-    luci.util.exec(dm.command.mdadm .. " --assemble --scan")
-  end
-  luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman"))
-end
-
-- disks
-local disks = dm.list_devices()
-d = m:section(Table, disks, translate("Disks"))
-d.config = "disk"
-- option(type, id(key of table), text)
-d:option(DummyValue, "path", translate("Path"))
-d:option(DummyValue, "model", translate("Model"))
-d:option(DummyValue, "sn", translate("Serial Number"))
-d:option(DummyValue, "size_formated", translate("Size"))
-d:option(DummyValue, "temp", translate("Temp"))
-- d:option(DummyValue, "sec_size", translate("Sector Size "))
-d:option(DummyValue, "p_table", translate("Partition Table"))
-d:option(DummyValue, "sata_ver", translate("SATA Version"))
-- d:option(DummyValue, "rota_rate", translate("Rotation Rate"))
-d:option(DummyValue, "health", translate("Health"))
-d:option(DummyValue, "status", translate("Status"))
-
-d.extedit = luci.dispatcher.build_url("admin/system/diskman/partition/%s")
-
-- raid devices
-if dm.command.mdadm then
-  local raid_devices = dm.list_raid_devices()
-  -- raid_devices = diskmanager.getRAIDdevices()
-  if next(raid_devices) ~= nil then
-    local r = m:section(Table, raid_devices, translate("RAID Devices"))
-    r.config = "_raid"
-    r:option(DummyValue, "path", translate("Path"))
-    r:option(DummyValue, "level", translate("RAID mode"))
-    r:option(DummyValue, "size_formated", translate("Size"))
-    r:option(DummyValue, "p_table", translate("Partition Table"))
-    r:option(DummyValue, "status", translate("Status"))
-    r:option(DummyValue, "members_str", translate("Members"))
-    r:option(DummyValue, "active", translate("Active"))
-    r.extedit  = luci.dispatcher.build_url("admin/system/diskman/partition/%s")
-  end
-end
-
-- btrfs devices
-if dm.command.btrfs then
-  btrfs_devices = dm.list_btrfs_devices()
-  if next(btrfs_devices) ~= nil then
-    local table_btrfs = m:section(Table, btrfs_devices, translate("Btrfs"))
-    table_btrfs:option(DummyValue, "uuid", translate("UUID"))
-    table_btrfs:option(DummyValue, "label", translate("Label"))
-    table_btrfs:option(DummyValue, "members", translate("Members"))
-    -- sieze is error, since there is RAID
-    -- table_btrfs:option(DummyValue, "size_formated", translate("Size"))
-    table_btrfs:option(DummyValue, "used_formated", translate("Usage"))
-    table_btrfs.extedit  = luci.dispatcher.build_url("admin/system/diskman/btrfs/%s")
-  end
-end
-
-- mount point
-local mount_point = dm.get_mount_points()
-local _mount_point = {}
-table.insert( mount_point, { device = 0 } )
-local table_mp = m:section(Table, mount_point, translate("Mount Point"))
-local v_device = table_mp:option(Value, "device", translate("Device"))
-v_device.render = function(self, section, scope)
-  if mount_point[section].device == 0 then
-    self.template = "cbi/value"
-    self.forcewrite = true
-    for dev, info in pairs(disks) do
-      for i, v in ipairs(info.partitions) do
-        self:value("/dev/".. v.name, "/dev/".. v.name .. " ".. v.size_formated)
-      end
-    end
-    Value.render(self, section, scope)
-  else
-    self.template = "cbi/dvalue"
-    DummyValue.render(self, section, scope)
-  end
-end
-v_device.write = function(self, section, value)
-  _mount_point.device = value and value:gsub("%s+", "") or ""
-end
-local v_fs = table_mp:option(Value, "fs", translate("File System"))
-v_fs.render = function(self, section, scope)
-  if mount_point[section].device == 0 then
-    self.template = "cbi/value"
-    self:value("auto", "auto")
-    self.default = "auto"
-    self.forcewrite = true
-    Value.render(self, section, scope)
-  else
-    self.template = "cbi/dvalue"
-    DummyValue.render(self, section, scope)
-  end
-end
-v_fs.write = function(self, section, value)
-  _mount_point.fs = value and value:gsub("%s+", "") or ""
-end
-local v_mount_option = table_mp:option(Value, "mount_options", translate("Mount Options"))
-v_mount_option.render = function(self, section, scope)
-  if mount_point[section].device == 0 then
-    self.template = "cbi/value"
-    self.placeholder = "rw,noauto"
-    self.forcewrite = true
-    Value.render(self, section, scope)
-  else
-    self.template = "cbi/dvalue"
-    local mp = mount_point[section].mount_options
-    mount_point[section].mount_options = nil
-    local length = 0
-    for k in mp:gmatch("([^,]+)") do
-      mount_point[section].mount_options = mount_point[section].mount_options and (mount_point[section].mount_options .. ",") or ""
-      if length > 20 then
-        mount_point[section].mount_options = mount_point[section].mount_options.. " <br>"
-        length = 0
-      end
-      mount_point[section].mount_options = mount_point[section].mount_options .. k
-      length = length + #k
-    end
-    self.rawhtml = true
-    -- mount_point[section].mount_options = #mount_point[section].mount_options > 50 and mount_point[section].mount_options:sub(1,50) .. "..." or mount_point[section].mount_options
-    DummyValue.render(self, section, scope)
-  end
-end
-v_mount_option.write = function(self, section, value)
-  _mount_point.mount_options = value and value:gsub("%s+", "") or ""
-end
-local v_mount_point = table_mp:option(Value, "mount_point", translate("Mount Point"))
-v_mount_point.render = function(self, section, scope)
-  if mount_point[section].device == 0 then
-    self.template = "cbi/value"
-    self.placeholder = "/media/diskX"
-    self.forcewrite = true
-    Value.render(self, section, scope)
-  else
-    self.template = "cbi/dvalue"
-    local new_mp = ""
-    local v_mp_d
-    for v_mp_d in self["section"]["data"][section]["mount_point"]:gmatch('[^/]+') do
-      if #v_mp_d > 12 then
-        new_mp = new_mp .. "/" .. v_mp_d:sub(1,7) .. ".." .. v_mp_d:sub(-4)
-      else
-        new_mp = new_mp .."/".. v_mp_d
-      end
-    end
-    self["section"]["data"][section]["mount_point"] = '<span title="'..self["section"]["data"][section]["mount_point"] .. '" >'..new_mp..'</span>'
-    self.rawhtml = true
-    DummyValue.render(self, section, scope)
-  end
-end
-v_mount_point.write = function(self, section, value)
-  _mount_point.mount_point = value
-end
-local btn_umount = table_mp:option(Button, "_mount", translate("Mount"))
-btn_umount.forcewrite = true
-btn_umount.render = function(self, section, scope)
-  if mount_point[section].device == 0 then
-    self.inputtitle = translate("Mount")
-    btn_umount.inputstyle = "add"
-  else
-    self.inputtitle = translate("Umount")
-    btn_umount.inputstyle = "remove"
-  end
-  Button.render(self, section, scope)
-end
-btn_umount.write = function(self, section, value)
-  local res
-  if value == translate("Mount") then
-    if not _mount_point.mount_point or not _mount_point.device then return end
-    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")
-  elseif value == translate("Umount") then
-    res = luci.util.exec(dm.command.umount .. " "..mount_point[section].mount_point .. " 2>&1")
-  end
-  if res:match("^mount:") or res:match("^umount:") then
-    m.errmessage = luci.util.pcdata(res)
-  else
-    luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman"))
-  end
-end
-
-if dm.command.mdadm or dm.command.btrfs then
-local creation_section = m:section(TypedSection, "_creation")
-creation_section.cfgsections=function()
-  return {translate("Creation")}
-end
-creation_section:tab("raid",  translate("RAID"), translate("RAID Creation"))
-creation_section:tab("btrfs", translate("Btrfs"), translate("Multiple Devices Btrfs Creation"))
-
-- raid functions
-if dm.command.mdadm then
-
-  local rname, rmembers, rlevel
-  local r_name = creation_section:taboption("raid", Value, "_rname", translate("Raid Name"))
-  r_name.placeholder = "/dev/md0"
-  r_name.write = function(self, section, value)
-    rname = value
-  end
-  local r_level = creation_section:taboption("raid", ListValue, "_rlevel", translate("Raid Level"))
-  local valid_raid = luci.util.exec("lsmod | grep md_mod")
-  if valid_raid:match("linear") then
-    r_level:value("linear", "Linear")
-  end
-  if valid_raid:match("raid456") then
-    r_level:value("5", "Raid 5")
-    r_level:value("6", "Raid 6")
-  end
-  if valid_raid:match("raid1") then
-    r_level:value("1", "Raid 1")
-  end
-  if valid_raid:match("raid0") then
-    r_level:value("0", "Raid 0")
-  end
-  if valid_raid:match("raid10") then
-    r_level:value("10", "Raid 10")
-  end
-  r_level.write = function(self, section, value)
-    rlevel = value
-  end
-  local r_member = creation_section:taboption("raid", DynamicList, "_rmember", translate("Raid Member"))
-  for dev, info in pairs(disks) do
-    if not info.inuse and  #info.partitions == 0  then
-        r_member:value(info.path, info.path.. " ".. info.size_formated)
-    end
-    for i, v in ipairs(info.partitions) do
-      if not v.inuse then
-        r_member:value("/dev/".. v.name, "/dev/".. v.name .. " ".. v.size_formated)
-      end
-    end
-  end
-  r_member.write = function(self, section, value)
-    rmembers = value
-  end
-  local r_create = creation_section:taboption("raid", Button, "_rcreate")
-  r_create.render = function(self, section, scope)
-    self.title = " "
-    self.inputtitle = translate("Create Raid")
-    self.inputstyle = "add"
-    Button.render(self, section, scope)
-  end
-  r_create.write = function(self, section, value)
-    -- mdadm --create --verbose /dev/md0 --level=stripe --raid-devices=2 /dev/sdb6 /dev/sdc5
-    local res = dm.create_raid(rname, rlevel, rmembers)
-    if res and res:match("^ERR") then
-      m.errmessage = luci.util.pcdata(res)
-      return
-    end
-    dm.gen_mdadm_config()
-    luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman"))
-  end
-end
-
-- btrfs
-if dm.command.btrfs then
-  local blabel, bmembers, blevel
-  local btrfs_label = creation_section:taboption("btrfs", Value, "_blabel", translate("Btrfs Label"))
-  btrfs_label.write = function(self, section, value)
-    blabel = value
-  end
-  local btrfs_level = creation_section:taboption("btrfs", ListValue, "_blevel", translate("Btrfs Raid Level"))
-  btrfs_level:value("single", "Single")
-  btrfs_level:value("raid0", "Raid 0")
-  btrfs_level:value("raid1", "Raid 1")
-  btrfs_level:value("raid10", "Raid 10")
-  btrfs_level.write = function(self, section, value)
-    blevel = value
-  end
-
-  local btrfs_member = creation_section:taboption("btrfs", DynamicList, "_bmember", translate("Btrfs Member"))
-  for dev, info in pairs(disks) do
-    if not info.inuse and  #info.partitions == 0  then
-      btrfs_member:value(info.path, info.path.. " ".. info.size_formated)
-    end
-    for i, v in ipairs(info.partitions) do
-      if not v.inuse then
-        btrfs_member:value("/dev/".. v.name, "/dev/".. v.name .. " ".. v.size_formated)
-      end
-    end
-  end
-  btrfs_member.write = function(self, section, value)
-    bmembers = value
-  end
-  local btrfs_create = creation_section:taboption("btrfs", Button, "_bcreate")
-  btrfs_create.render = function(self, section, scope)
-    self.title = " "
-    self.inputtitle = translate("Create Btrfs")
-    self.inputstyle = "add"
-    Button.render(self, section, scope)
-  end
-  btrfs_create.write = function(self, section, value)
-    -- mkfs.btrfs -L label -d blevel /dev/sda /dev/sdb
-    local res = dm.create_btrfs(blabel, blevel, bmembers)
-    if res and res:match("^ERR") then
-      m.errmessage = luci.util.pcdata(res)
-      return
-    end
-    luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman"))
-  end
-end
-end
-
-return m
--- a/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua
+++ b/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua
@ -1,366 +0,0 @@
--[[
-LuCI - Lua Configuration Interface
-Copyright 2019 lisaac <https://github.com/lisaac/luci-app-diskman>
-]]--
-
-require "luci.util"
-require("luci.tools.webadmin")
-local dm = require "luci.model.diskman"
-local dev = arg[1]
-
-if not dev then
-  luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman"))
-elseif not nixio.fs.access("/dev/"..dev) then
-  luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman"))
-end
-
-m = SimpleForm("partition", translate("Partition Management"), translate("Partition Disk over LuCI."))
-m.template = "diskman/cbi/xsimpleform"
-m.redirect = luci.dispatcher.build_url("admin/system/diskman")
-m:append(Template("diskman/partition_info"))
-- disable submit and reset button
-m.submit = false
-m.reset = false
-
-local disk_info = dm.get_disk_info(dev, true)
-local format_cmd = dm.get_format_cmd()
-
-s = m:section(Table, {disk_info}, translate("Device Info"))
-- s:option(DummyValue, "key")
-- s:option(DummyValue, "value")
-s:option(DummyValue, "path", translate("Path"))
-s:option(DummyValue, "model", translate("Model"))
-s:option(DummyValue, "sn", translate("Serial Number"))
-s:option(DummyValue, "size_formated", translate("Size"))
-s:option(DummyValue, "sec_size", translate("Sector Size"))
-local dv_p_table = s:option(ListValue, "p_table", translate("Partition Table"))
-dv_p_table.render = function(self, section, scope)
-  -- create table only if not used by raid and no partitions on disk
-  if not disk_info.p_table:match("Raid") and (#disk_info.partitions == 0 or (#disk_info.partitions == 1 and disk_info.partitions[1].number == -1) or (disk_info.p_table:match("LOOP") and not disk_info.partitions[1].inuse)) then
-    self:value(disk_info.p_table, disk_info.p_table)
-    self:value("GPT", "GPT")
-    self:value("MBR", "MBR")
-    self.default = disk_info.p_table
-    ListValue.render(self, section, scope)
-  else
-    self.template = "cbi/dvalue"
-    DummyValue.render(self, section, scope)
-  end
-end
-if disk_info.type:match("md") then
-  s:option(DummyValue, "level", translate("Level"))
-  s:option(DummyValue, "members_str", translate("Members"))
-else
-  s:option(DummyValue, "temp", translate("Temp"))
-  s:option(DummyValue, "sata_ver", translate("SATA Version"))
-  s:option(DummyValue, "rota_rate", translate("Rotation Rate"))
-end
-s:option(DummyValue, "status", translate("Status"))
-local btn_health = s:option(Button, "health", translate("Health"))
-btn_health.render = function(self, section, scope)
-  if disk_info.health then
-    self.inputtitle = disk_info.health
-    if disk_info.health == "PASSED" then
-      self.inputstyle = "add"
-    else
-      self.inputstyle = "remove"
-    end
-    Button.render(self, section, scope)
-  else
-    self.template = "cbi/dvalue"
-    DummyValue.render(self, section, scope)
-  end
-end
-
-local btn_eject = s:option(Button, "_eject")
-btn_eject.template = "diskman/cbi/disabled_button"
-btn_eject.inputstyle = "remove"
-btn_eject.render = function(self, section, scope)
-  for i, p in ipairs(disk_info.partitions) do
-    if p.mount_point ~= "-" then
-      self.view_disabled = true
-      break
-    end
-  end
-  if disk_info.p_table:match("Raid") then
-    self.view_disabled = true
-  end
-  if disk_info.type:match("md") then
-    btn_eject.inputtitle = translate("Remove")
-  else
-    btn_eject.inputtitle = translate("Eject")
-  end
-  Button.render(self, section, scope)
-end
-btn_eject.forcewrite = true
-btn_eject.write = function(self, section, value)
-  for i, p in ipairs(disk_info.partitions) do
-    if p.mount_point ~= "-" then
-      m.errmessage = p.name .. translate("is in use! please unmount it first!")
-      return
-    end
-  end
-  if disk_info.type:match("md") then
-    luci.util.exec(dm.command.mdadm .. " --stop /dev/" .. dev)
-    luci.util.exec(dm.command.mdadm .. " --remove /dev/" .. dev)
-    for _, disk in ipairs(disk_info.members) do
-      luci.util.exec(dm.command.mdadm .. " --zero-superblock " .. disk)
-    end
-    dm.gen_mdadm_config()
-  else
-    luci.util.exec("echo 1 > /sys/block/" .. dev .. "/device/delete")
-  end
-  luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman"))
-end
-- eject: echo 1 > /sys/block/(device)/device/delete
-- rescan: echo '- - -' | tee /sys/class/scsi_host/host*/scan > /dev/null
-
-
-- partitions info
-if not disk_info.p_table:match("Raid") then
-  s_partition_table = m:section(Table, disk_info.partitions, translate("Partitions Info"), translate("Default 2048 sector alignment, support +size{b,k,m,g,t} in End Sector"))
-
-  -- s_partition_table:option(DummyValue, "number", translate("Number"))
-  s_partition_table:option(DummyValue, "name", translate("Name"))
-  local val_sec_start = s_partition_table:option(Value, "sec_start", translate("Start Sector"))
-  val_sec_start.render = function(self, section, scope)
-    -- could create new partition
-    if disk_info.partitions[section].number == -1 and disk_info.partitions[section].size > 1 * 1024 * 1024 then
-      self.template = "cbi/value"
-      Value.render(self, section, scope)
-    else
-      self.template = "cbi/dvalue"
-      DummyValue.render(self, section, scope)
-    end
-  end
-  local val_sec_end = s_partition_table:option(Value, "sec_end", translate("End Sector"))
-  val_sec_end.render = function(self, section, scope)
-    -- could create new partition
-    if disk_info.partitions[section].number == -1 and disk_info.partitions[section].size > 1 * 1024 * 1024 then
-      self.template = "cbi/value"
-      Value.render(self, section, scope)
-    else
-      self.template = "cbi/dvalue"
-      DummyValue.render(self, section, scope)
-    end
-  end
-  val_sec_start.forcewrite = true
-  val_sec_start.write = function(self, section, value)
-    disk_info.partitions[section]._sec_start = value
-  end
-  val_sec_end.forcewrite = true
-  val_sec_end.write = function(self, section, value)
-    disk_info.partitions[section]._sec_end = value
-  end
-  s_partition_table:option(DummyValue, "size_formated", translate("Size"))
-  if disk_info.p_table == "MBR" then
-    s_partition_table:option(DummyValue, "type", translate("Type"))
-  end
-  s_partition_table:option(DummyValue, "used_formated", translate("Used"))
-  s_partition_table:option(DummyValue, "free_formated", translate("Free Space"))
-  s_partition_table:option(DummyValue, "usage", translate("Usage"))
-  local dv_mount_point = s_partition_table:option(DummyValue, "mount_point", translate("Mount Point"))
-  dv_mount_point.rawhtml = true
-  dv_mount_point.render = function(self, section, scope)
-    local new_mp = ""
-    local v_mp_d
-    for line in self["section"]["data"][section]["mount_point"]:gmatch("[^%s]+") do
-      if line == '-' then
-        new_mp = line
-        break
-      end
-      for v_mp_d in line:gmatch('[^/]+') do
-        if #v_mp_d > 12 then
-          new_mp = new_mp .. "/" .. v_mp_d:sub(1,7) .. ".." .. v_mp_d:sub(-4)
-        else
-          new_mp = new_mp .."/".. v_mp_d
-        end
-      end
-      new_mp = '<span title="'.. line .. '" >' ..new_mp  ..'</span>' .. "<br/>"
-    end
-    self["section"]["data"][section]["mount_point"] = new_mp
-    DummyValue.render(self, section, scope)
-  end
-  local val_fs = s_partition_table:option(Value, "fs", translate("File System"))
-  val_fs.forcewrite = true
-  val_fs.partitions = disk_info.partitions
-  for k, v in pairs(format_cmd) do
-    val_fs.format_cmd = val_fs.format_cmd and (val_fs.format_cmd ..  "," .. k) or k
-  end
-
-  val_fs.write = function(self, section, value)
-    disk_info.partitions[section]._fs = value
-  end
-  val_fs.render = function(self, section, scope)
-    -- use listvalue when partition not mounted
-    if disk_info.partitions[section].mount_point == "-" and disk_info.partitions[section].number ~= -1 and disk_info.partitions[section].type ~= "extended" then
-      self.template = "diskman/cbi/format_button"
-      self.inputstyle = "reset"
-      self.inputtitle = disk_info.partitions[section].fs == "raw" and translate("Format") or disk_info.partitions[section].fs
-      Button.render(self, section, scope)
-      -- self:reset_values()
-      -- self.keylist = {}
-      -- self.vallist = {}
-      -- for k, v in pairs(format_cmd) do
-      --   self:value(k,k)
-      -- end
-      -- self.default = disk_info.partitions[section].fs
-    else
-      -- self:reset_values()
-      -- self.keylist = {}
-      -- self.vallist = {}
-      self.template = "cbi/dvalue"
-      DummyValue.render(self, section, scope)
-    end
-  end
-  -- btn_format = s_partition_table:option(Button, "_format")
-  -- btn_format.template = "diskman/cbi/format_button"
-  -- btn_format.partitions = disk_info.partitions
-  -- btn_format.render = function(self, section, scope)
-  --   if disk_info.partitions[section].mount_point == "-" and disk_info.partitions[section].number ~= -1 and disk_info.partitions[section].type ~= "extended" then
-  --     self.inputtitle = translate("Format")
-  --     self.template = "diskman/cbi/disabled_button"
-  --     self.view_disabled = false
-  --     self.inputstyle = "reset"
-  --     for k, v in pairs(format_cmd) do
-  --       self:depends("val_fs", "k")
-  --     end
-  --   -- elseif disk_info.partitions[section].mount_point ~= "-" and disk_info.partitions[section].number ~= -1 then
-  --   --   self.inputtitle = "Format"
-  --   --   self.template = "diskman/cbi/disabled_button"
-  --   --   self.view_disabled = true
-  --   --   self.inputstyle = "reset"
-  --   else
-  --     self.inputtitle = ""
-  --     self.template = "cbi/dvalue"
-  --   end
-  --   Button.render(self, section, scope)
-  -- end
-  -- btn_format.forcewrite = true
-  -- btn_format.write = function(self, section, value)
-  --   local partition_name = "/dev/".. disk_info.partitions[section].name
-  --   if not nixio.fs.access(partition_name) then
-  --     m.errmessage = translate("Partition NOT found!")
-  --     return
-  --   end
-  --   local fs = disk_info.partitions[section]._fs
-  --   if not format_cmd[fs] then
-  --     m.errmessage = translate("Filesystem NOT support!")
-  --     return
-  --   end
-  --   local cmd = format_cmd[fs].cmd .. " " .. format_cmd[fs].option .. " " .. partition_name
-  --   local res = luci.util.exec(cmd .. " 2>&1")
-  --   if res and res:lower():match("error+") then
-  --     m.errmessage = luci.util.pcdata(res)
-  --   else
-  --     luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman/partition/" .. dev))
-  --   end
-  -- end
-
-  local btn_action = s_partition_table:option(Button, "_action")
-  btn_action.forcewrite = true
-  btn_action.template = "diskman/cbi/disabled_button"
-  btn_action.render = function(self, section, scope)
-    -- if partition is mounted or the size < 1mb, then disable the add action
-    if disk_info.partitions[section].mount_point ~= "-" or (disk_info.partitions[section].type ~= "extended" and disk_info.partitions[section].number == -1 and disk_info.partitions[section].size <= 1 * 1024 * 1024) then
-      self.view_disabled = true
-      -- self.inputtitle = ""
-      -- self.template = "cbi/dvalue"
-    elseif disk_info.partitions[section].type == "extended" and next(disk_info.partitions[section]["logicals"]) ~= nil then
-      self.view_disabled = true
-    else
-      -- self.template = "diskman/cbi/disabled_button"
-      self.view_disabled = false
-    end
-    if disk_info.partitions[section].number ~= -1 then
-      self.inputtitle = translate("Remove")
-      self.inputstyle = "remove"
-    else
-      self.inputtitle = translate("New")
-      self.inputstyle = "add"
-    end
-    Button.render(self, section, scope)
-  end
-  btn_action.write = function(self, section, value)
-    if value == translate("New") then
-      local start_sec = disk_info.partitions[section]._sec_start and tonumber(disk_info.partitions[section]._sec_start) or tonumber(disk_info.partitions[section].sec_start)
-      local end_sec = disk_info.partitions[section]._sec_end
-
-      if start_sec then
-        -- for sector alignment
-        local align = tonumber(disk_info.phy_sec) / tonumber(disk_info.logic_sec)
-        align = (align < 2048) and 2048
-        if start_sec < 2048 then
-          start_sec = "2048" .. "s"
-        elseif math.fmod( start_sec, align ) ~= 0 then
-          start_sec = tostring(start_sec + align - math.fmod( start_sec, align )) .. "s"
-        else
-          start_sec = start_sec .. "s"
-        end
-      else
-        m.errmessage = translate("Invalid Start Sector!")
-        return
-      end
-      -- support +size format for End sector
-      local end_size, end_unit = end_sec:match("^+(%d-)([bkmgtsBKMGTS])$")
-      if tonumber(end_size) and end_unit then
-        local unit ={
-          B=1,
-          S=512,
-          K=1024,
-          M=1048576,
-          G=1073741824,
-          T=1099511627776
-        }
-        end_unit = end_unit:upper()
-        end_sec = tostring(tonumber(end_size) * unit[end_unit] / unit["S"] + tonumber(start_sec:sub(1,-2)) - 1 ) .. "s"
-      elseif tonumber(end_sec) then
-        end_sec = end_sec .. "s"
-      else
-        m.errmessage = translate("Invalid End Sector!")
-        return
-      end
-      local part_type = "primary"
-
-      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
-            start_sec = tonumber(start_sec:sub(1,-2)) + 2048
-            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
-      local cmd = dm.command.parted .. " -s -a optimal /dev/" .. dev .. " mkpart " .. part_type .." " .. start_sec .. " " .. end_sec
-      local res = luci.util.exec(cmd .. " 2>&1")
-      if res and res:lower():match("error+") then
-        m.errmessage = luci.util.pcdata(res)
-      else
-        luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman/partition/" .. dev))
-      end
-    elseif value == translate("Remove") then
-      -- remove partition
-      local number = tostring(disk_info.partitions[section].number)
-      if (not number) or (number == "") then
-        m.errmessage = translate("Partition not exists!")
-        return
-      end
-      local cmd = dm.command.parted .. " -s /dev/" .. dev .. " rm " .. number
-      local res = luci.util.exec(cmd .. " 2>&1")
-      if res and res:lower():match("error+") then
-        m.errmessage = luci.util.pcdata(res)
-      else
-        luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman/partition/" .. dev))
-      end
-    end
-  end
-end
-
-return m
--- a/luci-app-diskman/luasrc/model/diskman.lua
+++ b/luci-app-diskman/luasrc/model/diskman.lua
@ -1,738 +0,0 @@
--[[
-LuCI - Lua Configuration Interface
-Copyright 2019 lisaac <https://github.com/lisaac/luci-app-diskman>
-]]--
-
-require "luci.util"
-local ver = require "luci.version"
-
-local CMD = {"parted", "mdadm", "blkid", "smartctl", "df", "btrfs", "lsblk"}
-
-local d = {command ={}}
-for _, cmd in ipairs(CMD) do
-  local command = luci.sys.exec("/usr/bin/which " .. cmd)
-    d.command[cmd] = command:match("^.+"..cmd) or nil
-end
-
-d.command.mount = nixio.fs.access("/usr/bin/mount") and "/usr/bin/mount" or "/bin/mount"
-d.command.umount = nixio.fs.access("/usr/bin/umount") and "/usr/bin/umount" or "/bin/umount"
-
-local proc_mounts = nixio.fs.readfile("/proc/mounts") or ""
-local mounts = luci.util.exec(d.command.mount .. " 2>/dev/null") or ""
-local swaps = nixio.fs.readfile("/proc/swaps") or ""
-local df = luci.sys.exec(d.command.df .. " 2>/dev/null") or ""
-
-function byte_format(byte)
-  local suff = {"B", "KB", "MB", "GB", "TB"}
-  for i=1, 5 do
-    if byte > 1024 and i < 5 then
-      byte = byte / 1024
-    else
-      return string.format("%.2f %s", byte, suff[i])
-    end
-  end
-end
-
-local get_smart_info = function(device)
-  local section
-  local smart_info = {}
-  for _, line in ipairs(luci.util.execl(d.command.smartctl .. " -H -A -i -n standby -f brief /dev/" .. device)) do
-    local attrib, val
-    if section == 1 then
-        attrib, val = line:match "^(.-):%s+(.+)"
-    elseif section == 2 and smart_info.nvme_ver then
-      attrib, val = line:match("^(.-):%s+(.+)")
-      if not smart_info.health then smart_info.health = line:match(".-overall%-health.-: (.+)") end
-    elseif section == 2 then
-      attrib, val = line:match("^([0-9 ]+)%s+[^ ]+%s+[POSRCK-]+%s+[0-9-]+%s+[0-9-]+%s+[0-9-]+%s+[0-9-]+%s+([0-9-]+)")
-      if not smart_info.health then smart_info.health = line:match(".-overall%-health.-: (.+)") end
-    else
-      attrib = line:match "^=== START OF (.*) SECTION ==="
-      if attrib and attrib:match("INFORMATION") then
-        section = 1
-      elseif attrib and attrib:match("SMART DATA") then
-        section = 2
-      elseif not smart_info.status then
-        val = line:match "^Device is in (.*) mode"
-        if val then smart_info.status = val end
-      end
-    end
-
-    if not attrib then
-      if section ~= 2 then section = 0 end
-    elseif (attrib == "Power mode is") or
-      (attrib == "Power mode was") then
-        smart_info.status = val:match("(%S+)")
-    -- elseif attrib == "Sector Sizes" then
-    --   -- 512 bytes logical, 4096 bytes physical
-    --   smart_info.phy_sec = val:match "([0-9]*) bytes physical"
-    --   smart_info.logic_sec = val:match "([0-9]*) bytes logical"
-    -- elseif attrib == "Sector Size" then
-    --   -- 512 bytes logical/physical
-    --   smart_info.phy_sec = val:match "([0-9]*)"
-    --   smart_info.logic_sec = smart_info.phy_sec
-    elseif attrib == "Serial Number" then
-      smart_info.sn = val
-    elseif attrib == "194" or attrib == "Temperature" then
-      smart_info.temp = val:match("(%d+)") .. "°C"
-    elseif attrib == "Rotation Rate" then
-      smart_info.rota_rate = val
-    elseif attrib == "SATA Version is" then
-      smart_info.sata_ver = val
-    elseif attrib == "NVMe Version" then
-      smart_info.nvme_ver = val
-    end
-  end
-  return smart_info
-end
-
-local parse_parted_info = function(keys, line)
-  -- parse the output of parted command (machine parseable format)
-  -- /dev/sda:5860533168s:scsi:512:4096:gpt:ATA ST3000DM001-1ER1:;
-  -- 1:34s:2047s:2014s:free;
-  -- 1:2048s:1073743872s:1073741825s:ext4:primary:;
-  local result = {}
-  local values = {}
-
-  for value in line:gmatch("(.-)[:;]") do table.insert(values, value) end
-  for i = 1,#keys do
-    result[keys[i]] = values[i] or ""
-  end
-  return result
-end
-
-local is_raid_member = function(partition)
-  -- check if inuse as raid member
-  if nixio.fs.access("/proc/mdstat") then
-    for _, result in ipairs(luci.util.execl("grep md /proc/mdstat | sed 's/[][]//g'")) do
-      local md, buf
-      md, buf = result:match("(md.-):(.+)")
-      if buf:match(partition) then
-        return "Raid Member: ".. md
-      end
-    end
-  end
-  return nil
-end
-
-local get_mount_point = function(partition)
-  local mount_point
-  for m in mounts:gmatch("/dev/"..partition.." on ([^ ]*)") do
-    mount_point = (mount_point and (mount_point .. " ")  or "") .. m
-  end
-  if mount_point then return mount_point end
-  -- result = luci.sys.exec('cat /proc/mounts | awk \'{if($1=="/dev/'.. partition ..'") print $2}\'')
-  -- if result ~= "" then return result end
-
-  if swaps:match("\n/dev/" .. partition .."%s") then return "swap" end
-  -- result = luci.sys.exec("cat /proc/swaps | grep /dev/" .. partition)
-  -- if result ~= "" then return "swap" end
-
-  return is_raid_member(partition)
-
-end
-
-- return used, free, usage
-local get_partition_usage = function(partition)
-  if not nixio.fs.access("/dev/"..partition) then return false end
-  local used, free, usage = df:match("\n/dev/" .. partition .. "%s+%d+%s+(%d+)%s+(%d+)%s+(%d+)%%%s-")
-
-  usage = usage and (usage .. "%") or "-"
-  used = used and (tonumber(used) * 1024) or 0
-  free = free and (tonumber(free) * 1024) or 0
-
-  return used, free, usage
-end
-
-local get_parted_info = function(device)
-  if not device then return end
-  local result = {partitions={}}
-  local DEVICE_INFO_KEYS = { "path", "size", "type", "logic_sec", "phy_sec", "p_table", "model", "flags" }
-  local PARTITION_INFO_KEYS = { "number", "sec_start", "sec_end", "size", "fs", "tag_name", "flags" }
-  local partition_temp
-  local partitions_temp = {}
-  local disk_temp
-
-  for line in luci.util.execi(d.command.parted .. " -s -m /dev/" .. device .. " unit s print free", "r") do
-    if line:find("^/dev/"..device..":.+") then
-      disk_temp = parse_parted_info(DEVICE_INFO_KEYS, line)
-      disk_temp.partitions = {}
-      if disk_temp["size"] then
-        local length = disk_temp["size"]:gsub("^(%d+)s$", "%1")
-        local newsize = tostring(tonumber(length)*tonumber(disk_temp["logic_sec"]))
-        disk_temp["size"] = newsize
-      end
-      if disk_temp["p_table"] == "msdos" then
-        disk_temp["p_table"] = "MBR"
-      else
-        disk_temp["p_table"] = disk_temp["p_table"]:upper()
-      end
-    elseif line:find("^%d-:.+") then
-      partition_temp = parse_parted_info(PARTITION_INFO_KEYS, line)
-      -- use human-readable form instead of sector number
-      if partition_temp["size"] then
-        local length = partition_temp["size"]:gsub("^(%d+)s$", "%1")
-        local newsize = (tonumber(length) * tonumber(disk_temp["logic_sec"]))
-        partition_temp["size"] = newsize
-        partition_temp["size_formated"] = byte_format(newsize)
-      end
-      partition_temp["number"] = tonumber(partition_temp["number"]) or -1
-      if partition_temp["fs"] == "free" then
-        partition_temp["number"] = -1
-        partition_temp["fs"] = "Free Space"
-        partition_temp["name"] = "-"
-      elseif device:match("sd") or device:match("sata") then
-        partition_temp["name"] = device..partition_temp["number"]
-      elseif device:match("mmcblk") or device:match("md") or device:match("nvme") then
-        partition_temp["name"] = device.."p"..partition_temp["number"]
-      end
-      if partition_temp["number"] > 0 and partition_temp["fs"] == "" and d.command.lsblk then
-        partition_temp["fs"] = luci.util.exec(d.command.lsblk .. " /dev/"..device.. tostring(partition_temp["number"]) .. " -no fstype"):match("([^%s]+)") or ""
-      end
-      partition_temp["fs"] = partition_temp["fs"] == "" and "raw" or partition_temp["fs"]
-      partition_temp["sec_start"] = partition_temp["sec_start"] and partition_temp["sec_start"]:sub(1,-2)
-      partition_temp["sec_end"] = partition_temp["sec_end"] and partition_temp["sec_end"]:sub(1,-2)
-      partition_temp["mount_point"] = partition_temp["name"]~="-" and get_mount_point(partition_temp["name"]) or "-"
-      if partition_temp["mount_point"]~="-" then
-        partition_temp["used"], partition_temp["free"], partition_temp["usage"] = get_partition_usage(partition_temp["name"])
-        partition_temp["used_formated"] = partition_temp["used"] and byte_format(partition_temp["used"]) or "-"
-        partition_temp["free_formated"] = partition_temp["free"] and byte_format(partition_temp["free"]) or "-"
-      else
-        partition_temp["used"], partition_temp["free"], partition_temp["usage"] = 0,0,"-"
-        partition_temp["used_formated"] = "-"
-        partition_temp["free_formated"] = "-"
-      end
-      -- if disk_temp["p_table"] == "MBR" and (partition_temp["number"] < 4) and (partition_temp["number"] > 0) then
-      --   local real_size_sec = tonumber(nixio.fs.readfile("/sys/block/"..device.."/"..partition_temp["name"].."/size")) * tonumber(disk_temp.phy_sec)
-      --   if real_size_sec ~= partition_temp["size"] then
-      --     disk_temp["extended_partition_index"] = partition_temp["number"]
-      --     partition_temp["type"] = "extended"
-      --     partition_temp["size"] = real_size_sec
-      --     partition_temp["fs"] = "-"
-      --     partition_temp["logicals"] = {}
-      --   else
-      --     partition_temp["type"] = "primary"
-      --   end
-      -- end
-
-      table.insert(partitions_temp, partition_temp)
-    end
-  end
-  if disk_temp and disk_temp["p_table"] == "MBR" then
-    for i, p in ipairs(partitions_temp) do
-      if disk_temp["extended_partition_index"] and p["number"] > 4 then
-        if tonumber(p["sec_end"]) <= tonumber(partitions_temp[disk_temp["extended_partition_index"]]["sec_end"]) and tonumber(p["sec_start"]) >= tonumber(partitions_temp[disk_temp["extended_partition_index"]]["sec_start"]) then
-          p["type"] = "logical"
-          table.insert(partitions_temp[disk_temp["extended_partition_index"]]["logicals"], i)
-        end
-      elseif (p["number"] < 4) and (p["number"] > 0) then
-        local s = nixio.fs.readfile("/sys/block/"..device.."/"..p["name"].."/size")
-        if s then
-          local real_size_sec = tonumber(s) * tonumber(disk_temp.phy_sec)
-          -- if size not equal, it's an extended
-          if real_size_sec ~= p["size"] then
-            disk_temp["extended_partition_index"] = i
-            p["type"] = "extended"
-            p["size"] = real_size_sec
-            p["fs"] = "-"
-            p["logicals"] = {}
-          else
-            p["type"] = "primary"
-          end
-        else
-          -- if not found in "/sys/block"
-          p["type"] = "primary"
-        end
-      end
-    end
-  end
-  result = disk_temp
-  result.partitions = partitions_temp
-
-  return result
-end
-
-local mddetail = function(mdpath)
-	local detail = {}
-	local path = mdpath:match("^/dev/md%d+$")
-	if path then
-		local mdadm = io.popen(d.command.mdadm .. " --detail "..path, "r")
-		for line in mdadm:lines() do
-			local key, value = line:match("^%s*(.+) : (.+)")
-			if key then
-				detail[key] = value
-			end
-		end
-		mdadm:close()
-	end
-	return detail
-end
-
-- return {{device="", mount_points="", fs="", mount_options="", dump="", pass=""}..}
-d.get_mount_points = function()
-  local mount
-  local res = {}
-  local h ={"device", "mount_point", "fs", "mount_options", "dump", "pass"}
-  for mount in proc_mounts:gmatch("[^\n]+") do
-    local device = mount:match("^([^%s]+)%s+.+")
-    -- only show /dev/xxx device
-    if device and device:match("/dev/") then
-      res[#res+1] = {}
-      local i = 0
-      for v in mount:gmatch("[^%s]+") do
-        i = i + 1
-        res[#res][h[i]] = v
-      end
-    end
-  end
-  return res
-end
-
-d.get_disk_info = function(device, wakeup)
-  --[[ return:
-  {
-    path, model, sn, size, size_mounted, flags, type, temp, p_table, logic_sec, phy_sec, sec_size, sata_ver, rota_rate, status, health,
-    partitions = {
-      1 = { number, name, sec_start, sec_end, size, size_mounted, fs, tag_name, type, flags, mount_point, usage, used, free, used_formated, free_formated},
-      2 = { number, name, sec_start, sec_end, size, size_mounted, fs, tag_name, type, flags, mount_point, usage, used, free, used_formated, free_formated},
-      ...
-    }
-    --raid devices only
-    level, members, members_str
-  }
-  --]]
-  if not device then return end
-  local disk_info
-  local smart_info = get_smart_info(device)
-
-  -- check if divice is the member of raid
-  smart_info["p_table"] = is_raid_member(device..'0')
-  -- if status is not active(standby), only check smart_info.
-  -- if only weakup == true, weakup the disk and check parted_info.
-  if smart_info.status ~= "STANDBY" or wakeup or (smart_info["p_table"] and not smart_info["p_table"]:match("Raid")) or device:match("^md") then
-    disk_info = get_parted_info(device)
-    disk_info["sec_size"] = disk_info["logic_sec"] .. "/" .. disk_info["phy_sec"]
-    disk_info["size_formated"] = byte_format(tonumber(disk_info["size"]))
-    -- if status is standby, after get part info, the disk is weakuped, then get smart_info again for more informations
-    if smart_info.status ~= "ACTIVE" then smart_info = get_smart_info(device) end
-  else
-    disk_info = {}
-  end
-
-  for k, v in pairs(smart_info) do
-    disk_info[k] = v
-  end
-
-  if disk_info.type and disk_info.type:match("md") then
-    local raid_info = d.list_raid_devices()[disk_info["path"]:match("/dev/(.+)")]
-    for k, v in pairs(raid_info) do
-      disk_info[k] = v
-    end
-  end
-  return disk_info
-end
-
-d.list_raid_devices = function()
-  local fs = require "nixio.fs"
-
-  local raid_devices = {}
-  if not fs.access("/proc/mdstat") then return raid_devices end
-  local mdstat = io.open("/proc/mdstat", "r")
-  for line in mdstat:lines() do
-
-    -- md1 : active raid1 sdb2[1] sda2[0]
-    -- md127 : active raid5 sdh1[6] sdg1[4] sdf1[3] sde1[2] sdd1[1] sdc1[0]
-    local device_info = {}
-    local mdpath, list = line:match("^(md%d+) : (.+)")
-    if mdpath then
-      local members = {}
-      for member in string.gmatch(list, "%S+") do
-        member_path = member:match("^(%S+)%[%d+%]")
-        if member_path then
-          member = '/dev/'..member_path
-        end
-        table.insert(members, member)
-      end
-      local active = table.remove(members, 1)
-      local level = "-"
-      if active == "active" then
-        level = table.remove(members, 1)
-      end
-
-      local size = tonumber(fs.readfile(string.format("/sys/class/block/%s/size", mdpath)))
-      local ss = tonumber(fs.readfile(string.format("/sys/class/block/%s/queue/logical_block_size", mdpath)))
-
-      device_info["path"] = "/dev/"..mdpath
-      device_info["size"] = size*ss
-      device_info["size_formated"] = byte_format(size*ss)
-      device_info["active"] = active:upper()
-      device_info["level"] = level
-      device_info["members"] = members
-      device_info["members_str"] = table.concat(members, ", ")
-
-      -- Get more info from output of mdadm --detail
-      local detail = mddetail(device_info["path"])
-      device_info["status"] = detail["State"]:upper()
-
-      raid_devices[mdpath] = device_info
-    end
-  end
-  mdstat:close()
-
-  return raid_devices
-end
-
-- Collect Devices information
-  --[[ return:
-  {
-    sda={
-      path, model, inuse, size_formated,
-      partitions={
-        { name, inuse, size_formated }
-        ...
-      }
-    }
-    ..
-  }
-  --]]
-d.list_devices = function()
-  local fs = require "nixio.fs"
-
-  -- get all device names (sdX and mmcblkX)
-  local target_devnames = {}
-  for dev in fs.dir("/dev") do
-    if dev:match("^sd[a-z]$")
-      or dev:match("^mmcblk%d+$")
-      or dev:match("^sata[a-z]$")
-      or dev:match("^nvme%d+n%d+$")
-      then
-      table.insert(target_devnames, dev)
-    end
-  end
-
-  local devices = {}
-  for i, bname in pairs(target_devnames) do
-    local device_info = {}
-    local device = "/dev/" .. bname
-    local size = tonumber(fs.readfile(string.format("/sys/class/block/%s/size", bname)) or "0")
-    local ss = tonumber(fs.readfile(string.format("/sys/class/block/%s/queue/logical_block_size", bname)) or "0")
-    local model = fs.readfile(string.format("/sys/class/block/%s/device/model", bname))
-    local partitions = {}
-    for part in nixio.fs.glob("/sys/block/" .. bname .."/" .. bname .. "*") do
-      local pname = nixio.fs.basename(part)
-      local psize = byte_format(tonumber(nixio.fs.readfile(part .. "/size"))*ss)
-      local mount_point = get_mount_point(pname)
-      if mount_point then device_info["inuse"] = true end
-      table.insert(partitions, {name = pname, size_formated = psize, inuse = mount_point})
-    end
-
-      device_info["path"] = device
-      device_info["size_formated"] = byte_format(size*ss)
-      device_info["model"] = model
-      device_info["partitions"] = partitions
-      -- true or false
-      device_info["inuse"] = device_info["inuse"] or get_mount_point(bname)
-
-      local udevinfo = {}
-      if luci.sys.exec("which udevadm") ~= "" then
-        local udevadm = io.popen("udevadm info --query=property --name="..device)
-        for attr in udevadm:lines() do
-          local k, v = attr:match("(%S+)=(%S+)")
-          udevinfo[k] = v
-        end
-        udevadm:close()
-
-        device_info["info"] = udevinfo
-        if udevinfo["ID_MODEL"] then device_info["model"] = udevinfo["ID_MODEL"] end
-      end
-      devices[bname] = device_info
-  end
-  -- luci.util.perror(luci.util.serialize_json(devices))
-  return devices
-end
-
-- get formart cmd
-d.get_format_cmd = function()
-  local AVAILABLE_FMTS = {
-    ext2 = { cmd = "mkfs.ext2", option = "-F -E lazy_itable_init=1" },
-    ext3 = { cmd = "mkfs.ext3", option = "-F -E lazy_itable_init=1" },
-    ext4 = { cmd = "mkfs.ext4", option = "-F -E lazy_itable_init=1" },
-    fat32 = { cmd = "mkfs.vfat", option = "-F" },
-    exfat = { cmd = "mkexfat", option = "-f" },
-    hfsplus = { cmd = "mkhfs", option = "-f" },
-    ntfs = { cmd = "mkntfs", option = "-f" },
-    swap = { cmd = "mkswap", option = "" },
-    btrfs = { cmd = "mkfs.btrfs", option = "-f" }
-  }
-  result = {}
-  for fmt, obj in pairs(AVAILABLE_FMTS) do
-    local cmd = luci.sys.exec("/usr/bin/which " .. obj["cmd"])
-    if cmd:match(obj["cmd"]) then
-      result[fmt] = { cmd = cmd:match("^.+"..obj["cmd"]) ,option = obj["option"] }
-    end
-  end
-  return result
-end
-
-d.create_raid = function(rname, rlevel, rmembers)
-  local mb = {}
-  for _, v in ipairs(rmembers) do
-    mb[v]=v
-  end
-  rmembers = {}
-  for _, v in pairs(mb) do
-    table.insert(rmembers, v)
-  end
-  if type(rname) == "string" then
-    if rname:match("^md%d-%s+") then
-      rname = "/dev/"..rname:match("^(md%d-)%s+")
-    elseif rname:match("^/dev/md%d-%s+") then
-      rname = "/dev/"..rname:match("^(/dev/md%d-)%s+")
-    elseif not rname:match("/") then
-      rname = "/dev/md/".. rname
-    else
-      return "ERR: Invalid raid name"
-    end
-  else
-    local mdnum = 0
-    for num=1,127 do
-      local md = io.open("/dev/md"..tostring(num), "r")
-      if md == nil then
-        mdnum = num
-        break
-      else
-        io.close(md)
-      end
-    end
-    if mdnum == 0 then return "ERR: Cannot find proper md number" end
-    rname = "/dev/md"..mdnum
-  end
-
-  if rlevel == "5" or rlevel == "6" then
-    if #rmembers < 3 then return "ERR: Not enough members" end
-  end
-  if rlevel == "10" then
-    if #rmembers < 4 then return "ERR: Not enough members" end
-  end
-  if #rmembers < 2 then return "ERR: Not enough members" end
-  local cmd = d.command.mdadm .. " --create "..rname.." --run --assume-clean --homehost=any --level=" .. rlevel .. " --raid-devices=" .. #rmembers .. " " .. table.concat(rmembers, " ")
-  local res = luci.util.exec(cmd)
-  return res
-end
-
-d.gen_mdadm_config = function()
-  if not nixio.fs.access("/etc/config/mdadm") then return end
-  local uci = require "luci.model.uci"
-  local x = uci.cursor()
-  -- delete all array sections
-  x:foreach("mdadm", "array", function(s) x:delete("mdadm",s[".name"]) end)
-  local cmd = d.command.mdadm .. " -D -s"
-  --ARRAY /dev/md1 metadata=1.2 name=any:1 UUID=f998ae14:37621b27:5c49e850:051f6813
-  --ARRAY /dev/md3 metadata=1.2 name=any:3 UUID=c068c141:4b4232ca:f48cbf96:67d42feb
-  for _, v in ipairs(luci.util.execl(cmd)) do
-    local device, uuid = v:match("^ARRAY%s-([^%s]+)%s-[^%s]-%s-[^%s]-%s-UUID=([^%s]+)%s-")
-    if device and uuid then
-      local section_name = x:add("mdadm", "array")
-      x:set("mdadm", section_name, "device", device)
-      x:set("mdadm", section_name, "uuid", uuid)
-    end
-  end
-  x:commit("mdadm")
-  -- enable mdadm
-  luci.util.exec("/etc/init.d/mdadm enable")
-end
-
-- list btrfs filesystem device
-- {uuid={uuid, label, members, size, used}...}
-d.list_btrfs_devices = function()
-  local btrfs_device = {}
-  if not d.command.btrfs then return btrfs_device end
-  local line, _uuid
-  for _, line in ipairs(luci.util.execl(d.command.btrfs .. " filesystem show -d --raw"))
-  do
-    local label, uuid = line:match("^Label:%s+([^%s]+)%s+uuid:%s+([^%s]+)")
-    if label and uuid then
-      _uuid = uuid
-      local _label = label:match("^'([^']+)'")
-      btrfs_device[_uuid] = {label = _label or label, uuid = uuid}
-      -- table.insert(btrfs_device, {label = label, uuid = uuid})
-    end
-    local used = line:match("Total devices[%w%s]+used%s+(%d+)$")
-    if used then
-      btrfs_device[_uuid]["used"] = tonumber(used)
-      btrfs_device[_uuid]["used_formated"] = byte_format(tonumber(used))
-    end
-    local size, device = line:match("devid[%w.%s]+size%s+(%d+)[%w.%s]+path%s+([^%s]+)$")
-    if size and device then
-      btrfs_device[_uuid]["size"] = btrfs_device[_uuid]["size"] and btrfs_device[_uuid]["size"] + tonumber(size) or tonumber(size)
-      btrfs_device[_uuid]["size_formated"] = byte_format(btrfs_device[_uuid]["size"])
-      btrfs_device[_uuid]["members"] = btrfs_device[_uuid]["members"] and btrfs_device[_uuid]["members"]..", "..device or device
-    end
-  end
-  return btrfs_device
-end
-
-d.create_btrfs = function(blabel, blevel, bmembers)
-  -- mkfs.btrfs -L label -d blevel /dev/sda /dev/sdb
-  if not d.command.btrfs or type(bmembers) ~= "table" or next(bmembers) == nil then return "ERR no btrfs support or no members" end
-  local label = blabel and " -L " .. blabel or ""
-  local cmd = "mkfs.btrfs -f " .. label .. " -d " .. blevel .. " " .. table.concat(bmembers, " ")
-  return luci.util.exec(cmd)
-end
-
-- get btrfs info
-- {uuid, label, members, data_raid_level,metadata_raid_lavel, size, used, size_formated, used_formated, free, free_formated, usage}
-d.get_btrfs_info = function(m_point)
-  local btrfs_info = {}
-  if not m_point or not d.command.btrfs then return btrfs_info end
-  local cmd = d.command.btrfs .. " filesystem show --raw " .. m_point
-  local _, line, uuid, _label, members
-  for _, line in ipairs(luci.util.execl(cmd)) do
-    if not uuid and not _label then
-      _label, uuid = line:match("^Label:%s+([^%s]+)%s+uuid:%s+([^s]+)")
-    else
-      local mb = line:match("%s+devid.+path%s+([^%s]+)")
-      if mb then
-        members = members and (members .. ", ".. mb) or mb
-      end
-    end
-  end
-
-  if not _label or not uuid then return btrfs_info end
-  local label = _label:match("^'([^']+)'")
-  cmd = d.command.btrfs .. " filesystem usage -b " .. m_point
-  local used, free, data_raid_level, metadata_raid_lavel
-  for _, line in ipairs(luci.util.execl(cmd)) do
-    if not used then
-      used = line:match("^%s+Used:%s+(%d+)")
-    elseif not free then
-      free = line:match("^%s+Free %(estimated%):%s+(%d+)")
-    elseif not data_raid_level then
-      data_raid_level = line:match("^Data,%s-(%w+)")
-    elseif not metadata_raid_lavel then
-      metadata_raid_lavel = line:match("^Metadata,%s-(%w+)")
-    end
-  end
-  if used and free and data_raid_level and metadata_raid_lavel then
-    used = tonumber(used)
-    free = tonumber(free)
-    btrfs_info = {
-      uuid = uuid,
-      label = label,
-      data_raid_level = data_raid_level,
-      metadata_raid_lavel = metadata_raid_lavel,
-      used = used,
-      free = free,
-      size = used + free,
-      size_formated = byte_format(used + free),
-      used_formated = byte_format(used),
-      free_formated = byte_format(free),
-      members = members,
-      usage = string.format("%.2f",(used / (free+used) * 100)) .. "%"
-    }
-  end
-  return btrfs_info
-end
-
-- get btrfs subvolume
-- {id={id, gen, top_level, path, snapshots, otime, default_subvolume}...}
-d.get_btrfs_subv = function(m_point, snapshot)
-local subvolume = {}
-if not m_point or not d.command.btrfs then return subvolume end
-
-- get default subvolume
-local cmd = d.command.btrfs .. " subvolume get-default " .. m_point
-local res = luci.util.exec(cmd)
-local default_subvolume_id = res:match("^ID%s+([^%s]+)")
-
-- get the root subvolume
-if not snapshot then
-  local _, line, section_snap, _uuid, _otime, _id, _snap
-  cmd = d.command.btrfs .. " subvolume show ".. m_point
-  for _, line in ipairs(luci.util.execl(cmd)) do
-    if not section_snap then
-      if not _uuid then
-        _uuid = line:match("^%s-UUID:%s+([^%s]+)")
-      elseif not _otime then
-        _otime = line:match("^%s+Creation time:%s+(.+)")
-      elseif not _id then
-        _id = line:match("^%s+Subvolume ID:%s+([^%s]+)")
-      elseif line:match("^%s+(Snapshot%(s%):)") then
-        section_snap = true
-      end
-    else
-      local snapshot = line:match("^%s+(.+)")
-      if snapshot then
-        _snap = _snap and (_snap ..", /".. snapshot) or ("/"..snapshot)
-      end
-    end
-  end
-  if _uuid and _otime and _id then
-    subvolume["0".._id] = {id = _id , uuid = _uuid, otime = _otime, snapshots = _snap, path = "/"}
-    if default_subvolume_id == _id then
-      subvolume["0".._id].default_subvolume = 1
-    end
-  end
-end
-
-- get subvolume of btrfs
-cmd = d.command.btrfs .. " subvolume list -gcu" .. (snapshot and "s " or " ") .. m_point
-for _, line in ipairs(luci.util.execl(cmd)) do
-  -- ID 259 gen 11 top level 258 uuid 26ae0c59-199a-cc4d-bd58-644eb4f65d33 path 1a/2b'
-  local id, gen, top_level, uuid, path, otime, otime2
-  if snapshot then
-    id, gen, top_level, otime, otime2, uuid, path = line:match("^ID%s+([^%s]+)%s+gen%s+([^%s]+)%s+cgen.-top level%s+([^%s]+)%s+otime%s+([^%s]+)%s+([^%s]+)%s+uuid%s+([^%s]+)%s+path%s+([^%s]+)%s-$")
-  else
-    id, gen, top_level, uuid, path = line:match("^ID%s+([^%s]+)%s+gen%s+([^%s]+)%s+cgen.-top level%s+([^%s]+)%s+uuid%s+([^%s]+)%s+path%s+([^%s]+)%s-$")
-  end
-  if id and gen and top_level and uuid and path then
-    subvolume[id] = {id = id, gen = gen, top_level = top_level, otime = (otime and otime or "") .." ".. (otime2 and otime2 or ""), uuid = uuid, path = '/'.. path}
-    if not snapshot then
-      -- use btrfs subv show to get snapshots
-      local show_cmd = d.command.btrfs .. " subvolume show "..m_point.."/"..path
-      local __, line_show, section_snap
-      for __, line_show in ipairs(luci.util.execl(show_cmd)) do
-        if not section_snap then
-          local create_time = line_show:match("^%s+Creation time:%s+(.+)")
-          if create_time then
-            subvolume[id]["otime"] = create_time
-          elseif line_show:match("^%s+(Snapshot%(s%):)") then
-            section_snap = "true"
-          end
-        else
-          local snapshot = line_show:match("^%s+(.+)")
-          subvolume[id]["snapshots"] = subvolume[id]["snapshots"] and (subvolume[id]["snapshots"] .. ", /".. snapshot) or ("/"..snapshot)
-        end
-      end
-    end
-  end
-end
-if subvolume[default_subvolume_id] then
-  subvolume[default_subvolume_id].default_subvolume = 1
-end
-- if m_point == "/tmp/.btrfs_tmp" then
--   luci.util.exec("umount " .. m_point)
-- end
-return subvolume
-end
-
-d.format_partition = function(partition, fs)
-  local partition_name = "/dev/".. partition
-  if not nixio.fs.access(partition_name) then
-    return 500, "Partition NOT found!"
-  end
-
-  local format_cmd = d.get_format_cmd()
-  if not format_cmd[fs] then
-    return 500, "Filesystem NOT support!"
-  end
-  local cmd = format_cmd[fs].cmd .. " " .. format_cmd[fs].option .. " " .. partition_name
-  local res = luci.util.exec(cmd .. " 2>&1")
-  if res and res:lower():match("error+") then
-    return 500, res
-  else
-    return 200, "OK"
-  end
-end
-
-return d
--- a/luci-app-diskman/luasrc/view/diskman/cbi/disabled_button.htm
+++ b/luci-app-diskman/luasrc/view/diskman/cbi/disabled_button.htm
@ -1,7 +0,0 @@
-<%+cbi/valueheader%>
-	<% if self:cfgvalue(section) ~= false then %>
-		<input class="cbi-button cbi-button-<%=self.inputstyle or "button" %>" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> <% if self.view_disabled then %> disabled <% end %>/>
-	<% else %>
-		-
-	<% end %>
-<%+cbi/valuefooter%>
--- a/luci-app-diskman/luasrc/view/diskman/cbi/format_button.htm
+++ b/luci-app-diskman/luasrc/view/diskman/cbi/format_button.htm
@ -1,7 +0,0 @@
-<%+cbi/valueheader%>
-	<% if self:cfgvalue(section) ~= false then %>
-    <input class="cbi-button cbi-button-<%=self.inputstyle or "button" %>" onclick="event.preventDefault();partition_format('<%=self.partitions[section].name%>', '<%=self.format_cmd%>', '<%=self.inputtitle%>');" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> <% if self.view_disabled then %> disabled <% end %>/>
-	<% else %>
-		-
-	<% end %>
-<%+cbi/valuefooter%>
--- a/luci-app-diskman/luasrc/view/diskman/cbi/inlinebutton.htm
+++ b/luci-app-diskman/luasrc/view/diskman/cbi/inlinebutton.htm
@ -1,7 +0,0 @@
-<div style="display: inline-block;">
-	<% if self:cfgvalue(section) ~= false then %>
-		<input class="cbi-button cbi-button-<%=self.inputstyle or "button" %>" type="submit"" <% if self.disable then %>disabled <% end %><%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> />
-	<% else %>
-		-
-	<% end %>
-</div>
--- a/luci-app-diskman/luasrc/view/diskman/cbi/xnullsection.htm
+++ b/luci-app-diskman/luasrc/view/diskman/cbi/xnullsection.htm
@ -1,37 +0,0 @@
-<div class="cbi-section" id="cbi-<%=self.config%>-section">
-	<% if self.title and #self.title > 0 then -%>
-		<legend><%=self.title%></legend>
-	<%- end %>
-	<% if self.description and #self.description > 0 then -%>
-		<div class="cbi-section-descr"><%=self.description%></div>
-	<%- end %>
-	<div class="cbi-section-node">
-		<div id="cbi-<%=self.config%>-<%=tostring(self):sub(8)%>">
-			<% self:render_children(1, scope or {}) %>
-		</div>
-		<% if self.error and self.error[1] then -%>
-			<div class="cbi-section-error">
-				<ul><% for _, e in ipairs(self.error[1]) do -%>
-					<li>
-						<%- if e == "invalid" then -%>
-							<%:One or more fields contain invalid values!%>
-						<%- elseif e == "missing" then -%>
-							<%:One or more required fields have no value!%>
-						<%- else -%>
-							<%=pcdata(e)%>
-						<%- end -%>
-					</li>
-				<%- end %></ul>
-			</div>
-		<%- end %>
-	</div>
-</div>
-<%-
-	if type(self.hidden) == "table" then
-		for k, v in pairs(self.hidden) do
-%>
-	<input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
-<%-
-		end
-	end
-%>
--- a/luci-app-diskman/luasrc/view/diskman/cbi/xsimpleform.htm
+++ b/luci-app-diskman/luasrc/view/diskman/cbi/xsimpleform.htm
@ -1,88 +0,0 @@
-<% if not self.embedded then %>
-<form method="post" enctype="multipart/form-data" action="<%=REQUEST_URI%>"<%=
-			attr("data-strings", luci.util.serialize_json({
-				label = {
-					choose = translate('-- Please choose --'),
-					custom = translate('-- custom --'),
-				},
-				path = {
-					resource = resource,
-					browser  = url("admin/filebrowser")
-				}
-			}))
-		%>>
-			<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-			<input type="hidden" name="token" value="<%=token%>" />
-			<input type="hidden" name="cbi.submit" value="1" /><%
-	end
-
-	%><div class="cbi-map" id="cbi-<%=self.config%>"><%
-
-	if self.title and #self.title > 0 then
-		%><h2 name="content"><%=self.title%></h2><%
-	end
-
-	if self.description and #self.description > 0 then
-		%><div class="cbi-map-descr"><%=self.description%></div><%
-	end
-
-	self:render_children()
-
-	%></div><%
-
-	if self.message then
-		%><div class="alert-message notice"><%=self.message%></div><%
-	end
-
-	if self.errmessage then
-		%><div class="alert-message warning"><%=self.errmessage%></div><%
-	end
-
-	if not self.embedded then
-		if type(self.hidden) == "table" then
-			local k, v
-			for k, v in pairs(self.hidden) do
-				%><input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" /><%
-			end
-		end
-
-		local display_back   = (self.redirect)
-		local display_cancel = (self.cancel ~= false and self.on_cancel)
-		local display_skip   = (self.flow and self.flow.skip)
-		local display_submit = (self.submit ~= false)
-		local display_reset  = (self.reset ~= false)
-
-		if display_back or display_cancel or display_skip or display_submit or display_reset then
-			%><div class="cbi-page-actions"><%
-
-			if display_back then
-				%><input class="cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(self.redirect)%>'" /> <%
-			end
-
-			if display_cancel then
-				local label = pcdata(self.cancel or translate("Cancel"))
-				%><input class="cbi-button cbi-button-link" type="button" value="<%=label%>" onclick="cbi_submit(this, 'cbi.cancel')" /> <%
-			end
-
-			if display_skip then
-				%><input class="cbi-button cbi-button-neutral" type="button" value="<%:Skip%>" onclick="cbi_submit(this, 'cbi.skip')" /> <%
-			end
-
-			if display_submit then
-				local label = pcdata(self.submit or translate("Submit"))
-				%><input class="cbi-button cbi-button-save" type="submit" value="<%=label%>" /> <%
-			end
-
-			if display_reset then
-				local label = pcdata(self.reset or translate("Reset"))
-				%><input class="cbi-button cbi-button-reset" type="reset" value="<%=label%>" /> <%
-			end
-
-			%></div><%
-		end
-
-		%></form><%
-	end
-%>
-
-<script type="text/javascript">cbi_init();</script>
--- a/luci-app-diskman/luasrc/view/diskman/disk_info.htm
+++ b/luci-app-diskman/luasrc/view/diskman/disk_info.htm
@ -1,108 +0,0 @@
-<script type="text/javascript">
-  window.onload = function () {
-    //disk partition info
-    let p_colors = ["#c0c0ff", "#fbbd00", "#e97c30", "#a0e0a0", "#e0c0ff"]
-    let lines = document.querySelectorAll('[id^=cbi-disk-]')
-    lines.forEach((item) => {
-      let dev = item.id.match(/cbi-disk-(.*)/)[1]
-      if (dev == "table") { return }
-      XHR.get('<%=luci.dispatcher.build_url("admin/system/diskman/get_disk_info")%>/' + dev, null, (x, disk_info) => {
-        // handle disk info
-        item.childNodes.forEach((cell) => {
-          if (cell && cell.attributes) {
-            if (cell.getAttribute("data-name") == "sn" || cell.childNodes[1] && cell.childNodes[1].id.match(/sn/)) {
-              cell.innerText = disk_info.sn || "-"
-            } else if (cell.getAttribute("data-name") == "temp" || cell.childNodes[1] && cell.childNodes[1].id.match(/temp/)) {
-              cell.innerText = disk_info.temp || "-"
-            } else if (cell.getAttribute("data-name") == "p_table" || cell.childNodes[1] && cell.childNodes[1].id.match(/p_table/)) {
-              cell.innerText = disk_info.p_table || "-"
-            } else if (cell.getAttribute("data-name") == "sata_ver" || cell.childNodes[1] && cell.childNodes[1].id.match(/sata_ver/)) {
-              cell.innerText = disk_info.sata_ver || "-"
-            } else if (cell.getAttribute("data-name") == "health" || cell.childNodes[1] && cell.childNodes[1].id.match(/health/)) {
-              cell.innerText = disk_info.health || "-"
-            } else if (cell.getAttribute("data-name") == "status" || cell.childNodes[1] && cell.childNodes[1].id.match(/status/)) {
-              cell.innerText = disk_info.status || "-"
-            }
-          }
-        })
-        // handle partitons info
-        if (disk_info.partitions && disk_info.partitions.length > 0) {
-          let partitons_div
-          if (item.nodeName == "TR") {
-            partitons_div = '<tr width="100%" style="white-space:nowrap;"><td style="margin:0px; padding:0px; border:0px; white-space:nowrap;" colspan="15">'
-          } else if (item.nodeName == "DIV") {
-            partitons_div = '<div class="tr cbi-section-table-row cbi-rowstyle-1"><div style="white-space:nowrap; position:absolute; width:100%">'
-          }
-          let expand = 0
-          let need_expand = 0
-          disk_info.partitions.forEach((part) => {
-            let p = part.size / disk_info.size * 100
-            if (p <= 8) {
-              expand += 8
-              need_expand += p
-              part.part_percent = 8
-            }
-          })
-          let n = 0
-          disk_info.partitions.forEach((part) => {
-            let p = part.size / disk_info.size * 100
-            if (p > 8) {
-              part.part_percent = p * (100 - expand) / (100 - need_expand)
-            }
-            let part_percent = part.part_percent + '%'
-            let p_color = p_colors[n++]
-            if (n > 4) { n = 0 }
-            let inline_txt = (part.name != '-' && part.name || '') + ' ' + (part.fs != 'Free Space' && part.fs || '') + ' ' + part.size_formated + ' ' + (part.useage != '-' && part.useage || '')
-            let partiton_div = '<div title="' + inline_txt + '" style="color: #525F7F; display:inline-block; text-align:center;background-color:' + p_color + '; width:' + part_percent + '">' + inline_txt + '</div>'
-            partitons_div += partiton_div
-          })
-          if (item.nodeName == "TR") {
-            partitons_div += '</td></tr>'
-          } else if (item.nodeName == "DIV") {
-            partitons_div += '</div><div>&nbsp</div></div>'
-          }
-          item.insertAdjacentHTML('afterend', partitons_div);
-        }
-      })
-    })
-    //raid table
-    lines = document.querySelectorAll('[id^=cbi-_raid-]')
-    lines.forEach((item) => {
-      let dev = item.id.match(/cbi-_raid-(.*)/)[1]
-      if (dev == "table") { return }
-      console.log(dev)
-      XHR.get('<%=luci.dispatcher.build_url("admin/system/diskman/get_disk_info")%>/' + dev, null, (x, disk_info) => {
-        // handle raid info
-        item.childNodes.forEach((cell) => {
-          if (cell && cell.attributes) {
-            if (cell.getAttribute("data-name") == "p_table" || cell.childNodes[1] && cell.childNodes[1].id.match(/p_table/)) {
-                  cell.innerText = disk_info.p_table || "-"
-                }
-          }
-        })
-        // handle partitons info
-        let partitons_div
-        if (item.nodeName == "TR") {
-          partitons_div = '<tr width="100%" style="white-space:nowrap;"><td style="margin:0px; padding:0px; border:0px; white-space:nowrap;" colspan="15">'
-        } else if (item.nodeName == "DIV") {
-          partitons_div = '<div class="tr cbi-section-table-row cbi-rowstyle-1"><div style="white-space:nowrap; position:absolute; width:100%">'
-        }
-        let n = 0
-        disk_info.partitions.forEach((part) => {
-          let part_percent = part.size / disk_info.size * 100 + '%'
-          let p_color = p_colors[n++]
-          if (n > 4) { n = 0 }
-          let inline_txt = (part.name != '-' && part.name || '') + ' ' + (part.fs != 'Free Space' && part.fs || '') + ' ' + part.size_formated + ' ' + (part.useage != '-' && part.useage || '')
-          let partiton_div = '<div title="' + inline_txt + '" style="display:inline-block; text-align:center;background-color:' + p_color + '; width:' + part_percent + '">' + inline_txt + '</div>'
-          partitons_div += partiton_div
-        })
-        if (item.nodeName == "TR") {
-          partitons_div += '</td></tr>'
-        } else if (item.nodeName == "DIV") {
-          partitons_div += '</div><div>&nbsp</div></div>'
-        }
-        item.insertAdjacentHTML('afterend', partitons_div);
-      })
-    })
-  }
-</script>
--- a/luci-app-diskman/luasrc/view/diskman/partition_info.htm
+++ b/luci-app-diskman/luasrc/view/diskman/partition_info.htm
@ -1,129 +0,0 @@
-<style type="text/css">
-  #dialog_format {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    background: rgba(0, 0, 0, 0.7);
-    display: none;
-    z-index: 20000;
-  }
-
-  #dialog_format .dialog_box {
-    position: relative;
-    background: rgba(255, 255, 255);
-    top: 35%;
-    width: 40%;
-    min-width: 20em;
-    margin: auto;
-    display: flex;
-    flex-wrap: wrap;
-    height:auto;
-    align-items: center;
-  }
-
-  #dialog_format .dialog_line {
-    margin-top: .5em;
-    margin-bottom: .5em;
-    margin-left: 2em;
-    margin-right: 2em;
-  }
-
-  #dialog_format .dialog_box>h4,
-  #dialog_format .dialog_box>p,
-  #dialog_format .dialog_box>div {
-    flex-basis: 100%;
-  }
-
-  #dialog_format .dialog_box>img {
-    margin-right: 1em;
-    flex-basis: 32px;
-  }
-
-  body.dialog-format-active {
-    overflow: hidden;
-    height: 100vh;
-  }
-
-  body.dialog-format-active #dialog_format {
-    display: block;
-  }
-</style>
-<script type="text/javascript">//<![CDATA[
-  function show_detail(dev, e) {
-    e.preventDefault()
-    window.open('<%=luci.dispatcher.build_url("admin/system/diskman/smartdetail")%>/' + dev,
-      'newwindow', 'height=480,width=800,top=100,left=200,toolbar=no,menubar=no,scrollbars=yes, resizable=no,location=no, status=no')
-  }
-  window.onload = function () {
-    // handle partition table
-    const btn_p_table = document.getElementById("widget.cbid.table.1.p_table") || document.getElementById("cbid.table.1.p_table")
-    const btn_p_table_raw_index = btn_p_table.selectedIndex
-    const val_name = document.getElementById("cbi-table-1-path").innerText.split('/').pop()
-    btn_p_table.onchange = function () {
-      let btn_p_table_index = btn_p_table.selectedIndex
-      if (btn_p_table_index != btn_p_table_raw_index) {
-        if (confirm("<%:Warnning !! \nTHIS WILL OVERWRITE EXISTING PARTITIONS!! \nModify the partition table?%>")) {
-          let p_table = btn_p_table.options[btn_p_table_index].value
-          XHR.get('<%=luci.dispatcher.build_url("admin/system/diskman/mk_p_table")%>', { dev: val_name, p_table: p_table }, (x, res) => {
-            if (res.code == 0) {
-              location.reload();
-            }
-          }
-          );
-        }
-        else {
-        }
-      }
-    }
-    // handle smartinfo
-    const url = location.href.split('/')
-    const dev = url[url.length - 1]
-    const btn_smart_detail = document.getElementById("cbi-table-1-health")
-    btn_smart_detail.children[0].onclick = show_detail.bind(this, dev)
-  }
-  function close_dialog() {
-    document.body.classList.remove('dialog-format-active')
-    document.documentElement.style.overflowY = 'scroll'
-  }
-  function do_format(partation_name){
-    let fs = document.getElementById("filesystem_list").value
-    let status = document.getElementById("format-status")
-    if(!fs) {
-      status.innerHTML = "<%:Please select file system!%>"
-      return
-    }
-    status.innerHTML = "<%:Formatting..%>"
-    let b = document.getElementById('btn_format')
-    b.disabled = true
-    let xhr = new XHR()
-    xhr.post('<%=luci.dispatcher.build_url("admin/system/diskman/format_partition")%>', { partation_name: partation_name, file_system: fs }, (x, res) => {
-      if (x.status == 200) {
-        status.innerHTML = x.statusText
-        location.reload();
-      }else{
-        status.innerHTML = x.statusText
-      }
-    })
-  }
-
-  function clear_text(){
-    let s = document.getElementById('format-status')
-    s.innerHTML = ""
-    let b = document.getElementById('btn_format')
-    b.disabled = false
-  }
-
-  function partition_format(partition_name, format_cmd, current_fs){
-    let list = ''
-    format_cmd.split(",").forEach(e => {
-      list = list + '<option value="'+e+'">'+e+'</option>'
-    });
-    document.getElementById('dialog_format') || document.body.insertAdjacentHTML("beforeend", '<div id="dialog_format"><div class="dialog_box"><div class="dialog_line"></div><div class="dialog_line"><span><%:Format partation:%> <b>'+partition_name+'</b></span><br><span id="format-status" style="color: red;"></span></div><div class="dialog_line"><select id="filesystem_list" class="cbi-input-select" onchange="clear_text()">'+list+'</select></div><div class="dialog_line" style="text-align: right;"><input type="button" class="cbi-button cbi-button-apply" id="btn_format" type="submit" value="<%:Format%>" onclick="do_format(`'+partition_name+'`)" /> <input type="button"class="cbi-button cbi-button-reset" type="reset" value="<%:Cancel%>" onclick="close_dialog()" /></div><div class="dialog_line"></div></div></div>>')
-    document.body.classList.add('dialog-format-active')
-    document.documentElement.style.overflowY = 'hidden'
-    let fs_list = document.getElementById("filesystem_list")
-    fs_list.value = current_fs
-  }
-</script>
--- a/luci-app-diskman/luasrc/view/diskman/smart_detail.htm
+++ b/luci-app-diskman/luasrc/view/diskman/smart_detail.htm
@ -1,79 +0,0 @@
-<html>
-<head>
-  <title>S.M.A.R.T detail of <%=dev%></title>
-  <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
-  <script type="text/javascript">//<![CDATA[
-    let formData = new FormData()
-    let xhr = new XMLHttpRequest()
-    xhr.open("GET", '<%=luci.dispatcher.build_url("admin", "system", "diskman", "smartattr", dev)%>', true)
-    xhr.onload = function () {
-      let st = JSON.parse(xhr.responseText)
-      let tb = document.getElementById('smart_attr_table');
-      if (st && tb) {
-        /* clear all rows */
-        while (tb.rows.length > 1)
-          tb.deleteRow(1);
-
-        for (var i = 0; i < st.length; i++) {
-          var tr = tb.insertRow(-1);
-          tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
-          var td = null
-            <% if dev: match("nvme") then %>
-              tr.insertCell(-1).innerHTML = st[i].key;
-          tr.insertCell(-1).innerHTML = st[i].value;
-            <% else %>
-            tr.insertCell(-1).innerHTML = st[i].id;
-          tr.insertCell(-1).innerHTML = st[i].attrbute;
-          tr.insertCell(-1).innerHTML = st[i].flag;
-          tr.insertCell(-1).innerHTML = st[i].value;
-          tr.insertCell(-1).innerHTML = st[i].worst;
-          tr.insertCell(-1).innerHTML = st[i].thresh;
-          tr.insertCell(-1).innerHTML = st[i].type;
-          tr.insertCell(-1).innerHTML = st[i].updated;
-          tr.insertCell(-1).innerHTML = st[i].raw;
-          if ((st[i].id == '05' || st[i].id == 'C5') && st[i].raw != '0') {
-            tr.style.cssText = "background-color:red !important;";
-          }
-            <% end %>
-          }
-        if (tb.rows.length == 1) {
-          var tr = tb.insertRow(-1);
-          tr.className = 'cbi-section-table-row';
-          var td = tr.insertCell(-1);
-          td.colSpan = 4;
-          td.innerHTML = '<em><br /><%:No Attrbute to display.%></em>';
-        }
-      }
-    }
-    xhr.send(formData)
-    //]]></script>
-</head>
-<body>
-  <div id="maincontainer">
-    <fieldset class="cbi-section">
-      <legend><%:S.M.A.R.T Attrbutes%>: /dev/<%=dev%></legend>
-      <table class="cbi-section-table" id="smart_attr_table">
-        <tr class="cbi-section-table-titles">
-          <% if dev:match("nvme") then %>
-          <!-- <th class="cbi-section-table-cell"><%:KEY%></th>
-            <th class="cbi-section-table-cell"><%:VALUE%></th> -->
-          <% else %>
-          <th class="cbi-section-table-cell"><%:ID%></th>
-          <th class="cbi-section-table-cell"><%:Attrbute%></th>
-          <th class="cbi-section-table-cell"><%:Flag%></th>
-          <th class="cbi-section-table-cell"><%:Value%></th>
-          <th class="cbi-section-table-cell"><%:Worst%></th>
-          <th class="cbi-section-table-cell"><%:Thresh%></th>
-          <th class="cbi-section-table-cell"><%:Type%></th>
-          <th class="cbi-section-table-cell"><%:Updated%></th>
-          <th class="cbi-section-table-cell"><%:Raw%></th>
-          <% end %>
-        </tr>
-        <tr class="cbi-section-table-row">
-          <td colspan="4"><em><br /><%:Collecting data...%></em></td>
-        </tr>
-      </table>
-    </fieldset>
-  </div>
-</body>
-</html>
--- a/luci-app-diskman/po/zh-cn/diskman.po
+++ b/luci-app-diskman/po/zh-cn/diskman.po
@ -1,239 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8\n"
-
-msgid "DiskMan"
-msgstr "DiskMan 磁盘管理"
-
-msgid "Manage Disks over LuCI."
-msgstr "通过 LuCI 管理磁盘"
-
-msgid "Rescan Disks"
-msgstr "重新扫描磁盘"
-
-msgid "Disks"
-msgstr "磁盘"
-
-msgid "Path"
-msgstr "路径"
-
-msgid "Serial Number"
-msgstr "序列号"
-
-msgid "Temp"
-msgstr "温度"
-
-msgid "Partition Table"
-msgstr "分区表"
-
-msgid "SATA Version"
-msgstr "SATA 版本"
-
-msgid "Health"
-msgstr "健康"
-
-msgid "File System"
-msgstr "文件系统"
-
-msgid "Mount Options"
-msgstr "挂载选项"
-
-msgid "Mount"
-msgstr "挂载"
-
-msgid "Umount"
-msgstr "卸载"
-
-msgid "Eject"
-msgstr "弹出"
-
-msgid "New"
-msgstr "创建"
-
-msgid "Remove"
-msgstr "移除"
-
-msgid "Format"
-msgstr "格式化"
-
-msgid "Start Sector"
-msgstr "起始扇区"
-
-msgid "End Sector"
-msgstr "中止扇区"
-
-msgid "Usage"
-msgstr "用量"
-
-msgid "Used"
-msgstr "已使用"
-
-msgid "Free Space"
-msgstr "空闲空间"
-
-msgid "Model"
-msgstr "型号"
-
-msgid "Size"
-msgstr "容量"
-
-msgid "Status"
-msgstr "状态"
-
-msgid "Mount Point"
-msgstr "挂载点"
-
-msgid "Sector Size"
-msgstr "扇区/物理扇区大小"
-
-msgid "Rotation Rate"
-msgstr "转速"
-
-msgid "RAID Devices"
-msgstr "RAID 设备"
-
-msgid "RAID mode"
-msgstr "RAID 模式"
-
-msgid "Members"
-msgstr "成员"
-
-msgid "Active"
-msgstr "活动"
-
-msgid "RAID Creation"
-msgstr "RAID 创建"
-
-msgid "Raid Name"
-msgstr "RAID 名称"
-
-msgid "Raid Level"
-msgstr "RAID 级别"
-
-msgid "Raid Member"
-msgstr "磁盘阵列成员"
-
-msgid "Create Raid"
-msgstr "创建 RAID"
-
-msgid "Partition Management"
-msgstr "分区管理"
-
-msgid "Partition Disk over LuCI."
-msgstr "通过LuCI分区磁盘。"
-
-msgid "Device Info"
-msgstr "设备信息"
-
-msgid "Disk Man"
-msgstr "磁盘管理"
-
-msgid "Partitions Info"
-msgstr "分区信息"
-
-msgid "Default 2048 sector alignment, support +size{b,k,m,g,t} in End Sector"
-msgstr "默认2048扇区对齐，【中止扇区】支持 +容量{b,k,m,g,t} 格式，例：+500m +10g +1t"
-
-msgid "Multiple Devices Btrfs Creation"
-msgstr "Btrfs 阵列创建"
-
-msgid "Label"
-msgstr "卷标"
-
-msgid "Btrfs Label"
-msgstr "Btrfs 卷标"
-
-msgid "Btrfs Raid Level"
-msgstr "Btrfs Raid 级别"
-
-msgid "Btrfs Member"
-msgstr "Btrfs 整列成员"
-
-msgid "Create Btrfs"
-msgstr "创建 Btrfs"
-
-msgid "New Snapshot"
-msgstr "新建快照"
-
-msgid "SubVolumes"
-msgstr "子卷"
-
-msgid "Top Level"
-msgstr "父ID"
-
-msgid "Manage Btrfs"
-msgstr "Btrfs 管理"
-
-msgid "Otime"
-msgstr "创建时间"
-
-msgid "Snapshots"
-msgstr "快照"
-
-msgid "Set Default"
-msgstr "默认子卷"
-
-msgid "Source Path"
-msgstr "源目录"
-
-msgid "Readonly"
-msgstr "只读"
-
-msgid "Delete"
-msgstr "删除"
-
-msgid "Create"
-msgstr "创建"
-
-msgid "Destination Path (optional)"
-msgstr "目标目录（可选）"
-
-msgid "Metadata"
-msgstr "元数据"
-
-msgid "Data"
-msgstr "数据"
-
-msgid "Btrfs Info"
-msgstr "Btrfs 信息"
-
-msgid "The source path for create the snapshot"
-msgstr "创建快照的源数据目录"
-
-msgid "The path where you want to store the snapshot"
-msgstr "存放快照数据目录"
-
-msgid "Please input Source Path of snapshot, Source Path must start with '/'"
-msgstr "请输入快照源路径，源路径必须以'/'开头"
-
-msgid "Please input Subvolume Path, Subvolume must start with '/'"
-msgstr "请输入子卷路径，子卷路径必须以'/'开头"
-
-msgid "is in use! please unmount it first!"
-msgstr "正在被使用！请先卸载！"
-
-msgid "Partition NOT found!"
-msgstr "分区未找到！"
-
-msgid "Filesystem NOT support!"
-msgstr "文件系统不支持！"
-
-msgid "Invalid Start Sector!"
-msgstr "无效的起始扇区！"
-
-msgid "Invalid End Sector"
-msgstr "无效的终止扇区！"
-
-msgid "Partition not exists!"
-msgstr "分区不存在！"
-
-msgid "Creation"
-msgstr "创建"
-
-msgid "Please select file system!"
-msgstr "请选择文件系统！"
-
-msgid "Format partation:"
-msgstr "格式化分区："
-
-msgid "Warnning !! \nTHIS WILL OVERWRITE EXISTING PARTITIONS!! \nModify the partition table?"
-msgstr "警告！！\n此操作会覆盖现有分区\n确定修改分区表？"
--- a/luci-app-dsvpn/Makefile
+++ b/luci-app-dsvpn/Makefile
--- a/luci-app-dsvpn/htdocs/luci-static/resources/view/services/dsvpn.js
+++ b/luci-app-dsvpn/htdocs/luci-static/resources/view/services/dsvpn.js
--- a/luci-app-dsvpn/po/fr/dsvpn.po
+++ b/luci-app-dsvpn/po/fr/dsvpn.po
--- a/luci-app-dsvpn/po/fr/dsvpn.po~
+++ b/luci-app-dsvpn/po/fr/dsvpn.po~
--- a/luci-app-dsvpn/po/ru/dsvpn.po
+++ b/luci-app-dsvpn/po/ru/dsvpn.po
--- a/luci-app-dsvpn/po/templates/dsvpn.pot
+++ b/luci-app-dsvpn/po/templates/dsvpn.pot
--- a/luci-app-dsvpn/po/zh_Hans/dsvpn.po
+++ b/luci-app-dsvpn/po/zh_Hans/dsvpn.po
--- a/luci-app-dsvpn/po/zh_Hans/dsvpn.po~
+++ b/luci-app-dsvpn/po/zh_Hans/dsvpn.po~
--- a/luci-app-dsvpn/root/usr/share/luci/menu.d/luci-app-dsvpn.json
+++ b/luci-app-dsvpn/root/usr/share/luci/menu.d/luci-app-dsvpn.json
--- a/luci-app-dsvpn/root/usr/share/rpcd/acl.d/luci-app-dsvpn.json
+++ b/luci-app-dsvpn/root/usr/share/rpcd/acl.d/luci-app-dsvpn.json
--- a/luci-app-firewall/Makefile
+++ b/luci-app-firewall/Makefile
--- a/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+++ b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
--- a/Show more
+++ b/Show more