ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-21 06:33:41 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

base-files: add an experimental "-c" flag which tries to preserve *all* changed files in /overlay/etc minus some system files

Browse Source 
SVN-Revision: 22977
This commit is contained in:
Jo-Philipp Wich 2010-09-07 22:20:26 +00:00
parent 1cd4b50164
commit 91118a9500
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=52 PKG_RELEASE:=54
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host PKG_BUILD_DEPENDS:=opkg/host

21
package/base-files/files/sbin/sysupgrade
View File

@ -7,8 +7,10 @@ RAMFS_COPY_DATA="" # extra data files
export INTERACTIVE=0 export INTERACTIVE=0
export VERBOSE=1 export VERBOSE=1
export SAVE_CONFIG=1 export SAVE_CONFIG=1
export SAVE_OVERLAY=0
export DELAY= export DELAY=
export CONF_IMAGE= export CONF_IMAGE=
# parse options # parse options
while [ -n "$1" ]; do while [ -n "$1" ]; do
case "$1" in case "$1" in
@ -17,6 +19,7 @@ while [ -n "$1" ]; do
-v) export VERBOSE="$(($VERBOSE + 1))";; -v) export VERBOSE="$(($VERBOSE + 1))";;
-q) export VERBOSE="$(($VERBOSE - 1))";; -q) export VERBOSE="$(($VERBOSE - 1))";;
-n) export SAVE_CONFIG=0;; -n) export SAVE_CONFIG=0;;
-c) export SAVE_OVERLAY=1;;
-f) export CONF_IMAGE="$2"; shift;; -f) export CONF_IMAGE="$2"; shift;;
-*) -*)
echo "Invalid option: $1" echo "Invalid option: $1"
@ -41,7 +44,8 @@ Options:
-d <delay> add a delay before rebooting -d <delay> add a delay before rebooting
-f <config> restore configuration from .tar.gz (file or url) -f <config> restore configuration from .tar.gz (file or url)
-i interactive mode -i interactive mode
-n do not save configuration over reflash -c attempt to preserve all changed files in /etc/
-n do not save configuration over reflash
-q less verbose -q less verbose
-v more verbose -v more verbose
@ -56,9 +60,22 @@ add_uci_conffiles() {
return 0 return 0
} }
add_overlayfiles() {
local file="$1"
find /overlay/etc/ -type f | sed \
-e 's,^/overlay/,/,' \
-e '\,/META_[a-zA-Z0-9]*$,d' \
-e '\,/functions.sh$,d' \
-e '\,/[^/]*-opkg$,d' \
> "$file"
return 0
}
# hooks # hooks
sysupgrade_image_check="platform_check_image" sysupgrade_image_check="platform_check_image"
sysupgrade_init_conffiles="add_uci_conffiles" [ $SAVE_OVERLAY = 0 -o ! -d /overlay/etc ] && \
sysupgrade_init_conffiles="add_uci_conffiles" || \
sysupgrade_init_conffiles="add_overlayfiles"
include /lib/upgrade include /lib/upgrade