livecd: livecd.sysconfig, rc.live - use is_yes() function - GL_ALT...

[havner]

Author: havner                       Date: Thu Oct 19 13:21:43 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- use is_yes() function
- GL_ALTERNATIVES

---- Files affected:
livecd:
   livecd.sysconfig (1.6 -> 1.7) , rc.live (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: livecd/livecd.sysconfig
diff -u livecd/livecd.sysconfig:1.6 livecd/livecd.sysconfig:1.7
--- livecd/livecd.sysconfig:1.6	Tue Jul 18 15:31:25 2006
+++ livecd/livecd.sysconfig	Thu Oct 19 15:21:38 2006
@@ -6,6 +6,8 @@
 
 # detect graphic card and configure X.org
 CONFIG_XORG=yes
+# allow coexistence of few GL libraries (needs hand installing)
+GL_ALTERNATIVES=yes
 
 # create mount points and fstab entries for detected cdroms/partitions
 CONFIG_PARTITIONS=yes

================================================================
Index: livecd/rc.live
diff -u livecd/rc.live:1.36 livecd/rc.live:1.37
--- livecd/rc.live:1.36	Wed Sep 27 16:36:41 2006
+++ livecd/rc.live	Thu Oct 19 15:21:38 2006
@@ -160,7 +160,7 @@
 
 show "Autodetecting PCI hardware"
 busy
-if [ "$CONFIG_NET" = "yes" ] && ! getparam nonet; then
+if is_yes "$CONFIG_NET" && ! getparam nonet; then
 	COUNT=0
 	for I in `/usr/sbin/livecd-detect /usr/share/pci-database/net.pci`; do
 		echo ""
@@ -171,7 +171,7 @@
 	echo "" >> /etc/modprobe.conf
 fi
 
-if [ "$CONFIG_SOUND" = "yes" ] && ! getparam nosound; then
+if is_yes "$CONFIG_SOUND" && ! getparam nosound; then
 	COUNT=0
 	SOUND=0
 	for I in `/usr/sbin/livecd-detect -l /usr/share/pci-database/snd.pci`; do
@@ -192,7 +192,7 @@
 	chkconfig --level 35 alsasound off > /dev/null 2>&1
 fi
 
-if [ "$CONFIG_USB" = "yes" ] && ! getparam nousb; then
+if is_yes "$CONFIG_USB" && ! getparam nousb; then
 	COUNT=0
 	for I in `/usr/sbin/livecd-detect /usr/share/pci-database/usb.pci | sort | uniq`; do
 		echo ""
@@ -201,7 +201,7 @@
 	done
 fi
 
-if [ "$CONFIG_PCMCIA" = "yes" ] && ! getparam nopcmcia; then
+if is_yes "$CONFIG_PCMCIA" = "yes" ] && ! getparam nopcmcia; then
 	COUNT=0
 	PCMCIA=0
 	for I in `/usr/sbin/livecd-detect /usr/share/pci-database/pcmcia.pci | sort | uniq`; do
@@ -240,7 +240,7 @@
 ok
 
 
-if [ "$CONFIG_XORG" = "yes" -a -f /etc/X11/xorg.conf ] && ! getparam noxorg; then
+if is_yes "$CONFIG_XORG" && [ -f /etc/X11/xorg.conf ] && ! getparam noxorg; then
 	show "Detecting monitor, graphic card and loading AGP modules"
 	busy
 
@@ -273,18 +273,24 @@
 
 	# fix OpenGL
 	if [ "$MODULE" = "nvidia" ]; then
-		ln -f -s ../../usr/X11R6/lib/libGL-nvidia.so.1.0 /etc/live-alt/libGL.so
-		ln -f -s ../../usr/X11R6/lib/modules/extensions/libglx-nvidia.so.1.0 /etc/live-alt/libglx.so
-		sed -i -e "s/Load.*\"GLcore\"/# GLcore\ disabled/g" /etc/X11/xorg.conf
-		sed -i -e "s/Load.*\"dri\"/# dri\ disabled/g" /etc/X11/xorg.conf
+		if is_yes "$GL_ALTERNATIVES"; then
+			ln -f -s ../../usr/X11R6/lib/libGL-nvidia.so.1.0 /etc/live-alt/libGL.so
+			ln -f -s ../../usr/X11R6/lib/modules/extensions/libglx-nvidia.so.1.0 /etc/live-alt/libglx.so
+			sed -i -e "s/Load.*\"GLcore\"/# GLcore\ disabled/g" /etc/X11/xorg.conf
+			sed -i -e "s/Load.*\"dri\"/# dri\ disabled/g" /etc/X11/xorg.conf
+		fi
 		modprobe -s nvidia >/dev/null 2>&1
 	elif [ "$MODULE" = "fglrx" ]; then
-		ln -f -s ../../usr/X11R6/lib/libGL-fglrx.so.1.2 /etc/live-alt/libGL.so
-		ln -f -s ../../usr/X11R6/lib/modules/extensions/libglx-xfree.so /etc/live-alt/libglx.so
+		if is_yes "$GL_ALTERNATIVES"; then
+			ln -f -s ../../usr/X11R6/lib/libGL-fglrx.so.1.2 /etc/live-alt/libGL.so
+			ln -f -s ../../usr/X11R6/lib/modules/extensions/libglx-xfree.so /etc/live-alt/libglx.so
+		fi
 		modprobe -s fglrx >/dev/null 2>&1
 	else
-		ln -f -s ../../usr/X11R6/lib/libGL-xfree.so.1.2 /etc/live-alt/libGL.so
-		ln -f -s ../../usr/X11R6/lib/modules/extensions/libglx-xfree.so /etc/live-alt/libglx.so
+		if is_yes "$GL_ALTERNATIVES"; then
+			ln -f -s ../../usr/X11R6/lib/libGL-xfree.so.1.2 /etc/live-alt/libGL.so
+			ln -f -s ../../usr/X11R6/lib/modules/extensions/libglx-xfree.so /etc/live-alt/libglx.so
+		fi
 		modprobe gamma >/dev/null 2>&1
 		modprobe i810 >/dev/null 2>&1
 		modprobe i830 >/dev/null 2>&1
@@ -454,7 +460,7 @@
 	echo /dev/${HOME} /home/users auto defaults,noatime 1 2 >> /etc/fstab
 fi
 
-if [ "$CONFIG_PARTITIONS" = "yes" ] && ! getparam nopart; then
+if is_yes "$CONFIG_PARTITIONS" && ! getparam nopart; then
 	show "Making entries in /etc/fstab"
 	busy
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/livecd.sysconfig?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/livecd/rc.live?r1=1.36&r2=1.37&f=u