[Erp5-report] r7876 - /spec/mandriva/2006.0/mklivecd/

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:26:04 2006
New Revision: 7876

URL: http://svn.erp5.org?rev=7876&view=rev
Log:
Commit mklivecd-0.5.9-0.14mdk spec files and patches

Added:
    spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-xres.patch
Modified:
    spec/mandriva/2006.0/mklivecd/mklivecd.spec

Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-xres.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-xres.patch?rev=7876&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-xres.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-xres.patch Mon Jun 19 17:26:04 2006
@@ -1,0 +1,39 @@
+--- /usr/src/RPM/SOURCES/mklivecd/src/hwdetect.in	2005-03-03 17:34:27.000000000 +0100
++++ hwdetect.in	2006-02-10 12:14:33.000000000 +0100
+@@ -738,12 +738,12 @@
+ 		eval { $resolution = $rawX->get_resolution };
+ 	}
+ 
+-	# try to make sure we have at least a valid 800x600 before finally setting it
++	# try to make sure we have at least a valid 1024x768 before finally setting it
+ 	if (!defined($resolution) ||
+ 	    !defined($resolution->{X}) || !defined($resolution->{Y}) || !defined($resolution->{Depth}) ||
+-	    ($resolution->{X} < 800 && !defined($cmdline{xres}) && !defined($cmdline{xbpp}))) {
+-		$resolution->{X} = 800;
+-		$resolution->{Y} = 600;
++	    ($resolution->{X} < 1024 && !defined($cmdline{xres}) && !defined($cmdline{xbpp}))) {
++		$resolution->{X} = 1024;
++		$resolution->{Y} = 768;
+ 		$resolution->{Depth} = 16;
+ 	}
+ 	eval { $rawX->set_resolution($resolution) };
+@@ -782,7 +782,7 @@
+ 			
+ 			# sound card specifics not defaulted in MDK
+ 			$modules_conf->set_options('snd-via82xx', 'index=0 dxs_support=2') if $driver =~ /via82xx/;
+-			$modules_conf->set_options('snd-card-intel8x0', 'snd_ac97_clock=41194') if $driver =~ /intel8x0/;
++			#$modules_conf->set_options('snd-card-intel8x0', 'snd_ac97_clock=41194') if $driver =~ /intel8x0/;
+ 			
+ 			$num++;
+ 			# hwdetect_loadmod($card->{driver}, ...) makes alsa break since the init scripts
+@@ -1419,6 +1419,10 @@
+ 	# get disks
+ 	print "\n$COLOR_YELLOW"."HWDETECT: Starting getdisks\n$COLOR_NORMAL";
+ 	hwdetect_getdisks();
++	if ( -e "$prefix/etc/fstab") {
++  		system("cp $prefix/etc/fstab $prefix/etc/fstab.hwdetect.save");
++  		print "The original $prefix/etc/fstab saved  as $prefix/etc/fstab.hwdetect.save";
++  	}
+ 	hwdetect_writedisks();
+ 	if (defined($fdisk)) {
+ 		hwdetect_swapon();

Modified: spec/mandriva/2006.0/mklivecd/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd.spec?rev=7876&r1=7875&r2=7876&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd/mklivecd.spec Mon Jun 19 17:26:04 2006
@@ -2,7 +2,7 @@
 
 %define name	mklivecd
 %define version	0.5.9
-%define release	%mkrel 0.13
+%define release	%mkrel 0.14
 
 %define Summary	Builds a LiveCD from an existing Mandriva Linux installation
 
@@ -23,6 +23,7 @@
 Patch7:         mklivecd-0.5.9-quiet-mode.patch.bz2
 Patch8:         mklivecd-0.5.9-fix-xkb_n_xdm.patch.bz2
 Patch9:         mklivecd-0.5.9-splash.patch.bz2
+Patch10:	mklivecd-0.5.9-xres.patch.bz2
 Requires:	busybox cloop-utils mkisofs drakxtools-newt
 Requires:	squashfs-tools mediacheck syslinux zisofs-tools
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -42,6 +43,7 @@
 %patch7 -p0 -b .quiet
 %patch8 -p0 -b .fix_xorg
 %patch9 -p1 -b .splash
+%patch10 -p0 -b .xres
 
 %build
 # use 800x600 as default resolution like DrakX (some machines dislike 1024x768)
@@ -64,6 +66,11 @@
 %{_datadir}/mklivecd/
 
 %changelog
+* Mon Feb 10 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.14mdk
+- Using a default resolution of 1024 x 764 if possible
+- save up the /etc/fstab if it exists
+- removes a module.conf option added by hwdetect that breaks the loading of the  intel8x0 driver.
+
 * Mon Feb 06 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.13mdk
 - applying the patchs again
 - ship with hwdetect again to get usb mice to work