livecd: rc.live - cosmetics - another syntax - load default profil...

[havner]

Author: havner                       Date: Wed Jul 12 08:23:17 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- cosmetics
- another syntax
- load default profile from CD

---- Files affected:
livecd:
   rc.live (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: livecd/rc.live
diff -u livecd/rc.live:1.31 livecd/rc.live:1.32
--- livecd/rc.live:1.31	Wed Jul 12 09:58:15 2006
+++ livecd/rc.live	Wed Jul 12 10:23:12 2006
@@ -457,9 +457,6 @@
 fi
 ok
 
-show "Making entries in /etc/fstab"
-busy
-
 echo "# autogenerated" >> /etc/fstab
 
 HOME="`getparam home`"
@@ -468,6 +465,9 @@
 fi
 
 if [ "$CONFIG_PARTITIONS" = "yes" ] && ! getparam nopart; then
+	show "Making entries in /etc/fstab"
+	busy
+
 	COUNT=0
 	for I in `get_cdroms`; do
 		if [ ${COUNT} -eq 0 ]; then
@@ -499,12 +499,14 @@
 		echo /dev/${I} /mnt/${I}_ntfs ntfs user,noauto,umask=002,uid=0,gid=28,nls=iso8859-2 0 0 >> /etc/fstab
 		mkdir /mnt/${I}_ntfs
 	done
-fi
 
-ok
+	ok
+fi
 
 # profile section
 
+load_profiles cd default
+
 if getparam pretty; then
 	load_profiles cd pretty
 fi
@@ -540,7 +542,7 @@
 		modprobe floppy >/dev/null 2>&1
 	fi
 
-	load_profiles "$DEV" default $NAME; do
+	load_profiles "$DEV" default $NAME
 fi
 
 chown -R user:users /home/users/user
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/rc.live?r1=1.31&r2=1.32&f=u