diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-02-05 19:36:33 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-02-05 19:36:33 +0100 |
commit | 1244baf36371623b3dadcd5e98ba93a74d8330bc (patch) | |
tree | 3e86dd38c062cf99516f49471a582b8506756ce9 /src/migration-scripts/system/14-to-15 | |
parent | 54f89e9265874cba975438ca21689c60fb1b0aec (diff) | |
parent | f2e52cd21e6de853067596be8448ab9fc71b4ce1 (diff) | |
download | vyos-1x-1244baf36371623b3dadcd5e98ba93a74d8330bc.tar.gz vyos-1x-1244baf36371623b3dadcd5e98ba93a74d8330bc.zip |
Merge branch 't1948-system-login' of github.com:c-po/vyos-1x into current
* 't1948-system-login' of github.com:c-po/vyos-1x:
radius: T1948: add libnss-mapname support
radius: T1948: rename server dictionary
radius: T1948: supply PAM configuration template
user: T1948: fix system user creation
ogin: user: radius: T1948: use discrete configuration for each system
login: T1948: remove obsolete config nodes "group" and "level"
login: T1948: SSH keys can only be added after user has been created
login: T1948: initial support for RADIUS configuration
login: T1948: support for SSH keys
login: T1948: add/remove local users
login: T1948: initial rewrite in XML/Python
options: T1919: remove broken comment
Diffstat (limited to 'src/migration-scripts/system/14-to-15')
-rwxr-xr-x | src/migration-scripts/system/14-to-15 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/migration-scripts/system/14-to-15 b/src/migration-scripts/system/14-to-15 index fd89ae57a..2491e3d0d 100755 --- a/src/migration-scripts/system/14-to-15 +++ b/src/migration-scripts/system/14-to-15 @@ -22,7 +22,6 @@ if not config.exists(base): # Nothing to do sys.exit(0) else: - # delete 'system ipv6 blacklist' node if config.exists(base + ['reboot-on-panic']): reboot = config.return_value(base + ['reboot-on-panic']) config.delete(base + ['reboot-on-panic']) |