From 55de4b993f9737bb5c0675e0d1080932ab7896b8 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 14 Feb 2020 17:26:25 +0800 Subject: [PATCH] Revert "add package luci-app-nfs (#2908)" (#3073) This reverts commit 9b593a88b07217315c239ca92d68d2754a3d062d. --- package/lean/luci-app-nfs/Makefile | 18 ---- .../luci-app-nfs/luasrc/controller/nfs.lua | 8 -- .../luci-app-nfs/luasrc/model/cbi/nfs.lua | 65 ------------- package/lean/luci-app-nfs/po/zh_Hans/nfs.po | 44 --------- .../luci-app-nfs/po/zh_Hans/nfs.zh-cn.lmo | Bin 288 -> 0 bytes package/lean/luci-app-nfs/root/etc/config/nfs | 6 -- package/lean/luci-app-nfs/root/etc/init.d/nfs | 86 ------------------ .../luci-app-nfs/root/etc/uci-defaults/nfs | 14 --- 8 files changed, 241 deletions(-) delete mode 100644 package/lean/luci-app-nfs/Makefile delete mode 100644 package/lean/luci-app-nfs/luasrc/controller/nfs.lua delete mode 100644 package/lean/luci-app-nfs/luasrc/model/cbi/nfs.lua delete mode 100644 package/lean/luci-app-nfs/po/zh_Hans/nfs.po delete mode 100644 package/lean/luci-app-nfs/po/zh_Hans/nfs.zh-cn.lmo delete mode 100644 package/lean/luci-app-nfs/root/etc/config/nfs delete mode 100644 package/lean/luci-app-nfs/root/etc/init.d/nfs delete mode 100644 package/lean/luci-app-nfs/root/etc/uci-defaults/nfs diff --git a/package/lean/luci-app-nfs/Makefile b/package/lean/luci-app-nfs/Makefile deleted file mode 100644 index f4b299e015..0000000000 --- a/package/lean/luci-app-nfs/Makefile +++ /dev/null @@ -1,18 +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 support for nfs -LUCI_DEPENDS:= -LUCI_PKGARCH:=all -PKG_NAME:=luci-app-nfs -PKG_VERSION:=1.0 -PKG_RELEASE:=1 - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature - diff --git a/package/lean/luci-app-nfs/luasrc/controller/nfs.lua b/package/lean/luci-app-nfs/luasrc/controller/nfs.lua deleted file mode 100644 index 9807fb2130..0000000000 --- a/package/lean/luci-app-nfs/luasrc/controller/nfs.lua +++ /dev/null @@ -1,8 +0,0 @@ -module("luci.controller.nfs", package.seeall) - -function index() - if not nixio.fs.access("/etc/config/nfs") then - return - end - entry({"admin", "nas", "nfs"}, cbi("nfs"), _("NFS Manage"), 5).dependent = true -end diff --git a/package/lean/luci-app-nfs/luasrc/model/cbi/nfs.lua b/package/lean/luci-app-nfs/luasrc/model/cbi/nfs.lua deleted file mode 100644 index 3c3267752f..0000000000 --- a/package/lean/luci-app-nfs/luasrc/model/cbi/nfs.lua +++ /dev/null @@ -1,65 +0,0 @@ -local fs = require "nixio.fs" - -m = Map("nfs", translate("NFS Manage")) - --- NFS Share -- -s = m:section(TypedSection, "share", translate("Shared Directories")) -s.anonymous = true -s.addremove = true -s.template = "cbi/tblsection" - -en = s:option(Flag, "enabled", translate("Enable")) -en.rmempty = false -en.default = "1" - -ph1 = s:option(Value, "path", translate("Path")) -ph1.placeholder = "/mnt" -ph1.rmempty = false -ph1.optional = false - -ct = s:option(Value, "clients", translate("Clients")) -ct.placeholder = "192.168.1.0/24" -ct.rmempty = false -ct.optional = false - -op = s:option(Value, "options", translate("options")) -op.placeholder = "rw,sync,root_squash,all_squash,insecure,no_subtree_check" -op.rmempty = false -op.optional = false - --- NFS Mount -- -c = m:section(TypedSection, "mount", translate("Mounted Points")) -c.anonymous = true -c.addremove = true -c.template = "cbi/tblsection" - -en = c:option(Flag, "enabled", translate("Enable")) -en.default = "1" -en.rmempty = false - -sr = c:option(Value, "source", translate("source")) -sr.placeholder = "192.168.1.1:/mnt/*" -sr.rmempty = false -sr.optional = false - -ph2 = c:option(Value, "target", translate("target")) -ph2.placeholder = "/mnt/nfs/*" -ph2.rmempty = false -ph2.optional = false - -op = c:option(Value, "options", translate("options")) -op.placeholder = "rw,nolock" -op.rmempty = false -op.optional = false - -de = c:option(Value, "delay", translate("delay")) -de.placeholder = "5" -de.rmempty = false -de.optional = false - -if nixio.fs.access("/etc/config/fstab") then - ph1.titleref = luci.dispatcher.build_url("admin", "system", "mounts") - ph2.titleref = luci.dispatcher.build_url("admin", "system", "mounts") -end - -return m diff --git a/package/lean/luci-app-nfs/po/zh_Hans/nfs.po b/package/lean/luci-app-nfs/po/zh_Hans/nfs.po deleted file mode 100644 index 1ae9fab84d..0000000000 --- a/package/lean/luci-app-nfs/po/zh_Hans/nfs.po +++ /dev/null @@ -1,44 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-1\n" -"PO-Revision-Date: 2016-03-1 21:36+0800\n" -"Last-Translator: leenchan\n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"Language-Team: \n" -"X-Generator: Poedit 1.8.1\n" - -msgid "NFS Manage" -msgstr "NFS 管理" - -msgid "Shared Directories" -msgstr "共享目录" - -msgid "Enable" -msgstr "启用" - -msgid "Path" -msgstr "路径" - -msgid "Clients" -msgstr "允许的客户端" - -msgid "Mounted Points" -msgstr "已挂载的目录" - -msgid "source" -msgstr "源目录" - -msgid "target" -msgstr "挂载到" - -msgid "options" -msgstr "选项" - -msgid "delay" -msgstr "延迟时间" diff --git a/package/lean/luci-app-nfs/po/zh_Hans/nfs.zh-cn.lmo b/package/lean/luci-app-nfs/po/zh_Hans/nfs.zh-cn.lmo deleted file mode 100644 index 76efe6406c1432a9f8e19c9d622df6a955f2c292..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeZs3s!i(ZsGF@Z43-gTQ@%0wfgz&bx-$BeL7+N^C>GB7+!2&|8!pqNUrh4x*gAF zwLD$7=vl}1=d0HP#kOyH*3B|Yvt1KlOa_SL(~b=c3=A(DI$ti_3DmQD z+l&44pH1KPa{3m{*WAlF<1YmPrFlSD=fza}_|J;@Kz0TYv*q(Hc4WP{xdg~o0P!mh z2}JK@SFr=KB|!YvnL(%aDfWZdAiy=p=3Jnz>C`$PI{=6|=jq*e68~#U0gw&CJd1rf s@1;Bb?gFxHfLLgwORvh~{Z9*lYz+|qXyb{!2O8Bu?uh|nP9UxU0Bsd?n*aa+ diff --git a/package/lean/luci-app-nfs/root/etc/config/nfs b/package/lean/luci-app-nfs/root/etc/config/nfs deleted file mode 100644 index 7395846563..0000000000 --- a/package/lean/luci-app-nfs/root/etc/config/nfs +++ /dev/null @@ -1,6 +0,0 @@ - -config share - option enabled '0' - option path '/mnt' - option clients '*' - option options 'rw,sync,root_squash,all_squash,insecure,no_subtree_check' diff --git a/package/lean/luci-app-nfs/root/etc/init.d/nfs b/package/lean/luci-app-nfs/root/etc/init.d/nfs deleted file mode 100644 index 8930bea33f..0000000000 --- a/package/lean/luci-app-nfs/root/etc/init.d/nfs +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh /etc/rc.common -START=45 -STOP=99 -NAME="nfs" - -nfs_share() { - local config="$1" - local enabled - local path - local clients - local options - - config_get_bool enabled "$config" enabled 0 - - for opt in path clients options - do - config_get "$opt" "$config" "$opt" - done - - if [ "$enabled" = 1 ]; then - grep -qs $path /etc/exports - if [ $? -ne 0 ]; then - echo -e "$path\t$clients($options)" >>/etc/exports - exportfs -r - fi - elif [ "$enabled" = 0 ]; then - exportfs -u | grep -qs $path - if [ $? -eq 0 ]; then - exportfs -u $clients:$path - fi - fi - exportfs -r -} - -nfs_share_stop() { - exportfs -au &>/dev/null -} - -nfs_mount() { - local config="$1" - local enabled - local target - local source - local options - local delay - - config_get_bool enabled "$config" enabled 0 - - for opt in target source options delay - do - config_get "$opt" "$config" "$opt" - done - - if [ "$enabled" = 1 ]; then - if [ "$delay" -a $delay -gt 0 ]; then - logger "NetMount: Sleep $delay seconds before mount" - sleep $delay - fi - grep -qs $target /proc/mounts - if [ $? -ne 0 ]; then - mkdir -p $target - logger "NetMount: Mounting $source in $target" - mount -t nfs -o $options $source $target - fi - elif [ "$enabled" = 0 ]; then - if grep -qs $target /proc/mounts; then - umount -fr $target - sleep $delay - fi - fi -} - -start() { - config_load "$NAME" - config_foreach nfs_share share - config_foreach nfs_mount mount -} - -stop() { - nfs_share_stop -} - -restart() { - echo > /etc/exports - start -} diff --git a/package/lean/luci-app-nfs/root/etc/uci-defaults/nfs b/package/lean/luci-app-nfs/root/etc/uci-defaults/nfs deleted file mode 100644 index f7aa1397be..0000000000 --- a/package/lean/luci-app-nfs/root/etc/uci-defaults/nfs +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@nfs[-1] - add ucitrack nfs - set ucitrack.@nfs[-1].init=nfs - commit ucitrack -EOF - -/etc/init.d/nfs enable && /etc/init.d/nfs restart - -rm -f /tmp/luci-indexcache - -exit 0