From cdaff888a76d135b2dea40847b94a55066dd06b7 Mon Sep 17 00:00:00 2001 From: Giacomo Sanchietti Date: Wed, 6 Sep 2023 13:42:10 +0200 Subject: [PATCH 1/2] import-module: set file_server flag Otherwise the share management UI is not visible --- imageroot/actions/import-module/50resume_flag | 1 + 1 file changed, 1 insertion(+) create mode 120000 imageroot/actions/import-module/50resume_flag diff --git a/imageroot/actions/import-module/50resume_flag b/imageroot/actions/import-module/50resume_flag new file mode 120000 index 00000000..45f116c6 --- /dev/null +++ b/imageroot/actions/import-module/50resume_flag @@ -0,0 +1 @@ +../restore-module/20resume_flag \ No newline at end of file From a19ef529f60f01ef50b71f4ca908b7e43f9002a3 Mon Sep 17 00:00:00 2001 From: Davide Principi Date: Thu, 7 Sep 2023 10:09:31 +0200 Subject: [PATCH 2/2] Update 50import_configuration The removed code is repeated by the next step --- imageroot/actions/import-module/50import_configuration | 7 ------- 1 file changed, 7 deletions(-) diff --git a/imageroot/actions/import-module/50import_configuration b/imageroot/actions/import-module/50import_configuration index 3b60065f..305bb9c1 100755 --- a/imageroot/actions/import-module/50import_configuration +++ b/imageroot/actions/import-module/50import_configuration @@ -8,7 +8,6 @@ import sys import json import agent -import ipaddress request = json.load(sys.stdin) @@ -24,9 +23,3 @@ for evar in [ 'SVCPASS', ]: agent.set_env(evar, ienv[evar]) - -with agent.redis_connect() as rdb: - cluster_network = ipaddress.ip_network(rdb.get('cluster/network')) -if ipaddress.ip_address(ienv['IPADDRESS']) in cluster_network: - # Required by Samba to bind interfaces without broadcast address: - agent.set_env('PREFIXLEN', str(cluster_network.prefixlen))