Small changes and bugfixes.

Author: ScIT-Raphael

bin/v-add-sys-ip

@@ -14,10 +14,13 @@
 #                    Variable&Function                     #
 #----------------------------------------------------------#
 
+# Get interface name
+iface=$(/bin/ip token | awk -F 'dev ' '{print $2}')
+
 # Argument definition
 ip=${1// /}
 netmask=$2
-interface="${3-eth0}"
+iface="${3-$iface}"
 user="${4-admin}"
 ip_status="${5-shared}"
 ip_name=$6
@@ -50,14 +53,14 @@ fi
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
-iface=$(get_ip_iface)
+
 cidr=$(convert_netmask $netmask)
 broadcast=$(get_broadcast $ip $netmask)
 
 sys_ip_check=$(/sbin/ip addr | grep "$ip")
 if [ -z "$sys_ip_check" ]; then
     # Adding sys ip
-    /sbin/ip addr add $ip/$cidr dev $interface \
+    /sbin/ip addr add $ip/$cidr dev $iface \
         broadcast $broadcast label $iface
 
     # Adding RHEL/CentOS/Fedora/Amazon startup script
@@ -110,7 +113,7 @@ STATUS='$ip_status'
 NAME='$ip_name'
 U_SYS_USERS=''
 U_WEB_DOMAINS='0'
-INTERFACE='$interface'
+INTERFACE='$iface'
 NETMASK='$netmask'
 NAT='$nat_ip'
 TIME='$time'

bin/v-delete-sys-ip

@@ -63,19 +63,17 @@ if [ -e "/etc/sysconfig/network-scripts/ifcfg-$interface" ]; then
 fi
 
 # Deleting startup conf on Debian/Ubuntu
-if [ -e "/etc/network/interfaces" ]; then
-    if [ -f "/etc/netplan/60-hestia.yaml" ]; then
-        sed -i "/$ip/d" /etc/netplan/60-hestia.yaml
-        if ! grep -q '-' /etc/netplan/60-hestia.yaml; then
-            rm /etc/netplan/60-hestia.yaml
-        fi
-    else
-        ip_str=$(grep -n $ip$ /etc/network/interfaces |cut -f1 -d:)
-        if [ ! -z "$ip_str" ]; then
-            first_str=$((ip_str - 3))
-            last_str=$((ip_str + 1))
-            sed -i "$first_str,$last_str d" /etc/network/interfaces
-        fi
+if [ -f "/etc/netplan/60-hestia.yaml" ]; then
+    sed -i "/$ip/d" /etc/netplan/60-hestia.yaml
+    if ! grep -q '-' /etc/netplan/60-hestia.yaml; then
+        rm /etc/netplan/60-hestia.yaml
+    fi
+elif [ -e "/etc/network/interfaces" ]; then
+    ip_str=$(grep -n $ip$ /etc/network/interfaces |cut -f1 -d:)
+    if [ ! -z "$ip_str" ]; then
+        first_str=$((ip_str - 3))
+        last_str=$((ip_str + 1))
+        sed -i "$first_str,$last_str d" /etc/network/interfaces
     fi
 fi
 

func/ip.sh

@@ -13,19 +13,6 @@ is_ip_free() {
     fi
 }
 
-# Get full interface name
-get_ip_iface() {
-    i=$(/sbin/ip addr |grep -w $interface |\
-         awk '{print $NF}' |tail -n 1 |cut -f 2 -d :)
-    if [ "$i" = "$interface" ]; then
-        n=0
-    else
-        n=$((i + 1))
-    fi
-    echo "$interface:$n"
-}
-
-
 # Check ip address specific value
 is_ip_key_empty() {
     key="$1"