diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 0b5adf25d..8d7ca509f 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=26.4.15 -PKG_RELEASE:=72 +PKG_RELEASE:=73 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index b82a5e83f..38e687115 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 PKG_VERSION:=26.4.10 -PKG_RELEASE:=28 +PKG_RELEASE:=29 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/my-default-settings/Makefile b/my-default-settings/Makefile index a7d85da8f..33028110e 100644 --- a/my-default-settings/Makefile +++ b/my-default-settings/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=my-default-settings PKG_VERSION:=2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 include $(INCLUDE_DIR)/package.mk diff --git a/my-default-settings/files/etc/uci-defaults/99-default-settings b/my-default-settings/files/etc/uci-defaults/99-default-settings index 2cbb5b3be..6f2cc3934 100644 --- a/my-default-settings/files/etc/uci-defaults/99-default-settings +++ b/my-default-settings/files/etc/uci-defaults/99-default-settings @@ -2,7 +2,12 @@ sed -i "s/op.supes.top/dl.openwrt.ai/" /etc/opkg/distfeeds.conf -([ -x /bin/bash ] && ! grep -q "^root.*bash" /etc/passwd) && sed -i "s/^\(root.*\/\)ash/\1bash/g" /etc/passwd +[ -x /bin/bash ] && grep -q "/bin/ash" /etc/passwd && { + sed -i 's|/bin/ash|/bin/bash|g' "/etc/passwd" + ln -sf /bin/bash /bin/sh + touch /root/.bash_history + ln -sf /root/.bash_history /tmp/.busybox_ash_history +} # [[ "$(df | grep overlay)" && ! "$(df | grep /rom/overlay)" ]] && firstboot