From 757c2d98b5969ec1b1bebab0cdf552b6c5698ad3 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Wed, 16 Sep 2015 18:05:15 +0200 Subject: [PATCH] remove extention on some scripts and correct services --- master/etc/init.d/ammwake | 2 +- master/etc/init.d/waitslaves | 2 +- master/etc/init.d/waitswitches | 2 +- .../etc/webconfig/alias.d/50-trc6500-master-file.csv | 10 +++++----- .../opt/script/{configure_fe306.sh => configure_fe306} | 4 ++-- .../script/{configure_matrix.tcl => configure_matrix} | 0 .../script/{configure_switch.tcl => configure_switch} | 2 +- ...switch_bootstrap.tcl => configure_switch_bootstrap} | 2 +- .../opt/script/{connect_switch.tcl => connect_switch} | 2 +- master/opt/script/{flash_fe306.sh => flash_fe306} | 0 master/opt/script/{set_mediatray.tcl => set_mediatray} | 0 trc6500-master-file/changelog | 5 +++++ 12 files changed, 18 insertions(+), 13 deletions(-) rename master/opt/script/{configure_fe306.sh => configure_fe306} (97%) rename master/opt/script/{configure_matrix.tcl => configure_matrix} (100%) rename master/opt/script/{configure_switch.tcl => configure_switch} (96%) rename master/opt/script/{configure_switch_bootstrap.tcl => configure_switch_bootstrap} (94%) rename master/opt/script/{connect_switch.tcl => connect_switch} (95%) rename master/opt/script/{flash_fe306.sh => flash_fe306} (100%) rename master/opt/script/{set_mediatray.tcl => set_mediatray} (100%) diff --git a/master/etc/init.d/ammwake b/master/etc/init.d/ammwake index c982883..270f963 100755 --- a/master/etc/init.d/ammwake +++ b/master/etc/init.d/ammwake @@ -20,7 +20,7 @@ VER=1.0 HOSTS="/etc/hosts" ENABLE="yes" -SCRIPTS=/opt/script/set_blade_power.tcl /opt/trc6500/script/set_blade_power.tcl +SCRIPTS="/opt/script/set_blade_power /opt/trc6500/script/set_blade_power" SCRIPT= PATH=/sbin:/usr/sbin:/bin:/usr/bin diff --git a/master/etc/init.d/waitslaves b/master/etc/init.d/waitslaves index 137e109..ec6fab0 100755 --- a/master/etc/init.d/waitslaves +++ b/master/etc/init.d/waitslaves @@ -19,7 +19,7 @@ VER=1.0 ### END INIT INFO ENABLE="yes" -SCRIPTS=/opt/script/check_network.sh /opt/trc6500/script/check_network.sh +SCRIPTS="/opt/script/check_network /opt/trc6500/script/check_network" SCRIPT= TIMEOUT=360 diff --git a/master/etc/init.d/waitswitches b/master/etc/init.d/waitswitches index f75abba..511c1aa 100755 --- a/master/etc/init.d/waitswitches +++ b/master/etc/init.d/waitswitches @@ -19,7 +19,7 @@ VER=1.0 ### END INIT INFO ENABLE="yes" -SCRIPTS=/opt/script/check_switches.sh /opt/trc6500/script/check_switches.sh +SCRIPTS="/opt/script/check_switches /opt/trc6500/script/check_switches" SCRIPT= TIMEOUT=360 diff --git a/master/etc/webconfig/alias.d/50-trc6500-master-file.csv b/master/etc/webconfig/alias.d/50-trc6500-master-file.csv index 3bc9db2..aea0590 100644 --- a/master/etc/webconfig/alias.d/50-trc6500-master-file.csv +++ b/master/etc/webconfig/alias.d/50-trc6500-master-file.csv @@ -35,11 +35,11 @@ sw2;/usr/share/webconfig;;Configure switch SW2;/opt/script/configure_switch sw2 swg1;/usr/share/webconfig;;Configure switch SWG1;/opt/script/configure_switch swg1 swg2;/usr/share/webconfig;;Configure switch SWG2;/opt/script/configure_switch swg2 swm;/usr/share/webconfig;;Configure switch SWM;/opt/script/configure_switch swm -sw1-restart;/usr/share/webconfig;;Restart switch SW1;/opt/script/connect_switch.tcl -c reload sw1 -sw2-restart;/usr/share/webconfig;;Restart switch SW2;/opt/script/connect_switch.tcl -c reload sw2 -swg1-restart;/usr/share/webconfig;;Restart switch SWG1;/opt/script/connect_switch.tcl -c reload swg1 -swg2-restart;/usr/share/webconfig;;Restart switch SWG2;/opt/script/connect_switch.tcl -c reload swg2 -swm-restart;/usr/share/webconfig;;Restart switch SWM;/opt/script/connect_switch.tcl -c reload swm +sw1-restart;/usr/share/webconfig;;Restart switch SW1;/opt/script/connect_switch -c reload sw1 +sw2-restart;/usr/share/webconfig;;Restart switch SW2;/opt/script/connect_switch -c reload sw2 +swg1-restart;/usr/share/webconfig;;Restart switch SWG1;/opt/script/connect_switch -c reload swg1 +swg2-restart;/usr/share/webconfig;;Restart switch SWG2;/opt/script/connect_switch -c reload swg2 +swm-restart;/usr/share/webconfig;;Restart switch SWM;/opt/script/connect_switch -c reload swm ;;;Blade maintenance actions; bios;/usr/share/webconfig;;Configure BIOS for all Supermicro blades;sudo /opt/script/check_network.sh -c '/opt/bios/update_bios_cfg.sh -y -Y' -o ipmi;/usr/share/webconfig;;Configure IPMI for all Supermicro blades;sudo /opt/script/check_network.sh -c '/opt/ipmi/update_blade_cfg.sh -y -Y' -o diff --git a/master/opt/script/configure_fe306.sh b/master/opt/script/configure_fe306 similarity index 97% rename from master/opt/script/configure_fe306.sh rename to master/opt/script/configure_fe306 index 53cfae8..0d90204 100755 --- a/master/opt/script/configure_fe306.sh +++ b/master/opt/script/configure_fe306 @@ -66,11 +66,11 @@ function sw_configure () { esac if [ "$DRY" = "yes" ]; then - echo connect_switch.tcl -h swm $CMD + echo connect_switch -h swm $CMD else LOG=/tmp/$PROGNAME-$$.log echo -n "sw_configure $1: " - eval $TRC6500_SCRIPT_DIR/connect_switch.tcl $CMD swm >&$LOG && pass OK || { fail KO; cat $LOG; exit 1; } + eval $TRC6500_SCRIPT_DIR/connect_switch $CMD swm >&$LOG && pass OK || { fail KO; cat $LOG; exit 1; } rm -f $LOG fi } diff --git a/master/opt/script/configure_matrix.tcl b/master/opt/script/configure_matrix similarity index 100% rename from master/opt/script/configure_matrix.tcl rename to master/opt/script/configure_matrix diff --git a/master/opt/script/configure_switch.tcl b/master/opt/script/configure_switch similarity index 96% rename from master/opt/script/configure_switch.tcl rename to master/opt/script/configure_switch index 4d34d43..0a7785e 100755 --- a/master/opt/script/configure_switch.tcl +++ b/master/opt/script/configure_switch @@ -13,7 +13,7 @@ set host [lrange $argv 0 0] if { $host == "" } { - puts "usage: configure_switch.tcl \[sw1|sw2|swg1|swg2|swm\]" + puts "usage: configure_switch \[sw1|sw2|swg1|swg2|swm\]" exit 1 } diff --git a/master/opt/script/configure_switch_bootstrap.tcl b/master/opt/script/configure_switch_bootstrap similarity index 94% rename from master/opt/script/configure_switch_bootstrap.tcl rename to master/opt/script/configure_switch_bootstrap index db95d4d..f7b9da8 100755 --- a/master/opt/script/configure_switch_bootstrap.tcl +++ b/master/opt/script/configure_switch_bootstrap @@ -2,7 +2,7 @@ set host [lrange $argv 0 0] if { $host == "" } { - puts "usage: configure_switch_bootstrap.tcl \[sw1|sw2|swg1|swg2|swm\]" + puts "usage: configure_switch_bootstrap \[sw1|sw2|swg1|swg2|swm\]" exit 1 } diff --git a/master/opt/script/connect_switch.tcl b/master/opt/script/connect_switch similarity index 95% rename from master/opt/script/connect_switch.tcl rename to master/opt/script/connect_switch index 5f2299e..67f7678 100755 --- a/master/opt/script/connect_switch.tcl +++ b/master/opt/script/connect_switch @@ -23,7 +23,7 @@ set loginpassword "thales" set prompt "SW*" proc usage {rc} { - puts "usage: connect_switch.tcl \[host\] \[-a adminpassword\] \[-c command\] \[-f file\] \[-h\] \[-l loginpassword\] \[-p prompt\]" + puts "usage: connect_switch \[host\] \[-a adminpassword\] \[-c command\] \[-f file\] \[-h\] \[-l loginpassword\] \[-p prompt\]" exit $rc } diff --git a/master/opt/script/flash_fe306.sh b/master/opt/script/flash_fe306 similarity index 100% rename from master/opt/script/flash_fe306.sh rename to master/opt/script/flash_fe306 diff --git a/master/opt/script/set_mediatray.tcl b/master/opt/script/set_mediatray similarity index 100% rename from master/opt/script/set_mediatray.tcl rename to master/opt/script/set_mediatray diff --git a/trc6500-master-file/changelog b/trc6500-master-file/changelog index b95e918..7263b28 100644 --- a/trc6500-master-file/changelog +++ b/trc6500-master-file/changelog @@ -1,3 +1,8 @@ +trc6500-master-file (7.8.5-1) unstable; urgency=low + * restore /etc/default/webconfig + + -- Laurent Mazet Wed, 16 Sep 2015 15:24:31 +0200 + trc6500-master-file (7.8.4-1) unstable; urgency=low * update softndesign packages * remove rproxy default files -- 2.30.2