diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth index b0b553cf1..38d8a04f1 100755 --- a/xCAT/postscripts/configeth +++ b/xCAT/postscripts/configeth @@ -215,7 +215,7 @@ function configipv4(){ do name="${array_extra_param_names[$i]}" value="${array_extra_param_values[$i]}" - if [[ "$OSVER" =~ (rhels9|alma9|rocky9) ]]; then + if [[ "$OSVER" =~ ^(rhels9|alma9|rocky9) ]]; then nmcli con modify $con_name $name $value else grep -i "${name}" $str_conf_file @@ -824,7 +824,7 @@ elif [ "$1" = "-s" ];then do name="${array_extra_param_names[$i]}" value="${array_extra_param_values[$i]}" - if [[ "$OSVER" =~ (rhels9|alma9|rocky9) ]]; then + if [[ "$OSVER" =~ ^(rhels9|alma9|rocky9) ]]; then nmcli con modify $con_name $name $value else echo "$i: name=$name value=$value" diff --git a/xCAT/postscripts/configib b/xCAT/postscripts/configib index 1c9f9b4b9..a2f023103 100755 --- a/xCAT/postscripts/configib +++ b/xCAT/postscripts/configib @@ -439,7 +439,7 @@ IPADDR=$nicip" > $dir/ifcfg-$nic name="${array_extra_param_names[$i]}" value="${array_extra_param_values[$i]}" echo " $i: name=$name value=$value" - if [[ "$OSVER" =~ (rhels9|alma9|rocky9) ]]; then + if [[ "$OSVER" =~ ^(rhels9|alma9|rocky9) ]]; then nmcli con modify $con_name $name $value else grep -i "${name}" $dir/ifcfg-$nic @@ -475,7 +475,7 @@ IPADDR_$ipindex=$nicip" >> $dir/ifcfg-$nic name="${array_extra_param_names[$i]}" value="${array_extra_param_values[$i]}" echo " $i: name=$name value=$value" - if [[ "$OSVER" =~ (rhels9|alma9|rocky9) ]]; then + if [[ "$OSVER" =~ ^(rhels9|alma9|rocky9) ]]; then nmcli con modify $con_name $name $value else grep -i "${name}" $dir/ifcfg-$nic @@ -536,7 +536,7 @@ IPADDR=$nicip" > $dir/ifcfg-$nic name="${array_extra_param_names[$i]}" value="${array_extra_param_values[$i]}" echo " $i: name=$name value=$value" - if [[ "$OSVER" =~ (rhels9|alma9|rocky9) ]]; then + if [[ "$OSVER" =~ ^(rhels9|alma9|rocky9) ]]; then nmcli con modify $con_name $name $value else grep -i "${name}" $dir/ifcfg-$nic @@ -605,7 +605,7 @@ IPADDR$ipindex=$nicip" name="${array_extra_param_names[$i]}" value="${array_extra_param_values[$i]}" echo " $i: name=$name value=$value" - if [[ "$OSVER" =~ (rhels9|alma9|rocky9) ]]; then + if [[ "$OSVER" =~ ^(rhels9|alma9|rocky9) ]]; then nmcli con modify $con_name $name $value else grep -i "${name}" $cfgfile @@ -788,7 +788,7 @@ then done else if [ $nmcli_used -eq 1 ]; then - if ! [[ "$OSVER" =~ (rhels9|alma9|rocky9) ]]; then + if ! [[ "$OSVER" =~ ^(rhels9|alma9|rocky9) ]]; then nmcli con reload $dir/ifcfg-$nic fi nmcli con up $nic 2>&1 diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh index 55a91cdc3..bfabbc287 100755 --- a/xCAT/postscripts/nicutils.sh +++ b/xCAT/postscripts/nicutils.sh @@ -1809,7 +1809,7 @@ function add_extra_params_nmcli { con_name=$2 rc=0 - if ! [[ $OSVER =~ (rhels9|alma9|rocky9) ]]; then + if ! [[ "$OSVER" =~ ^(rhels9|alma9|rocky9) ]]; then str_conf_file="/etc/sysconfig/network-scripts/ifcfg-${con_name}" str_conf_file_1="/etc/sysconfig/network-scripts/ifcfg-${con_name}-1" if [ -f $str_conf_file_1 ]; then @@ -1830,7 +1830,7 @@ function add_extra_params_nmcli { if [ -n "$name" -a -n "$value" ]; then # For RHEL 9, use nmcli directly, otherwise use ifcfg scheme. - if [[ "$OSVER" =~ (rhels9|alma9|rocky9) ]]; then + if [[ "$OSVER" =~ ^(rhels9|alma9|rocky9) ]]; then nmcli con modify "$con_name" "$name" "$value" rc+=$? else @@ -1849,7 +1849,7 @@ function add_extra_params_nmcli { i=$((i+1)) done - if [[ $OSVER != (rhels9|alma9|rocky9) ]]; then + if [[ ! "$OSVER" =~ ^(rhels9|alma9|rocky9) ]]; then $nmcli con reload $str_conf_file fi return $rc