livecd: functions-live, livecd, rc.live, pretty/.gtkrc, pretty/.gt...
havner
havner at pld-linux.org
Mon Feb 27 20:51:52 CET 2006
Author: havner Date: Mon Feb 27 19:51:51 2006 GMT
Module: livecd Tag: HEAD
---- Log message:
- next part of minor updates
---- Files affected:
livecd:
functions-live (1.11 -> 1.12) , livecd (1.3 -> 1.4) , rc.live (1.24 -> 1.25)
livecd/pretty:
.gtkrc (1.2 -> 1.3) , .gtkrc-2.0 (1.2 -> 1.3)
livecd/remaster:
livecd_gen_iso (1.14 -> 1.15)
---- Diffs:
================================================================
Index: livecd/functions-live
diff -u livecd/functions-live:1.11 livecd/functions-live:1.12
--- livecd/functions-live:1.11 Fri Jan 27 02:03:29 2006
+++ livecd/functions-live Mon Feb 27 20:51:46 2006
@@ -1,8 +1,7 @@
# Lukasz Pawelczyk <havner at pld-linux.org> 2004
# $Id$
-LIVECD_VERSION=1.0-rc3
-NVIDIA_VERSION=1.0.6629
+LIVECD_VERSION=1.0-rc4
SYMLINKS="
/etc/X11/WindowMaker
@@ -48,15 +47,15 @@
GLFILES="
/usr/lib/libGL.so
/usr/lib/libGL.so.1
-/usr/X11R6/lib/libGL-nvidia.so.$NVIDIA_VERSION
+/usr/X11R6/lib/libGL-nvidia.so.1.0
/usr/X11R6/lib/libGL-xfree.so.1.2
/usr/X11R6/lib/libGL-fglrx.so.1.2
/usr/X11R6/lib/libGL.so
-/usr/X11R6/lib/libGLcore.so.$NVIDIA_VERSION
-/usr/X11R6/lib/libXvMCNVIDIA.so.$NVIDIA_VERSION
+/usr/X11R6/lib/libGLcore.so.1.0
+/usr/X11R6/lib/libXvMCNVIDIA.so.1.0
/usr/X11R6/lib/libfglrx_gamma.so.1.0
/usr/X11R6/lib/modules/extensions/libglx-xfree.a
-/usr/X11R6/lib/modules/extensions/libglx-nvidia.so.$NVIDIA_VERSION
+/usr/X11R6/lib/modules/extensions/libglx-nvidia.so.1.0
/usr/X11R6/lib/modules/extensions/libglx.a
/usr/X11R6/lib/modules/extensions/libglx.so
/usr/X11R6/lib/modules/extensions/libGLcore.a
================================================================
Index: livecd/livecd
diff -u livecd/livecd:1.3 livecd/livecd:1.4
--- livecd/livecd:1.3 Wed Jun 30 18:58:38 2004
+++ livecd/livecd Mon Feb 27 20:51:46 2006
@@ -24,7 +24,7 @@
modprobe $I > /dev/null 2>&1
done
- for I in $DHCP_INTERFACES; do
+ for I in "$DHCP_INTERFACES"; do
if [ "`dmesg | grep $I`" != "" ] || [ "`cat /etc/modprobe.conf | grep $I`" != "" ]; then
show "Backgrounding DHCP for $I"
busy
@@ -37,7 +37,11 @@
busy
COUNT=0
for I in `grep snd-card-[0-9] /etc/modprobe.conf | awk '{print $3}'`; do
- aumix -d /dev/mixer${COUNT} -L > /dev/null 2>&1
+ if [ ${COUNT} -eq 0 ]; then
+ aumix -d /dev/mixer -L > /dev/null 2>&1
+ else
+ aumix -d /dev/mixer${COUNT} -L > /dev/null 2>&1
+ fi
let $((++COUNT))
done
ok
================================================================
Index: livecd/rc.live
diff -u livecd/rc.live:1.24 livecd/rc.live:1.25
--- livecd/rc.live:1.24 Mon Feb 27 17:28:48 2006
+++ livecd/rc.live Mon Feb 27 20:51:46 2006
@@ -14,10 +14,10 @@
touch /fastboot
-if getparam debug > /dev/null; then
- LOG=/dev/console
- dmesg -n 7
-fi
+#if getparam debug > /dev/null; then
+# LOG=/dev/console
+# dmesg -n 7
+#fi
LNORMAL="`termput op`"
LGREENB="`termput setaf 2 1`"
@@ -131,11 +131,11 @@
echo "LANG=\"$LANG\"" >> /etc/sysconfig/i18n
echo "LC_CTYPE=\"$LC_CTYPE\"" >> /etc/sysconfig/i18n
-sed -i -e "s/^KEYTABLE.*/KEYTABLE=$KEYTABLE/g" /etc/sysconfig/console
-sed -i -e "s/^CONSOLEFONT.*/CONSOLEFONT=$CONSOLEFONT/g" /etc/sysconfig/console
-sed -i -e "s/^CONSOLEMAP.*/CONSOLEMAP=$CONSOLEMAP/g" /etc/sysconfig/console
-sed -i -e "s/^ZONE_INFO_AREA.*/ZONE_INFO_AREA=$ZONE_INFO_AREA/g" /etc/sysconfig/timezone
-sed -i -e "s/^TIME_ZONE.*/TIME_ZONE=$TIME_ZONE/g" /etc/sysconfig/timezone
+sed -i -e "s/.*KEYTABLE=.*/KEYTABLE=$KEYTABLE/g" /etc/sysconfig/console
+sed -i -e "s/.*CONSOLEFONT=.*/CONSOLEFONT=$CONSOLEFONT/g" /etc/sysconfig/console
+sed -i -e "s/.*CONSOLEMAP=.*/CONSOLEMAP=$CONSOLEMAP/g" /etc/sysconfig/console
+sed -i -e "s/.*ZONE_INFO_AREA=.*/ZONE_INFO_AREA=$ZONE_INFO_AREA/g" /etc/sysconfig/timezone
+sed -i -e "s/.*TIME_ZONE=.*/TIME_ZONE=$TIME_ZONE/g" /etc/sysconfig/timezone
sed -i -e "s/XCHARSET/${XCHARSET}/g" /root/.Xresources
sed -i -e "s/XCHARSET/${XCHARSET}/g" /root/.gtkrc.mine
@@ -181,27 +181,31 @@
COUNT=0
PCMCIA=0
for I in `/usr/sbin/livecd-detect /usr/share/pci-database/pcmcia.pci | uniq`; do
- echo ""
- echo -n "Pcmcia${COUNT}: ${I}"
- let $((++COUNT))
- echo "PCIC=\"${I}\"" >> /etc/sysconfig/pcmcia
- PCMCIA=1
+ if modprobe ${I} >/dev/null 2>&1; then
+ echo ""
+ echo -n "Pcmcia${COUNT}: ${I}"
+ let $((++COUNT))
+ echo "${I}" >> /etc/modules
+ PCMCIA=1
+ fi
done
if modprobe i82365 >/dev/null 2>&1; then
+ echo ""
echo -n "Pcmcia${COUNT}: i82365"
let $((++COUNT))
- echo "PCIC=\"i82365\"" >> /etc/sysconfig/pcmcia
+ echo "i82365" >> /etc/modules
PCMCIA=1
fi
if modprobe tcic >/dev/null 2>&1; then
+ echo ""
echo -n "Pcmcia${COUNT}: tcic"
let $((++COUNT))
- echo "PCIC=\"tcic\"" >> /etc/sysconfig/pcmcia
+ echo "tcic" >> /etc/modules
PCMCIA=1
fi
-if [ "$PCMCIA" = "1" ]; then
- echo "PCMCIA=yes" >> /etc/sysconfig/pcmcia
-fi
+#if [ "$PCMCIA" = "1" ]; then
+# echo "PCMCIA=yes" >> /etc/sysconfig/pcmcia
+#fi
ok
show "Detecting monitor, graphic card and loading AGP modules"
@@ -224,38 +228,38 @@
AGP=0
for I in `/usr/sbin/livecd-detect /usr/share/pci-database/agp.pci | uniq`; do
AGP=1
- modprobe $I > $LOG 2>&1
+ modprobe $I >/dev/null 2>&1
done
if [ "$AGP" = 0 ]; then
- modprobe sworks-agp > $LOG 2>&1
- modprobe sis-agp > $LOG 2>&1
- modprobe ali-agp > $LOG 2>&1
- modprobe efficeon-agp > $LOG 2>&1
- modprobe ati-agp > $LOG 2>&1
+ modprobe sworks-agp >/dev/null 2>&1
+ modprobe sis-agp >/dev/null 2>&1
+ modprobe ali-agp >/dev/null 2>&1
+ modprobe efficeon-agp >/dev/null 2>&1
+ modprobe ati-agp >/dev/null 2>&1
fi
# fix OpenGL
if [ "$MODULE" = "nvidia" ]; then
- ln -s ../../usr/X11R6/lib/libGL-nvidia.so.$NVIDIA_VERSION /etc/live-alt/libGL.so
- ln -s ../../usr/X11R6/lib/modules/extensions/libglx-nvidia.so.$NVIDIA_VERSION /etc/live-alt/libglx.so
+ 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
- modprobe -s nvidia > $LOG 2>&1
+ modprobe -s nvidia >/dev/null 2>&1
elif [ "$MODULE" = "fglrx" ]; then
- ln -s ../../usr/X11R6/lib/libGL-fglrx.so.1.2 /etc/live-alt/libGL.so
- ln -s ../../usr/X11R6/lib/modules/extensions/libglx-xfree.a /etc/live-alt/libglx.a
- modprobe -s fglrx > $LOG 2>&1
+ 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
+ modprobe -s fglrx >/dev/null 2>&1
else
- ln -s ../../usr/X11R6/lib/libGL-xfree.so.1.2 /etc/live-alt/libGL.so
- ln -s ../../usr/X11R6/lib/modules/extensions/libglx-xfree.a /etc/live-alt/libglx.a
- modprobe gamma > $LOG 2>&1
- modprobe i810 > $LOG 2>&1
- modprobe i830 > $LOG 2>&1
- modprobe mga > $LOG 2>&1
- modprobe r128 > $LOG 2>&1
- modprobe radeon > $LOG 2>&1
- modprobe sis > $LOG 2>&1
- modprobe tdfx > $LOG 2>&1
+ 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
+ modprobe gamma >/dev/null 2>&1
+ modprobe i810 >/dev/null 2>&1
+ modprobe i830 >/dev/null 2>&1
+ modprobe mga >/dev/null 2>&1
+ modprobe r128 >/dev/null 2>&1
+ modprobe radeon >/dev/null 2>&1
+ modprobe sis >/dev/null 2>&1
+ modprobe tdfx >/dev/null 2>&1
fi
# monitor - refresh rates
@@ -394,12 +398,12 @@
show "Loading miscellaneous modules"
busy
-modprobe -s usbkbd > $LOG 2>&1
-modprobe -s pcspkr > $LOG 2>&1
-modprobe -s psmouse > $LOG 2>&1
-modprobe -s sermouse > $LOG 2>&1
-modprobe -s sd_mod > $LOG 2>&1
-modprobe -s usb-storage > $LOG 2>&1
+modprobe -s usbkbd >/dev/null 2>&1
+modprobe -s pcspkr >/dev/null 2>&1
+modprobe -s psmouse >/dev/null 2>&1
+modprobe -s sermouse >/dev/null 2>&1
+modprobe -s sd_mod >/dev/null 2>&1
+modprobe -s usb-storage >/dev/null 2>&1
ok
show "Making entries in /etc/fstab"
@@ -486,16 +490,16 @@
fi
echo "${LBLUEB}Loading modules${LNORMAL}"
- modprobe ext2 > $LOG 2>&1
- modprobe vfat > $LOG 2>&1
+ modprobe ext2 >/dev/null 2>&1
+ modprobe vfat >/dev/null 2>&1
if [ "`echo ${DEV} | grep fd[0-9]`" != "" ]; then
- modprobe floppy > $LOG 2>&1
+ modprobe floppy >/dev/null 2>&1
fi
echo -n "${LGREENB}Select profile name[default] ${LNORMAL}"
read PROFILE
echo "${LBLUEB}Mounting profile device${LNORMAL}"
- mount -n -o ro,exec -t auto ${DEV} /media/floppy > $LOG 2>&1
+ mount -n -o ro,exec -t auto ${DEV} /media/floppy >/dev/null 2>&1
for I in default ${PROFILE}; do
if [ -f /media/floppy/${I}.tar.gz ]; then
echo "${LBLUEB}Copying packed profile files (${I})${LNORMAL}"
@@ -526,11 +530,11 @@
rm -f /tmp/${I}.exec
fi
done
- umount -n /media/floppy > $LOG 2>&1
+ umount -n /media/floppy >/dev/null 2>&1
fi
chown -R user.users /home/users/user
-if getparam debug > /dev/null; then
- dmesg -n $CONSOLE_LOGLEVEL
-fi
+#if getparam debug > /dev/null; then
+# dmesg -n $CONSOLE_LOGLEVEL
+#fi
================================================================
Index: livecd/pretty/.gtkrc
diff -u livecd/pretty/.gtkrc:1.2 livecd/pretty/.gtkrc:1.3
--- livecd/pretty/.gtkrc:1.2 Sat Aug 21 20:52:33 2004
+++ livecd/pretty/.gtkrc Mon Feb 27 20:51:46 2006
@@ -1,5 +1,5 @@
# Autowritten by gnome-settings-daemon. Do not edit
-include "/usr/share/themes/Industrial/gtk/gtkrc"
+include "/usr/share/themes/Bluecurve/gtk/gtkrc"
include "/home/users/user/.gtkrc.mine"
================================================================
Index: livecd/pretty/.gtkrc-2.0
diff -u livecd/pretty/.gtkrc-2.0:1.2 livecd/pretty/.gtkrc-2.0:1.3
--- livecd/pretty/.gtkrc-2.0:1.2 Sat Aug 21 20:52:33 2004
+++ livecd/pretty/.gtkrc-2.0 Mon Feb 27 20:51:46 2006
@@ -1,4 +1,4 @@
-gtk-theme-name = "Industrial"
+gtk-theme-name = "Bluecurve"
gtk-font-name = "Luxi Sans 10"
gtk-menu-drop-shadow = 1
gtk-menu-shadow-delay = 10
================================================================
Index: livecd/remaster/livecd_gen_iso
diff -u livecd/remaster/livecd_gen_iso:1.14 livecd/remaster/livecd_gen_iso:1.15
--- livecd/remaster/livecd_gen_iso:1.14 Mon Feb 27 17:28:48 2006
+++ livecd/remaster/livecd_gen_iso Mon Feb 27 20:51:47 2006
@@ -36,15 +36,15 @@
# preparation, external scripts
-echo "Running livecd_gen_initrd to prepare/fix livecd internal initrd."
-if [ ! -x "`which livecd_gen_initrd`" ]; then
- echo "There is no livecd_gen_initrd script."
- exit 1
-fi
-if ! livecd_gen_initrd; then
- echo "Initrd preparation script failed."
- exit 1
-fi
+#echo "Running livecd_gen_initrd to prepare/fix livecd internal initrd."
+#if [ ! -x "`which livecd_gen_initrd`" ]; then
+# echo "There is no livecd_gen_initrd script."
+# exit 1
+#fi
+#if ! livecd_gen_initrd; then
+# echo "Initrd preparation script failed."
+# exit 1
+#fi
echo Running fix_live
chroot $ROOTFS /usr/local/bin/fix_live
================================================================
---- CVS-web:
http://cvs.pld-linux.org/livecd/functions-live?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/livecd/livecd?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/livecd/rc.live?r1=1.24&r2=1.25&f=u
http://cvs.pld-linux.org/livecd/pretty/.gtkrc?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/livecd/pretty/.gtkrc-2.0?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/livecd/remaster/livecd_gen_iso?r1=1.14&r2=1.15&f=u
More information about the pld-cvs-commit
mailing list