Index: /drbl-hadoop-live/test-live-helper.sh
===================================================================
--- /drbl-hadoop-live/test-live-helper.sh	(revision 148)
+++ /drbl-hadoop-live/test-live-helper.sh	(revision 149)
@@ -10,19 +10,44 @@
 ## [3] man lh_config and lh_build
 
-###	       -b|--binary-images iso|net|tar|usb-hdd
-###	       --binary-filesystem fat16|fat32|ext2
-###	       --binary-indices enabled|disabled
-###	       --bootstrap-config FILE
-###	       -f|--bootstrap-flavour minimal|standard
-###	       --cache enabled|disabled
-###	       --cache-indices enabled|disabled
-###	       --categories CATEGORY|"CATEGORIES"
-###	       -d|--distribution CODENAME
-###	       --hostname NAME
-###	       -m|--mirror-bootstrap URL
-###	       --mirror-chroot URL
+## Check current distribution is debian-like or not
+if [ ! -f /etc/debian_version ]; then
+  echo "[ERROR] This script must run on Debian or Ubuntu !!"
+  exit
+fi
+
+## If /usr/bin/lh is not found, install live-helper package first!!
+if [ ! -x /usr/bin/lh ]; then
+  echo "[WARN] live-helper not found!! I will install it first for you!!"
+  apt-get install -y live-helper
+fi
+
+## [MEMO] following parameter is for live-helper ...........
+###	       -b|--binary-images	iso|net|tar|usb-hdd
+###	       --binary-filesystem	fat16|fat32|ext2
+###	       --binary-indices		enabled|disabled
+###	       --bootstrap-config	FILE
+###	       -f|--bootstrap-flavour	minimal|standard
+###	       --cache			enabled|disabled
+###	       --cache-indices		enabled|disabled
+###	       --categories		CATEGORY|"CATEGORIES"
+###	       -d|--distribution	CODENAME
+###	       --hostname		NAME
+###	       -m|--mirror-bootstrap	URL
+###	       --mirror-chroot		URL
 ###	       --mirror-chroot-security URL
-###	       --username NAME
-sudo lh clean --binary
-sudo lh_config -b iso --binary-indices disabled -f minimal --cache enabled --cache-indices enabled --categories 'main non-free' -d lenny --hostname hadoop -m http://free.nchc.org.tw/debian --mirror-chroot http://free.nchc.org.tw/debian --mirror-chroot-security http://free.nchc.org.tw/debian-security --mirror-binary http://free.nchc.org.tw/debian --mirror-binary-security http://free.nchc.org.tw/debian-security --username hadoop --packages 'ssh sudo xserver-xorg-video-vesa xinit xfonts-base x11-xserver-utils xterm openbox iceweasel dhcp3-client' -k 686
-sudo lh build
+###	       --username		NAME
+
+lh clean --binary
+# [Note] option '--categories' is only avaible at live-helper 1.0.3-2
+lh config -b iso --binary-indices disabled -f minimal --cache enabled --cache-indices enabled --categories 'main non-free' -d lenny --hostname hadoop -m http://free.nchc.org.tw/debian --mirror-chroot http://free.nchc.org.tw/debian --mirror-chroot-security http://free.nchc.org.tw/debian-security --mirror-binary http://free.nchc.org.tw/debian --mirror-binary-security http://free.nchc.org.tw/debian-security --username hadoop --packages 'ssh sudo xserver-xorg-video-vesa xinit xfonts-base x11-xserver-utils xterm openbox iceweasel dhcp3-client' -k 686
+
+# add non-free apt repository for chroot stage
+echo << EOF > config/chroot_sources/non-free.chroot
+deb http://free.nchc.org.tw/debian lenny non-free
+EOF
+
+lh build
+
+if [ -f binary.iso ]; then
+  cp binary.iso `date +"hadoop-live-%y%m%d%H%M.iso"`
+fi