From 3712d3e4142ffb518b404a0ca44dc59d3acf4847 Mon Sep 17 00:00:00 2001
From: jjm2473 <1129525450@qq.com>
Date: Sun, 15 May 2022 10:37:27 +0800
Subject: [PATCH] istoreos: accept wan input by default

---
 package/istoreos-files/Makefile                           | 4 ++--
 package/istoreos-files/files/etc/uci-defaults/09_istoreos | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/istoreos-files/Makefile b/package/istoreos-files/Makefile
index a8cc0f16de..93aef2e865 100644
--- a/package/istoreos-files/Makefile
+++ b/package/istoreos-files/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=istoreos-files
-PKG_VERSION:=1
-PKG_RELEASE:=1
+PKG_VERSION:=1.0
+PKG_RELEASE:=$(COMMITCOUNT)
 PKG_FLAGS:=hold essential nonshared
 
 PKG_LICENSE:=CC0-1.0
diff --git a/package/istoreos-files/files/etc/uci-defaults/09_istoreos b/package/istoreos-files/files/etc/uci-defaults/09_istoreos
index 35798cf441..e35f6f2a8a 100644
--- a/package/istoreos-files/files/etc/uci-defaults/09_istoreos
+++ b/package/istoreos-files/files/etc/uci-defaults/09_istoreos
@@ -9,7 +9,7 @@ EOF
 
 uci set dockerd.globals.data_root=/overlay/upper/opt/docker
 
-if grep -q nas /proc/device-tree/chosen/default-firewall; then
+if [ ! -f /proc/device-tree/chosen/default-firewall ] || grep -qFw nas /proc/device-tree/chosen/default-firewall; then
     uci -q batch <<-EOF >/dev/null
         delete ucitrack.@wan_drop[-1]
         add ucitrack wan_drop