projects
/
openwrt
/
staging
/
jow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: sysupgrade: pass "save_partitions" option to the "sysupgrade" method
[openwrt/staging/jow.git]
/
package
/
base-files
/
files
/
lib
/
upgrade
/
stage2
diff --git
a/package/base-files/files/lib/upgrade/stage2
b/package/base-files/files/lib/upgrade/stage2
index 4e5837af833dd7217ca8d9946584a02751eb0138..ff2a9aee057255cd06ac25eceb2001500618757b 100755
(executable)
--- a/
package/base-files/files/lib/upgrade/stage2
+++ b/
package/base-files/files/lib/upgrade/stage2
@@
-6,8
+6,6
@@
export IMAGE="$1"
COMMAND="$2"
export IMAGE="$1"
COMMAND="$2"
-export SAVE_PARTITIONS=1
-
export INTERACTIVE=0
export VERBOSE=1
export CONFFILES=/tmp/sysupgrade.conffiles
export INTERACTIVE=0
export VERBOSE=1
export CONFFILES=/tmp/sysupgrade.conffiles
@@
-16,9
+14,6
@@
export CONF_TAR=/tmp/sysupgrade.tgz
RAMFS_COPY_BIN= # extra programs for temporary ramfs root
RAMFS_COPY_DATA= # extra data files
RAMFS_COPY_BIN= # extra programs for temporary ramfs root
RAMFS_COPY_DATA= # extra data files
-
-[ -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap ] && export SAVE_PARTITIONS=0
-
include /lib/upgrade
include /lib/upgrade