OpenWrt/openwrt-packages
1
0
Fork 0
mirror of https://github.com/kenzok8/openwrt-packages.git synced 2025-10-30 07:50:37 +08:00
Code Issues Projects Releases Wiki Activity

update 2025-06-20 02:25:12

Browse Source
This commit is contained in:
actions-user
2025-06-20 02:25:12 +08:00
parent e476dd7107
commit 52b7c300cb
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-store/Makefile
View File

@ -11,7 +11,7 @@ LUCI_DEPENDS:=+curl +opkg +luci-base +tar +libuci-lua +mount-utils +luci-lib-tas
LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.19)
LUCI_PKGARCH:=all
PKG_VERSION:=0.1.29-4
PKG_VERSION:=0.1.29-5
# PKG_RELEASE MUST be empty for luci.mk
PKG_RELEASE:=

12
luci-app-store/root/usr/libexec/istore/overlay-backup
View File

@ -143,11 +143,16 @@ restore() {
if echo "${BACKUP_PATH_FILE}" | grep -q '\.s\.overlay\.tar\.gz$' ; then
local uuid label device line
local uci_section=$(uci -c /overlay/upper/etc/config show fstab | grep '^fstab\.@mount\[[0-9]*\]\.target='"'/overlay'\$" | head -1 | grep -o '^fstab\.@mount\[[0-9]*\]')
if [ -z "$uci_section" ]; then
echo "failed to find sandbox config, there is debug info:"
uci -c /overlay/upper/etc/config show fstab | grep '^fstab\.[^.]*\.target='"'/overlay'\$"
exit 1
fi
while read line; do
export -n "$line"
done < <(
uci -c /overlay/upper/etc/config show "$uci_section" | sed -e '/^fstab\.[^\.]*=/d' -e 's/^fstab\.[^\.]*\.//g' | grep -e '^uuid=' -e '^label=' -e '^device=' | sed "s/'//g"
)
done <<EOF
$(uci -c /overlay/upper/etc/config show "$uci_section" | sed -e '/^fstab\.[^\.]*=/d' -e 's/^fstab\.[^\.]*\.//g' | grep -e '^uuid=' -e '^label=' -e '^device=' | sed "s/'//g")
EOF
SANDBOX_UUID=$uuid
SANDBOX_LABEL=$label
SANDBOX_DEVICE=$device
@ -191,6 +196,7 @@ filter_backups() {
get_backup_file_list() {
if [ -n "$1" ]; then
( cd "$1" && ls backup_overlay_*.overlay.tar.gz | filter_backups )
return 0
else
echo "input backup path is null"
exit 1