--- mcore-src/trunk/mcore-tools/daemon/client/include/hardware.client.class	2011/02/17 21:16:51	1346
+++ mcore-src/trunk/mcore-tools/daemon/client/include/hardware.client.class	2011/03/10 18:14:13	1644
@@ -12,7 +12,7 @@
 	clearconfig
 	addconfig "${device}"
 
-	echo "${device}"
+	rvecho "${device}"
 }
 
 helper_hardware_netcard_driver()
@@ -26,7 +26,7 @@
 	clearconfig
 	addconfig "${driver}"
 
-	echo "${driver}"
+	rvecho "${driver}"
 }
 
 #wlan.device
@@ -52,7 +52,7 @@
 	clearconfig
 	addconfig "${driver}"
 
-	echo "${driver}"
+	rvecho "${driver}"
 }
 
 helper_hardware_disk_device()
@@ -66,7 +66,7 @@
 	clearconfig
 	addconfig "${device}"
 
-	echo "${device}"
+	rvecho "${device}"
 }
 
 helper_hardware_cdrom_device()
@@ -80,7 +80,7 @@
 	clearconfig
 	addconfig "${device}"
 
-	echo "${device}"
+	rvecho "${device}"
 }
 
 helper_hardware_keyboard_device()
@@ -94,7 +94,7 @@
 	clearconfig
 	addconfig "${device}"
 
-	echo "${device}"
+	rvecho "${device}"
 }
 
 # helper_hardware_keyboard_info()
@@ -113,7 +113,7 @@
 	clearconfig
 	addconfig "${device}"
 
-	echo "${device}"
+	rvecho "${device}"
 }
 
 # helper_hardware_mouse_info()
@@ -132,7 +132,7 @@
 	clearconfig
 	addconfig "${device}"
 
-	echo "${device}"
+	rvecho "${device}"
 }
 
 helper_hardware_printer_driver()
@@ -146,7 +146,7 @@
 	clearconfig
 	addconfig "${driver}"
 
-	echo "${driver}"
+	rvecho "${driver}"
 }
 
 # hardware_printer_info()
@@ -165,7 +165,7 @@
 	clearconfig
 	addconfig "${device}"
 
-	echo "${device}"
+	rvecho "${device}"
 }
 
 helper_hardware_sound_driver()
@@ -179,7 +179,7 @@
 	clearconfig
 	addconfig "${driver}"
 
-	echo "${driver}"
+	rvecho "${driver}"
 }
 
 # helper_hardware_sound_info()
@@ -206,7 +206,7 @@
 	clearconfig
 	addconfig "$(echo ${info} | cut -d';' -f3)"
 
-	echo "${info}"
+	rvecho "${info}"
 }
 
 helper_hardware_arch_info()
@@ -220,7 +220,7 @@
 	clearconfig
 	addconfig "${info}"
 
-	echo "${info}"
+	rvecho "${info}"
 }
 
 helper_hardware_cpu_info()
@@ -234,7 +234,7 @@
 	clearconfig
 	addconfig "${info}"
 
-	echo "${info}"
+	rvecho "${info}"
 }
 
 helper_hardware_memory_info()
@@ -248,7 +248,7 @@
 	clearconfig
 	addconfig "${info}"
 
-	echo "${info}"
+	rvecho "${info}"
 }
 
 # helper_hardware_framebuffer_info()
@@ -307,6 +307,12 @@
 	local action="$1"
 	local class="$2"
 
+	# sanity check
+	case "${action}" in
+		info|driver|device) ;;
+		*) help_hardware_detect && return 1 ;;
+	esac
+
 	case "${class}" in
 		memory) helper_hardware_"${class}"_"${action}" ;;
 		cpu) helper_hardware_"${class}"_"${action}" ;;
@@ -320,5 +326,6 @@
 		cdrom) helper_hardware_"${class}"_"${action}" ;;
 		keyboard) helper_hardware_"${class}"_"${action}" ;;
 		mouse) helper_hardware_"${class}"_"${action}" ;;
+		*) help_hardware_detect && return 1 ;;
 	esac
 }