diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 04dd9fb14f..5a3ea11321 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=28 +PKG_RELEASE:=29 include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/autocore/files/index.htm b/package/lean/autocore/files/index.htm index 4fb64e9f85..22d1a55470 100644 --- a/package/lean/autocore/files/index.htm +++ b/package/lean/autocore/files/index.htm @@ -52,13 +52,7 @@ local user_info = tonumber(luci.sys.exec("cat /proc/net/arp | grep '0x2' | wc -l")) or 0 - local cpu_usage - - if fs.readfile("/tmp/cpuusage") then - cpu_usage = luci.sys.exec("cat /tmp/cpuusage") - else - cpu_usage = "6.6%" - end + local cpu_usage = fs.readfile("/tmp/cpuusage") or "6.6%" luci.sys.exec("/sbin/getcpu &") diff --git a/package/lean/autosamba/Makefile b/package/lean/autosamba/Makefile index b035f9bb47..a03161d14e 100644 --- a/package/lean/autosamba/Makefile +++ b/package/lean/autosamba/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autosamba PKG_VERSION:=1 -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_ARCH:=all include $(INCLUDE_DIR)/package.mk @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk define Package/autosamba TITLE:=Samba autoconfig hotplug script. MAINTAINER:=Lean - DEPENDS:=+luci-app-samba + DEPENDS:=+luci-app-samba +wsdd2 endef define Package/autosamba/description diff --git a/target/linux/ar71xx/base-files/etc/init.d/ar71xx_clock b/target/linux/ar71xx/base-files/etc/init.d/ar71xx_clock index e302ea4f2c..fa43263f9e 100755 --- a/target/linux/ar71xx/base-files/etc/init.d/ar71xx_clock +++ b/target/linux/ar71xx/base-files/etc/init.d/ar71xx_clock @@ -5,11 +5,8 @@ START=99 start() { - a=$(cat /tmp/sysinfo/model) + a=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /machine/ {print $2}' /proc/cpuinfo) b=$(dmesg | awk -F 'CPU:|MHz' '/Clocks:/{print $2+0}') - c=${a}" CPU:"${b}Mhz + c=${a}" CPU "${b}Mhz echo -n $c > /tmp/sysinfo/model } - - -