Merge pull request #1205 from rvykydal/is_rhel8-removal-fixup

Replace 2 leftover occurences of is_rhel8 function

authselect-not-set.ks.in

@@ -10,13 +10,15 @@
 
 %post
 
+@KSINCLUDE@ scripts-lib.sh
+platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"
+
 command -v authselect > /dev/null 2>&1
 if [[ $? -eq 0 ]]; then
-    if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ || \
-       is_rhel9 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
-        authselect current | grep -vE "No existing configuration detected"
+    if [ "${platform}" == "rhel8" ] || [ "${platform}" == "rhel9" ]; then
+        authselect current | grep -E "No existing configuration detected"
     else
-        authselect current | grep -vE "Profile ID: local"
+        authselect current | grep -E "Profile ID: local"
     fi
     if [[ $? -ne 0 ]]; then
         echo "*** Failed check: authselect not installed or no default configuration detected" >> /root/RESULT

network-device-mac.ks.in

@@ -21,6 +21,7 @@ shutdown
 
 @KSINCLUDE@ post-lib-network.sh
 @KSINCLUDE@ scripts-lib.sh
+platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"
 
 # --device=<MAC> is used to specify the interface, not to bind the
 # connection to the MAC address
@@ -30,7 +31,7 @@ shutdown
 # discoverable in sysfs yet so it picks its own name ksdevX and uses infname= to
 # name the device which results in binding also to HWADDR (because of ifname=
 # being used).
-if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
+if [ "${platform}" == "rhel8" ]; then
     # RHEL-8-FAILURE mac binding for ifname= is not applied when updating connection,
     # fixed upstream in commit a5cb6311e22587b539248bd5d2a227d08c0bb581
     check_device_config_value ksdev0 HWADDR __NONE ethernet mac-address __NONE