Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500

Conflicts:
	master/root/bin/colorlog

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 ad666cc0e65674b31f53a077b8067da39a097dd1..6b9d9c20955e2075533ea2910804866af9805a36 100644 (file)
--- a/master/etc/webconfig/alias.d/50-trc6500-master-file.csv
+++ b/master/etc/webconfig/alias.d/50-trc6500-master-file.csv
@@ -74,8 +74,8 @@ ammwake;/usr/share/webconfig;;Power on all HS22 IBM slaves;sudo service ammwake
 ipmiwake;/usr/share/webconfig;;Power on all SuperMicro slaves;sudo service ipmiwake start
 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/script/set_mediatray amm00 -b 1
-mediatray;/usr/share/webconfig;;Remove media-tray on HS22 chassis;/opt/script/set_mediatray amm00 -b 0 && /opt/script/set_mediatray amm01 -b 0
+mt_set;/usr/share/webconfig;;Set media-tray to HS22 master blade;/opt/script/set_mediatray amm00 -b 1
+mt_unset;/usr/share/webconfig;;Remove media-tray on HS22 chassis;/opt/script/set_mediatray amm00 -b 0 && /opt/script/set_mediatray amm01 -b 0
 ;;;Setup hardware actions;
 8mhzmhf;/usr/share/webconfig;;Setup 8MHzMHF mode;sudo /opt/script/change_configuration 8MHzMHF
 12mhzdf;/usr/share/webconfig;;Setup 12MHzDF mode;sudo /opt/script/change_configuration 12MHzDF

diff --git a/master/root/bin/colorlog b/master/root/bin/colorlog
index c261b7d73e77147ea4e2a3905c750ec65ac982c9..7e0ae004676bfc55f23700a6c92afac5dcd6d7a5 100755 (executable)
--- a/master/root/bin/colorlog
+++ b/master/root/bin/colorlog
@@ -1,7 +1,7 @@
 #!/usr/bin/awk -f
-/TRACE/ {$0="\033[0;34m"$0"\033[0;0m"}
-/DEBUG/ {$0="\033[0;32m"$0"\033[0;0m"}
-/INFO/  {}
-/WARN/  {$0="\033[0;33m"$0"\033[0;0m"}
-/ERROR/ {$0="\033[0;31m"$0"\033[0;0m"}
+/TRACE/ {$0="\033[1;34m" $0 "\033[0;0m"} # blue
+/DEBUG/ {$0="\033[1;32m" $0 "\033[0;0m"} # green
+/INFO/ {}
+/WARN/ {$0="\033[1;33m" $0 "\033[0;0m"} # yellow
+/ERROR/ {$0="\033[1;31m" $0 "\033[0;0m"} # red
 {print}