From: Laurent Mazet Date: Wed, 11 Feb 2015 14:41:57 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: debian_7.8.1~11 X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=e66ead2800e67fdfdc8a5290bff798b5347e26d0;hp=0871e51fcf371327d570d32d59830f87c35a9ec9;p=debian6500.git Merge remote-tracking branch 'origin/master' --- diff --git a/master/etc/webconfig/alias.csv b/master/etc/webconfig/alias.csv index 2c38af9..e34a3bf 100644 --- a/master/etc/webconfig/alias.csv +++ b/master/etc/webconfig/alias.csv @@ -57,7 +57,7 @@ ipmiwake;/usr/share/webconfig;;Power on all SuperMicro slaves;sudo service ipmiw ammwake;/usr/share/webconfig;;Power off all HS22 IBM slaves;sudo service ammwake stop ipmiwake;/usr/share/webconfig;;Power off all SuperMicro slaves;sudo service ipmiwake stop mediatray;/usr/share/webconfig;;Set media-tray to HS22 master blade;/opt/trc6500/script/set_mediatray amm00 -b 1 -mediatray;/usr/share/webconfig;;Remove media-tray on HS22 chassis;/opt/trc6500/script/set_mediatray amm00 -b -1 && /opt/trc6500/script/set_mediatray amm01 -b -1 +mediatray;/usr/share/webconfig;;Remove media-tray on HS22 chassis;/opt/trc6500/script/set_mediatray amm00 -b 0 && /opt/trc6500/script/set_mediatray amm01 -b 0 ;;;Setup hardware actions; 8mhzmhf;/usr/share/webconfig;;Setup 8MHzMHF mode;sudo /opt/trc6500/script/change_configuration.sh 8MHzMHF 12mhzdf;/usr/share/webconfig;;Setup 12MHzDF mode;sudo /opt/trc6500/script/change_configuration.sh 12MHzDF