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

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:26:44 2006
New Revision: 7882

URL: http://svn.erp5.org?rev=7882&view=rev
Log:
Commit mklivecd-0.6.0-1mdk spec files and patches

Added:
    spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-halt-proc.patch
    spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-no-hotplug.patch
Modified:
    spec/mandriva/2006.0/mklivecd/mklivecd.spec

Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-halt-proc.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-halt-proc.patch?rev=7882&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-halt-proc.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-halt-proc.patch Mon Jun 19 17:26:44 2006
@@ -1,0 +1,11 @@
+--- mklivecd/src/halt.local.in	2006-04-02 00:57:04.000000000 +0200
++++ mklivecd-patched/src/halt.local.in	2006-05-04 14:13:54.000000000 +0200
+@@ -5,7 +5,7 @@
+ use detect_devices;
+ use c;
+ 
+-system("mount -t proc none /proc");
++#system("mount -t proc none /proc");
+ my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/initrd/cdrom\s+iso9660!;
+ system("umount /proc");
+ $device or exit;

Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-no-hotplug.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-no-hotplug.patch?rev=7882&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-no-hotplug.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-no-hotplug.patch Mon Jun 19 17:26:44 2006
@@ -1,0 +1,13 @@
+--- mklivecd/src/mklivecd.in	2006-04-02 01:01:22.000000000 +0200
++++ mklivecd-patched/src/mklivecd.in	2006-05-04 10:45:00.000000000 +0200
+@@ -624,8 +624,8 @@
+ 	if (-e "$o_root/etc/dev.d") {
+ 	    do_cmd("cp -a $o_root/etc/dev.d $dir/etc",	++$pos);
+ 	}  
+-	do_cmd("cp -a $o_root/etc/hotplug $dir/etc",	++$pos);
+-	do_cmd("cp -a $o_root/etc/hotplug.d $dir/etc",	++$pos);
++	#do_cmd("cp -a $o_root/etc/hotplug $dir/etc",	++$pos);
++	#do_cmd("cp -a $o_root/etc/hotplug.d $dir/etc",	++$pos);
+ 	do_cmd("cp -a $o_root/etc/sysconfig $dir/etc",	++$pos);
+ 
+ 	do_cmd("mknod $dir/dev/initrd b 1 250", ++$pos);

Modified: spec/mandriva/2006.0/mklivecd/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd.spec?rev=7882&r1=7881&r2=7882&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd/mklivecd.spec Mon Jun 19 17:26:44 2006
@@ -2,7 +2,7 @@
 
 %define name	mklivecd
 %define version	0.6.0
-%define release	%mkrel 0.2
+%define release	%mkrel 1
 
 %define Summary	Builds a LiveCD from an existing Mandriva Linux installation
 
@@ -14,8 +14,8 @@
 Group:		System/Configuration/Boot and Init
 URL:		http://livecd.berlios.de/
 Source0:	%{name}-%{version}.tar.bz2
-#Patch3:     	mklivecd-0.6.0-no-more-hotplug.patch.bz2
-Patch4:     	mklivecd-0.6.0-proc.patch.bz2
+Patch3:     	mklivecd-0.6.0-no-hotplug.patch.bz2
+Patch4:     	mklivecd-0.6.0-halt-proc.patch.bz2
 Patch5:		mklivecd-0.6.0-keep-lib.patch.bz2
 #Patch5:     	mklivecd-0.6.0-keep-menu.patch.bz2
 #Patch7:     	mklivecd-0.6.0-quiet-mode.patch.bz2
@@ -30,7 +30,7 @@
 
 %prep
 %setup -q -n %{name}
-#%patch3 -p0 -b .hotplug
+%patch3 -p1 -b .hotplug
 # (tv) conflict with rc.sysinit:
 %patch4 -p1 -b .proc
 %patch5 -p1 -b .lib
@@ -59,10 +59,16 @@
 %{_datadir}/mklivecd/
 
 %changelog
-* Thu May 3 2006 christophe Dumez <christophe at nexedi.com> 0.6.0-0.2mdk
+* Thu May 4 2006 christophe Dumez <christophe at nexedi.com> 0.6.0-1mdk
+- removed no longer needed /proc umount patch
+- respect release number convention
+- path not to use hotplug anymore (hardrake is better)
+- added patch to silent mount /proc error message on halt
+
+* Wed May 3 2006 christophe Dumez <christophe at nexedi.com> 0.6.0-0.2mdk
 - added patch to stop /proc umount
 
-* Thu May 1 2006 christophe Dumez <christophe at nexedi.com> 0.6.0-0.1mdk
+* Mon May 1 2006 christophe Dumez <christophe at nexedi.com> 0.6.0-0.1mdk
 - new upstream release
 - removed no longer needed patchs