Merge lp:~antonym/agent-smith/suse-support into lp:agent-smith

[Antony Messerli]

Added SUSE support to agent.

Unmerged revisions

54. By Antony Messerli on 2010-08-16

Fixed suse test

53. By ant <email address hidden> on 2010-08-15

OpenSUSE support

=== modified file 'scripts/Makefile'
--- scripts/Makefile	2010-08-09 13:17:54 +0000
+++ scripts/Makefile	2010-08-16 18:24:44 +0000
@@ -164,7 +164,7 @@
                   update_agent.sh update_fstab_for_rescue.sh
 
 nobase_scripts_SCRIPTS = kms/satellite.sh network/arch.sh network/debian.sh \
-                         network/gentoo.sh network/redhat.sh
+                         network/gentoo.sh network/redhat.sh network/suse.sh
 
 all: all-am
 

=== modified file 'scripts/Makefile.am'
--- scripts/Makefile.am	2010-08-09 13:17:54 +0000
+++ scripts/Makefile.am	2010-08-16 18:24:44 +0000
@@ -6,7 +6,7 @@
                   update_agent.sh update_fstab_for_rescue.sh
 
 nobase_scripts_SCRIPTS = kms/satellite.sh network/arch.sh network/debian.sh \
-                         network/gentoo.sh network/redhat.sh
+                         network/gentoo.sh network/redhat.sh network/suse.sh
 
 check:
 	make -C tests check

=== modified file 'scripts/configure_network.sh'
--- scripts/configure_network.sh	2010-07-30 21:50:10 +0000
+++ scripts/configure_network.sh	2010-08-16 18:24:44 +0000
@@ -24,6 +24,7 @@
 . "${AGENTSMITHDIR}/network/gentoo.sh"
 . "${AGENTSMITHDIR}/network/debian.sh"
 . "${AGENTSMITHDIR}/network/arch.sh"
+. "${AGENTSMITHDIR}/network/suse.sh"
 
 function get_interface_bullshit() {
     set -a public_addresses
@@ -130,5 +131,12 @@
           /etc/rc.d/network restart
         fi
         ;;
+    ("suse")
+	suse_network_config
+	
+	if [ ! $DEBUG ]; then
+	  /etc/init.d/network restart
+	fi
+	;;
   esac
 fi

=== modified file 'scripts/detect_os.sh'
--- scripts/detect_os.sh	2010-07-08 22:21:52 +0000
+++ scripts/detect_os.sh	2010-08-16 18:24:44 +0000
@@ -43,6 +43,10 @@
     then
         echo gentoo
         exit 0
+    elif echo "$distributor" | grep -qi Suse
+    then
+        echo suse
+        exit 0
     fi
 }
 
@@ -63,7 +67,7 @@
 if [ -e "${etc_issue}" ]
 then
     if grep -qi Ubuntu "${etc_issue}"
-    then
+     then
         echo "ubuntu"
         exit 0
     fi
@@ -92,6 +96,12 @@
         exit 0
     fi
 
+    if grep -qi "Suse" "${etc_issue}"
+    then
+        echo "suse"
+        exit 0
+    fi
+
     if grep -qi "Arch" "${etc_issue}"
     then
         echo "arch"
@@ -141,3 +151,4 @@
 # Shot in the dark
 echo "ubuntu"
 exit 0
+

=== added file 'scripts/network/suse.sh'
--- scripts/network/suse.sh	1970-01-01 00:00:00 +0000
+++ scripts/network/suse.sh	2010-08-16 18:24:44 +0000
@@ -0,0 +1,67 @@
+function suse_network_config() {
+    SUSE_SYSCONFIG_PATH="/etc/sysconfig"
+    SUSE_CONFIG_PATH="/etc/sysconfig/network"
+    SUSE_ROUTES_FILE="routes"
+    TEMP_PUBLIC_INTERFACE="${TEMP}/${SUSE_CONFIG_PATH}/ifcfg-eth0"
+    TEMP_PRIVATE_INTERFACE="${TEMP}/${SUSE_CONFIG_PATH}/ifcfg-eth1"
+	
+    if [ ! -d "${TEMP}/${SUSE_CONFIG_PATH}" ]; then 
+        mkdir -p ${TEMP}/${SUSE_CONFIG_PATH} ]
+    fi
+
+    cat > ${TEMP}/${SUSE_CONFIG_PATH}/${SUSE_ROUTES_FILE} <<ETC_NETWORK
+default ${gateway} - eth0
+ETC_NETWORK
+
+    # CONFIGURE PUBLIC INTERFACES
+    public_address_count=0
+    public_address_iface=''
+    for address in ${public_addresses[@]}; do
+        parse_multi_key_line $address
+
+        if [ $public_address_count -gt 0 ]; then
+            public_address_iface=":${public_address_count}"
+        fi
+
+        cat > ${TEMP_PUBLIC_INTERFACE}${public_address_iface} <<PUBLIC_INTERFACE
+DEVICE=eth0${public_address_iface}
+BOOTPROTO=static
+IPADDR=${ip}
+NETMASK=${netmask}
+PUBLIC_INTERFACE
+
+        if [ $enabled -eq 1 ]; then 
+          echo "ONBOOT=YES" >> ${TEMP_PUBLIC_INTERFACE}${public_address_iface}  
+        fi
+
+        unset ip netmask enabled
+        let public_address_count=$public_address_count+1
+    done
+
+    # CONFIGURE PRIVATE INTERFACE AND ROUTES IF EXIST
+    if [ ${#private_addresses[@]} -eq 1 ]; then
+        parse_multi_key_line ${private_addresses[0]}
+
+        cat > ${TEMP_PRIVATE_INTERFACE} <<PRIVATE_INTERFACE
+DEVICE=eth1
+BOOTPROTO=static
+IPADDR=$ip
+NETMASK=$netmask
+PRIVATE_INTERFACE
+
+        #ROUTES
+        for route in ${routes[@]}; do
+            parse_multi_key_line $route
+            cat >> ${TEMP}/${SUSE_CONFIG_PATH}/${SUSE_ROUTES_FILE} <<STATIC_ROUTES
+${route} ${gateway} ${netmask} -
+STATIC_ROUTES
+            unset route netmask gateway
+        done
+    fi
+
+    cp -R "${TEMP}/${SUSE_CONFIG_PATH}" "${ROOT}/${SUSE_SYSCONFIG_PATH}"
+    rm -rf "${TEMP}/etc"
+
+    unset public_address_count public_address_iface
+}
+

=== added directory 'scripts/tests/configure_network.sh-tests/r/suse_network_config'
=== added directory 'scripts/tests/configure_network.sh-tests/r/suse_network_config/etc'
=== added directory 'scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig'
=== added directory 'scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network'
=== added file 'scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/ifcfg-eth0'
--- scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/ifcfg-eth0	1970-01-01 00:00:00 +0000
+++ scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/ifcfg-eth0	2010-08-16 18:24:44 +0000
@@ -0,0 +1,5 @@
+DEVICE=eth0
+BOOTPROTO=static
+IPADDR=204.232.195.126
+NETMASK=255.255.255.0
+ONBOOT=YES

=== added file 'scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/ifcfg-eth0:1'
--- scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/ifcfg-eth0:1	1970-01-01 00:00:00 +0000
+++ scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/ifcfg-eth0:1	2010-08-16 18:24:44 +0000
@@ -0,0 +1,5 @@
+DEVICE=eth0:1
+BOOTPROTO=static
+IPADDR=204.232.195.126
+NETMASK=255.255.255.0
+ONBOOT=YES

=== added file 'scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/ifcfg-eth1'
--- scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/ifcfg-eth1	1970-01-01 00:00:00 +0000
+++ scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/ifcfg-eth1	2010-08-16 18:24:44 +0000
@@ -0,0 +1,4 @@
+DEVICE=eth1
+BOOTPROTO=static
+IPADDR=10.176.29.126
+NETMASK=255.255.224.0

=== added file 'scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/routes'
--- scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/routes	1970-01-01 00:00:00 +0000
+++ scripts/tests/configure_network.sh-tests/r/suse_network_config/etc/sysconfig/network/routes	2010-08-16 18:24:44 +0000
@@ -0,0 +1,3 @@
+default 204.232.195.1 - eth0
+10.176.0.0 10.176.0.1 255.248.0.0 -
+10.191.192.0 10.176.0.1 255.255.192.0 -

=== added directory 'scripts/tests/configure_network.sh-tests/r/suse_network_config/tmp'
=== added file 'scripts/tests/configure_network.sh-tests/r/suse_network_config/tmp/.bzrignore'
=== added directory 'scripts/tests/configure_network.sh-tests/t/suse_network_config'
=== added file 'scripts/tests/configure_network.sh-tests/t/suse_network_config/config'
--- scripts/tests/configure_network.sh-tests/t/suse_network_config/config	1970-01-01 00:00:00 +0000
+++ scripts/tests/configure_network.sh-tests/t/suse_network_config/config	2010-08-16 18:24:44 +0000
@@ -0,0 +1,23 @@
+label:"public"
+ips:0:netmask:"255.255.255.0"
+ips:0:enabled:1
+ips:0:ip:"204.232.195.126"
+ips:1:netmask:"255.255.255.0"
+ips:1:enabled:1
+ips:1:ip:"204.232.195.126"
+mac:"40:40:12:8d:ae:09"
+gateway:"204.232.195.1"
+slice:"964"
+dns:"72.3.128.240"
+dns:"72.3.128.241"
+label:"private"
+ips:0:netmask:"255.255.224.0"
+ips:0:enabled:1
+ips:0:ip:"10.176.29.126"
+routes:0:route:"10.176.0.0"
+routes:0:netmask:"255.248.0.0"
+routes:0:gateway:"10.176.0.1"
+routes:1:route:"10.191.192.0"
+routes:1:netmask:"255.255.192.0"
+routes:1:gateway:"10.176.0.1"
+"mac":"40:40:b2:fe:c7:c4"

=== added directory 'scripts/tests/configure_network.sh-tests/t/suse_network_config/root'
=== added directory 'scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc'
=== added directory 'scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig'
=== added directory 'scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network'
=== added file 'scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/ifcfg-eth0'
--- scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/ifcfg-eth0	1970-01-01 00:00:00 +0000
+++ scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/ifcfg-eth0	2010-08-16 18:24:44 +0000
@@ -0,0 +1,5 @@
+DEVICE=eth0
+BOOTPROTO=static
+IPADDR=204.232.195.126
+NETMASK=255.255.255.0
+ONBOOT=YES

=== added file 'scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/ifcfg-eth0:1'
--- scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/ifcfg-eth0:1	1970-01-01 00:00:00 +0000
+++ scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/ifcfg-eth0:1	2010-08-16 18:24:44 +0000
@@ -0,0 +1,5 @@
+DEVICE=eth0:1
+BOOTPROTO=static
+IPADDR=204.232.195.126
+NETMASK=255.255.255.0
+ONBOOT=YES

=== added file 'scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/ifcfg-eth1'
--- scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/ifcfg-eth1	1970-01-01 00:00:00 +0000
+++ scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/ifcfg-eth1	2010-08-16 18:24:44 +0000
@@ -0,0 +1,4 @@
+DEVICE=eth1
+BOOTPROTO=static
+IPADDR=10.176.29.126
+NETMASK=255.255.224.0

=== added file 'scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/routes'
--- scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/routes	1970-01-01 00:00:00 +0000
+++ scripts/tests/configure_network.sh-tests/t/suse_network_config/root/etc/sysconfig/network/routes	2010-08-16 18:24:44 +0000
@@ -0,0 +1,3 @@
+default 204.232.195.1 - eth0
+10.176.0.0 10.176.0.1 255.248.0.0 -
+10.191.192.0 10.176.0.1 255.255.192.0 -

=== added file 'scripts/tests/configure_network.sh-tests/t/suse_network_config/run.sh'
--- scripts/tests/configure_network.sh-tests/t/suse_network_config/run.sh	1970-01-01 00:00:00 +0000
+++ scripts/tests/configure_network.sh-tests/t/suse_network_config/run.sh	2010-08-16 18:24:44 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash 
+
+export DEBUG=true
+export ROOT="${ROOT:-`pwd`}"
+export TEMP="${TEMP:-$ROOT/tmp}"
+
+. $AGENTSMITHDIR/configure_network.sh
+
+get_interface_bullshit
+suse_network_config

=== added file 'scripts/tests/detect_os.sh-tests/r/OpenSuse11.3'
--- scripts/tests/detect_os.sh-tests/r/OpenSuse11.3	1970-01-01 00:00:00 +0000
+++ scripts/tests/detect_os.sh-tests/r/OpenSuse11.3	2010-08-16 18:24:44 +0000
@@ -0,0 +1,1 @@
+suse

=== added directory 'scripts/tests/detect_os.sh-tests/t/OpenSuse11.3'
=== added directory 'scripts/tests/detect_os.sh-tests/t/OpenSuse11.3/etc'
=== added file 'scripts/tests/detect_os.sh-tests/t/OpenSuse11.3/etc/issue'
--- scripts/tests/detect_os.sh-tests/t/OpenSuse11.3/etc/issue	1970-01-01 00:00:00 +0000
+++ scripts/tests/detect_os.sh-tests/t/OpenSuse11.3/etc/issue	2010-08-16 18:24:44 +0000
@@ -0,0 +1,3 @@
+Welcome to openSUSE 11.3 "Teal" - Kernel \r (\l).
+
+