use ether-wake (from busybox) instead of etherwake -> http://www.dbox2world.net/index.php?page=Thread&postID=130279#post130279

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1478 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48878b63fc
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-05-16 (Mon, 16 May 2011)

Origin message was:
------------------
- use ether-wake (from busybox) instead of etherwake -> http://www.dbox2world.net/index.php?page=Thread&postID=130279#post130279

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1478 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit

src/gui/moviebrowser.cpp

@@ -3561,11 +3561,11 @@ int CDirMenu::exec(CMenuTarget* parent, const std::string & actionKey)
         {
             if(dirState[number] == DIR_STATE_SERVER_DOWN)
             {
-                std::string command = "etherwake ";
+                std::string command = "ether-wake ";
                 command += g_settings.network_nfs_mac[dirNfsMountNr[number]];
                 printf("try to start server: %s\n",command.c_str());
                 if(system(command.c_str()) != 0)
-                    perror("etherwake failed");
+                    perror("ether-wake failed");
 
                 dirOptionText[number]="STARTE SERVER";
             }

src/neutrino.cpp

@@ -3225,20 +3225,20 @@ printf("NeutrinoMessages::EVT_BOUQUETSCHANGED\n");fflush(stdout);
 	else if( msg == NeutrinoMessages::ANNOUNCE_RECORD) {
 		system(NEUTRINO_RECORDING_TIMER_SCRIPT);
 		if( g_settings.recording_server_wakeup ) {
-			std::string command = "etherwake ";
+			std::string command = "ether-wake ";
 			command += g_settings.recording_server_mac;
 			if(system(command.c_str()) != 0)
-				perror("etherwake failed");
+				perror("ether-wake failed");
 		}
 		if (g_settings.recording_type == RECORDING_FILE) {
 			char * recordingDir = ((CTimerd::RecordingInfo*)data)->recordingDir;
 			for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++) {
 				if (strcmp(g_settings.network_nfs_local_dir[i],recordingDir) == 0) {
 					printf("[neutrino] waking up %s (%s)\n",g_settings.network_nfs_ip[i].c_str(),recordingDir);
-					std::string command = "etherwake ";
+					std::string command = "ether-wake ";
 					command += g_settings.network_nfs_mac[i];
 					if(system(command.c_str()) != 0)
-						perror("etherwake failed");
+						perror("ether-wake failed");
 					break;
 				}
 			}

src/nhttpd/web/Y_Tools_Check_Install.yhtm

@@ -103,11 +103,11 @@ function do_check(){
 		=}
 	~=}
 	
-	{=var-set:etherwake={=if-equal:{=global-var-get:boxtype=}~coolstream~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}~{=if-file-exists:/bin/etherwake~/bin/etherwake~{=if-file-exists:/var/bin/etherwake~/var/bin/etherwake~=}=}=}=}
+	{=var-set:ether-wake={=if-equal:{=global-var-get:boxtype=}~coolstream~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}=}=}
-	{=if-equal:{=var-get:etherwake=}~false~
+	{=if-equal:{=var-get:ether-wake=}~false~
-		sLog_addRow(sLog_body, "red", "Programs: etherwake is not installed. Wake on LAN is disabled. "+y_url("Help-Tools-Wake_on_LAN"), "failed");
+		sLog_addRow(sLog_body, "red", "Programs: ether-wake is not installed. Wake on LAN is disabled. "+y_url("Help-Tools-Wake_on_LAN"), "failed");
 	~
-		sLog_addRow(sLog_body, "green", "Programs: etherwake is installed at: {=var-get:etherwake=}. Wake on LAN is enabled.", "ok");
+		sLog_addRow(sLog_body, "green", "Programs: ether-wake is installed at: {=var-get:ether-wake=}. Wake on LAN is enabled.", "ok");
 	=}
 	{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
 		/*automount*/

src/nhttpd/web/Y_Tools_Menue.yhtm

@@ -32,7 +32,7 @@ function init(){
 </head>
 {=var-set:automount={=if-file-exists:/sbin/automount~true~{=if-file-exists:/var/bin/automount~true~=}=}=}
 {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip2=}~1~=}=}
-{=var-set:etherwake={=if-equal:{=global-var-get:boxtype=}~coolstream~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}~{=if-file-exists:/bin/etherwake~/bin/etherwake~{=if-file-exists:/var/bin/etherwake~/var/bin/etherwake~=}=}=}=}
+{=var-set:ether-wake={=if-equal:{=global-var-get:boxtype=}~coolstream~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}=}=}
 <body onload="init()">
 <div class="y_menu_sec_box">
 	<div class="y_menu_sec_box_head"><h2>{=L:main.tools=}</h2></div>
@@ -55,7 +55,7 @@ function init(){
 					=}
 				<li><a target="work" title="{=L:tools.mounts_desc=}" href="Y_Settings_mount_liste.yhtm">{=L:tools.mounts=}</a></li>
 				~=}
-				{=if-empty:{=var-get:etherwake=}~
+				{=if-empty:{=var-get:ether-wake=}~
 					<li class="disabled" title="{=L:tools.not_installed=}" >{=L:tools.wake_on_lan=}</li>
 				~
 					<li><a target="work" href="Y_Settings_wol.yhtm">{=L:tools.wake_on_lan=}</a></li>

src/nhttpd/web/scripts/Y_Tools.sh

@@ -439,12 +439,8 @@ proc()
 # -----------------------------------------------------------
 wol()
 {
-	if [ -e /bin/etherwake ]; then
+	if [ -e /bin/ether-wake ]; then
-		msg=`etherwake $1`
+		msg=`ether-wake $1`
-	else
-		if [ -e /bin/ether-wake ]; then
-			msg=`ether-wake $1`
-		fi
 	fi
 	msg="<b>Wake on LAN $1</b><br><br>$msg"
 	y_format_message_html