caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

base-files: implement a --force option for sysupgrade to override image checks, useful to upgrade old ar71xx installations to current trunk ones

Browse Source 
SVN-Revision: 29688
This commit is contained in:
Jo-Philipp Wich 2012-01-08 15:30:37 +00:00
parent 8094fa46da
commit 4e88bcfb00
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/base-files/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007-2011 OpenWrt.org # Copyright (C) 2007-2012 OpenWrt.org
# Copyright (C) 2010 Vertical Communications # Copyright (C) 2010 Vertical Communications
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -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:=100 PKG_RELEASE:=101
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

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

@ -12,6 +12,7 @@ export DELAY=
export CONF_IMAGE= export CONF_IMAGE=
export CONF_BACKUP= export CONF_BACKUP=
export HELP=0 export HELP=0
export FORCE=0
# parse options # parse options
while [ -n "$1" ]; do while [ -n "$1" ]; do
@ -24,6 +25,7 @@ while [ -n "$1" ]; do
-c) export SAVE_OVERLAY=1;; -c) export SAVE_OVERLAY=1;;
-b|--create-backup) export CONF_BACKUP="$2"; shift;; -b|--create-backup) export CONF_BACKUP="$2"; shift;;
-f) export CONF_IMAGE="$2"; shift;; -f) export CONF_IMAGE="$2"; shift;;
-F|--force) export FORCE=1; shift;;
-h|--help) export HELP=1; break;; -h|--help) export HELP=1; break;;
-*) -*)
echo "Invalid option: $1" echo "Invalid option: $1"
@ -54,6 +56,8 @@ Options:
then exit. Does not flash an image. If file is '-', then exit. Does not flash an image. If file is '-',
i.e. stdout, verbosity is set to 0 (i.e. quiet). i.e. stdout, verbosity is set to 0 (i.e. quiet).
-n do not save configuration over reflash -n do not save configuration over reflash
-F / --force
Flash image even if image checks fail, this is dangerous!
-q less verbose -q less verbose
-v more verbose -v more verbose
-h / --help display this help -h / --help display this help
@ -129,8 +133,13 @@ type platform_check_image >/dev/null 2>/dev/null || {
for check in $sysupgrade_image_check; do for check in $sysupgrade_image_check; do
( eval "$check \"\$ARGV\"" ) || { ( eval "$check \"\$ARGV\"" ) || {
echo "Image check '$check' failed." if [ $FORCE -eq 1 ]; then
exit 1 echo "Image check '$check' failed but --force given - will update anyway!"
break
else
echo "Image check '$check' failed."
exit 1
fi
} }
done done