[OpenWrt-Devel] [PATCH 3/3] treewide: sysupgrade: use $UPGRADE_BACKUP to check for backup

[Rafał Miłecki]

On 2019-09-11 12:55, Adrian Schmutzler wrote:
>> diff --git a/package/base-files/files/lib/upgrade/common.sh 
>> b/package/base-files/files/lib/upgrade/common.sh
>> index 8e7866f698..0d3162d4fc 100644
>> --- a/package/base-files/files/lib/upgrade/common.sh
>> +++ b/package/base-files/files/lib/upgrade/common.sh
>> @@ -220,7 +220,7 @@ indicate_upgrade() {
>>  # $(2): (optional) pipe command to extract firmware, e.g. dd bs=n 
>> skip=m
>>  default_do_upgrade() {
>>  	sync
>> -	if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ]; then
>> +	if [ -n "$UPGRADE_BACKUP" ]; then
> 
> Any reason why this is "-n" and not "-f" as below?

I kept the old logic which wasn't checking for file existence. Feel free
to develop, test & send a patch changing that.


>>  		get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j 
>> "$UPGRADE_BACKUP" write - "${PART_NAME:-
>> image}"
>>  	else
>>  		get_image "$1" "$2" | mtd $MTD_ARGS write - "${PART_NAME:-image}"
>> diff --git a/package/base-files/files/lib/upgrade/do_stage2 
>> b/package/base-files/files/lib/upgrade/do_stage2
>> index 0e6cc1bfc3..0e32445743 100755
>> --- a/package/base-files/files/lib/upgrade/do_stage2
>> +++ b/package/base-files/files/lib/upgrade/do_stage2
>> @@ -11,7 +11,7 @@ else
>>  	default_do_upgrade "$IMAGE"
>>  fi
>> 
>> -if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && type 
>> 'platform_copy_config' >/dev/null 2>/dev/null; then
>> +if [ -n "$UPGRADE_BACKUP" ] && type 'platform_copy_config' >/dev/null 
>> 2>/dev/null; then
> 
> Here I'm not so sure about "-f" vs. "-n" ...
> 
>>  	platform_copy_config
>>  fi
>> 
>> diff --git a/package/base-files/files/sbin/sysupgrade 
>> b/package/base-files/files/sbin/sysupgrade
>> index f18143bff4..935d08048e 100755
>> --- a/package/base-files/files/sbin/sysupgrade
>> +++ b/package/base-files/files/sbin/sysupgrade
>> @@ -371,7 +371,6 @@ else
>>  		$backup_attr
>>  		\"command\": $(json_string "$COMMAND"),
>>  		\"options\": {
>> -			\"save_config\": $SAVE_CONFIG,
>>  			\"save_partitions\": $SAVE_PARTITIONS
>>  		}
>>  	}"
>> diff --git a/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh 
>> b/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
>> index c694c2e6f2..e991a06b7a 100644
>> --- a/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
>> +++ b/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
>> @@ -75,7 +75,7 @@ dir825b_do_upgrade_combined() {
>> 
>>  	if [ -n "$fw_mtd" ] &&  [ ${fw_blocks:-0} -gt 0 ]; then
>>  		local append=""
>> -		[ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && 
>> append="-j $UPGRADE_BACKUP"
>> +		[ -f "$UPGRADE_BACKUP" ] && append="-j $UPGRADE_BACKUP"
>> 
>>  		sync
>>  		dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
>> diff --git a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh 
>> b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
>> index 8536d4ba4a..f43bdcea7f 100644
>> --- a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
>> +++ b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
>> @@ -159,7 +159,7 @@ platform_do_upgrade_openmesh()
>>  	local cfg_size= kernel_size= rootfs_size=
>>  	local append=""
>> 
>> -	[ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && 
>> append="-j $UPGRADE_BACKUP"
>> +	[ -f "$UPGRADE_BACKUP" ] && append="-j $UPGRADE_BACKUP"
>> 
>>  	cfg_size=$(dd if="$img_path" bs=2 skip=35 count=4 2>/dev/null)
>>  	kernel_size=$(dd if="$img_path" bs=2 skip=71 count=4 2>/dev/null)
>> diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
>> b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
>> index 726163291d..86e7b6386b 100755
>> --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
>> +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
>> @@ -65,7 +65,7 @@ platform_do_upgrade_combined() {
>>  	then
>>  		local rootfspart=$(platform_find_rootfspart "$partitions" 
>> "$kernelpart")
>>  		local append=""
>> -		[ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && 
>> append="-j $UPGRADE_BACKUP"
>> +		[ -f "$UPGRADE_BACKUP" ] && append="-j $UPGRADE_BACKUP"
>> 
>>  		if [ "$PLATFORM_DO_UPGRADE_COMBINED_SEPARATE_MTD" -ne 1 ]; then
>>  		    ( dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 
>> 2>/dev/null; \
>> @@ -164,7 +164,7 @@ platform_do_upgrade_compex() {
>> 
>>  	if [ -n "$fw_mtd" ] &&  [ ${fw_blocks:-0} -gt 0 ]; then
>>  		local append=""
>> -		[ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && 
>> append="-j $UPGRADE_BACKUPs"
>> +		[ -f "$UPGRADE_BACKUP" ] && append="-j $UPGRADE_BACKUPs"
> 
> Is there a reason for the trailing "s" here or is this a typo: ="-j
> $UPGRADE_BACKUPs" ?

Try to check when it has appeared there:
git log -p target/linux/ar71xx/base-files/lib/upgrade/platform.sh

It's a typo.

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel