correct scripts

diff --git a/simple-cdd/additional_scripts/change_configuration.sh b/simple-cdd/additional_scripts/change_configuration.sh
index ced796bbd5f7c7011ca3890d82b84dad8274e942..1899e94d255df0cd9b14d29c6b2d08413c4d0ee1 100755 (executable)
--- a/simple-cdd/additional_scripts/change_configuration.sh
+++ b/simple-cdd/additional_scripts/change_configuration.sh
@@ -32,7 +32,7 @@ function usage () {
   echo "usage: $PROGNAME <mode>"
   echo "  switch trc6500 mode"
   echo "  avaliable modes are:"
-  echo "  - 8MHzMHF, 12MHzDF, 12MHzMDF, 30MHzMDF or 30MHzMHF"
+  echo "  - 8MHzMHF, 12MHzDF, 12MHzMDF, 30MHzMDF 30MHzMDF.lite or 30MHzMHF"
   echo "  - fix_ssh"
   echo "  - hw_ibm or hw_supermicro"
   echo "  - network"
@@ -88,7 +88,9 @@ if [ "$MODE_BW" ]; then
     12MHzDF) ;;
     12MHzMDF) ;;
     30MHzMDF) ;;
-    30MHzMDF.lite) ;;
+    30MHzMDF.lite)
+        check cp /etc/dhcp/dhcpd.conf.lite /etc/dhcp/dhcpd.conf
+    ;;
     30MHzMHF)
         for ip in 0A851{A,C}A{1..6}; do check ln -T -f -s acq /opt/tftp/pxelinux.cfg/$ip; done
         for ip in 0A851{A,C}A9; do      check ln -T -f -s rec /opt/tftp/pxelinux.cfg/$ip; done

diff --git a/simple-cdd/additional_scripts/configure_fe306.sh b/simple-cdd/additional_scripts/configure_fe306.sh
index d0b685d8c1c65924e3671ffabfb8d0f5f60c1b4c..885af249bbbdd64c0a1cff112eda95d95c3387f4 100755 (executable)
--- a/simple-cdd/additional_scripts/configure_fe306.sh
+++ b/simple-cdd/additional_scripts/configure_fe306.sh
@@ -139,7 +139,7 @@ title "configure ip"
 
 configure ModeServ.cmd serv_mode MANUAL
 configure MacServ.cmd serv_mac 00.80.EE.00.$SN.01
-configure IpServ.cmd serv_ip 10.133.26.1${ID}0
+configure IpServ.cmd serv_ip $(getent hosts | awk '/fe306-'$ID'/ {print $1}')
 configure MaskServ.cmd serv_mask 255.255.255.0
 
 for i in $(seq 1 8); do