settings torrent and openvpn seems to be switched after updating to 2.3.7.0 beta

[fon2@…]

I updated the firmware from 2.3.6.1 (development) to 2.3.7.0 beta. I made a screenshot before and after the update and discovered a difference.

Regards alexb

[matthijs]

I've looked into this and I think these are actually two separate issues:

1. When upgrading, the torrent application needs to be reinstalled. The firewall setting is saved during the upgrade, but cannot be restored directly after the upgrade since the setting is not present until the torrent application is installed (or perhaps the setting isn't even saved because it is in another file from the normal firewall settings, I'm not 100% sure). This issue is hard to fix, given the current structure of the torrent plugin.
2. When upgrading, apparently the firewall status of the openvpn application gets lost. This is similar to the above: The configuration (in /etc/config/services) for openvpn gets added by a script after the upgrade, instead of being embedded in the firmware image. It seems that this script somehow runs _after_ restoring the saved settings (even though it shouldn't, since /etc/uci-defaults/zzz-upgrade should run after /etc/uci-defaults/openvpn.

So the settings didn't get mixed up, they just got reset to their defaults.

I'll have a closer look at what happens in the second case, the first case is probably a won't fix for now.

[matthijs]

I've looked into this a bit more and fixed both issues.

1. Turns out the settings are already present in the image, instead of being added when installing the fmg image. The problem was just that the firewall settings for Transmission were stored in a different file, which wasn't backed up.
2. The problem here was that the settings backup only backups the "enabled" values from the firewall configuration. This works for the settings where the default is disabled, but not for OpenVPN. I've changed the backup script to always backup the settings, which should fix this issue.

I'm still doing some tests, but I have fixes ready to be committed.

[matthijs]

(In [2046]) luci: Also backup firewall settings for fmg images.

This prevents the firewall settings for Transmission being reset after an upgrade.

References: #1066

[matthijs]

(In [2047]) luci: Backup all fwall settings, not just those that are 1.

Since the default for openvpn is 1 instead of 0, OpenVPN was re-enabled in the firewall on an upgrade if the user had disabled it.

Closes: #1066