diff --git a/openWrt/files/lib/upgrade/keep.d/base-files b/openWrt/files/lib/upgrade/keep.d/base-files index dfca5975..15968a76 100644 --- a/openWrt/files/lib/upgrade/keep.d/base-files +++ b/openWrt/files/lib/upgrade/keep.d/base-files @@ -5,6 +5,7 @@ /etc/config/network.sta /etc/config/network.ap /etc/config/network +/etc/samba/smbpasswd /etc/shadow /etc/dropbear/ /etc/crontabs/ diff --git a/scripts/migrateConfig.py b/scripts/migrateConfig.py index 3431784e..4a631269 100755 --- a/scripts/migrateConfig.py +++ b/scripts/migrateConfig.py @@ -67,9 +67,10 @@ def saveConfiguration(path, conf): oldConfig = getConfiguration("/weioUserBackup/config.weio") newConfig = getConfiguration("/weio/config.weio") +# exceptions for parameter in newConfig: if (parameter in oldConfig): - if not("weio_version" in parameter): # don't take the old version of sw, just migrate personal data + if not("weio_version" in parameter) and not("timezone" in parameter): # don't take the old version of sw, just migrate personal data newConfig[parameter] = oldConfig[parameter] -saveConfiguration("/weio/config.weio", newConfig) +saveConfiguration("/weio/config.weio", newConfig) \ No newline at end of file