livecd: functions-live - cosmetics - .exec file doesn't have to be...

[havner]

Author: havner                       Date: Tue Jul 18 12:40:25 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- cosmetics
- .exec file doesn't have to be executable

---- Files affected:
livecd:
   functions-live (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: livecd/functions-live
diff -u livecd/functions-live:1.19 livecd/functions-live:1.20
--- livecd/functions-live:1.19	Wed Jul 12 12:53:07 2006
+++ livecd/functions-live	Tue Jul 18 14:40:20 2006
@@ -203,12 +203,12 @@
 done
 }
 
-# load_profile device name1 name2 name3...
+# load_profiles device name1 name2 name3...
 # if device=cd load from LiveCD/profiles/
 # it assumes that all modules/devices/mountpoints are ok
 load_profiles() {
 if [ "$#" -lt "2" ]; then
-	echo "${LREDB}Not enough parameters for load_profile()${LNORMAL}"
+	echo "${LREDB}Not enough parameters for load_profiles()${LNORMAL}"
 	return
 fi
 
@@ -219,7 +219,7 @@
 	DIR=/media/LiveCD/profiles
 else
 	DIR=/media/floppy
-	if ! mount -n -o ro -t auto "$DEV" /media/floppy; then
+	if ! mount -n -o ro -t auto "$DEV" "$DIR"; then
 		echo "${LREDB}Cannot mount ${DEV}${LNORMAL}"
 		return
 	fi
@@ -247,7 +247,7 @@
 		echo "${LBLUEB}Copying profile files ($1)${LNORMAL}"
 		cp -Rpdf ${DIR}/$1/* /
 	fi
-	if [ -x ${DIR}/$1.exec ]; then
+	if [ -f ${DIR}/$1.exec ]; then
 		echo "${LBLUEB}Executing profile file ($1)${LNORMAL}"
 		cp ${DIR}/$1.exec /tmp
 		chmod 755 /tmp/$1.exec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/functions-live?r1=1.19&r2=1.20&f=u