fix boolean in ast cause subnetting import to fail (#161).

Author: HappyBasher

debian/changelog

@@ -1,3 +1,9 @@
+linuxmuster-base7 (7.2.14-0) lmn72; urgency=low
+
+  * fix boolean in ast cause subnetting import to fail (#161).
+
+ -- Thomas Schmitt <thomas@linuxmuster.net>  Tue, 22 Apr 2025 14:05:59 +0200
+
 linuxmuster-base7 (7.2.13-0) lmn72; urgency=low
 
   * fix skip firewall setup (226377b).

lib/setup.d/z_final.py

@@ -2,7 +2,7 @@
 #
 # final tasks
 # thomas@linuxmuster.net
-# 20240219
+# 20250422
 #
 
 import configparser
@@ -12,8 +12,8 @@
 import re
 import sys
 
-from functions import getSetupValue, mySetupLogfile, printScript, readTextfile
-from functions import subProc, waitForFw, writeTextfile
+from functions import getSetupValue, mySetupLogfile, printScript, readTextfile, \
+    subProc, waitForFw, writeTextfile
 
 logfile = mySetupLogfile(__file__)
 
@@ -72,7 +72,7 @@
 
 # wait for fw
 skipfw = getSetupValue('skipfw')
-if skipfw == 'False':
+if not skipfw:
     try:
         waitForFw(wait=30)
     except Exception as error:

sbin/linuxmuster-import-subnets

@@ -2,10 +2,9 @@
 #
 # linuxmuster-import-subnets
 # thomas@linuxmuster.net
-# 20230801
+# 20250422
 #
 
-import ast
 import constants
 import datetime
 import os
@@ -15,10 +14,8 @@ import time
 import yaml
 
 from bs4 import BeautifulSoup
-from functions import firewallApi, getFwConfig, getSetupValue, getSftp
-from functions import getSubnetArray, ipMatchSubnet, isValidHostIpv4
-from functions import printScript, putFwConfig, putSftp, readTextfile
-from functions import sshExec, writeTextfile
+from functions import firewallApi, getFwConfig, getSetupValue, getSubnetArray, \
+    isValidHostIpv4, printScript, putFwConfig, readTextfile, writeTextfile
 from IPy import IP
 
 # read necessary values from setup.ini and other sources
@@ -27,7 +24,7 @@ domainname = getSetupValue('domainname')
 gateway = getSetupValue('gateway')
 firewallip = getSetupValue('firewallip')
 # get boolean value
-skipfw = ast.literal_eval(getSetupValue('skipfw'))
+skipfw = getSetupValue('skipfw')
 bitmask_setup = getSetupValue('bitmask')
 network_setup = getSetupValue('network')
 ipnet_setup = network_setup + '/' + bitmask_setup

sbin/linuxmuster-opnsense-reset

@@ -2,7 +2,7 @@
 #
 # reset opnsense configuration to setup state
 # thomas@linuxmuster.net
-# 20220601
+# 20250422
 #
 
 import constants
@@ -12,13 +12,12 @@ import sys
 import time
 
 from functions import createServerCert, datetime, enterPassword, firewallApi, \
-    getSetupValue, printScript, randomPassword, sshExec, subProc, writeTextfile, \
-    waitForFw
+    getSetupValue, printScript, sshExec, subProc, writeTextfile, waitForFw
 
 
 # check first if firewall is skipped by setup
 skipfw = getSetupValue('skipfw')
-if skipfw == 'True':
+if skipfw:
     printScript('Firewall is skipped by setup!')
     sys.exit(0)
 

share/firewall/opnsense/create-keytab.py

@@ -2,7 +2,7 @@
 #
 # create web proxy sso keytab
 # thomas@linuxmuster.net
-# 20240219
+# 20250422
 #
 
 import constants
@@ -11,16 +11,12 @@
 import subprocess
 import sys
 
-from functions import datetime
-from functions import firewallApi
-from functions import getSetupValue
-from functions import printScript
-from functions import readTextfile
+from functions import datetime, firewallApi, getSetupValue, printScript, readTextfile
 
 
 # check first if firewall is skipped by setup
 skipfw = getSetupValue('skipfw')
-if skipfw == 'True':
+if skipfw:
     printScript('Firewall is skipped by setup!')
     sys.exit(0)