SOURCES: linux-live-modprobe.patch, linux-live-config.patch - move...

[glen]

Author: glen                         Date: Fri Oct 13 14:55:03 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- moved initrd_create patching to single file

---- Files affected:
SOURCES:
   linux-live-modprobe.patch (1.1 -> 1.2) , linux-live-config.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/linux-live-modprobe.patch
diff -u SOURCES/linux-live-modprobe.patch:1.1 SOURCES/linux-live-modprobe.patch:1.2
--- SOURCES/linux-live-modprobe.patch:1.1	Tue Oct  3 11:35:08 2006
+++ SOURCES/linux-live-modprobe.patch	Fri Oct 13 16:54:58 2006
@@ -1,5 +1,14 @@
---- _broken-linux-live-5.5.0/initrd/initrd_create	2006-09-26 17:45:45.000000000 +0300
-+++ linux-live-5.5.0/initrd/initrd_create	2006-09-27 15:27:17.000000000 +0300
+--- linux-live/initrd/initrd_create~	2006-10-13 15:48:19.000000000 +0300
++++ linux-live/initrd/initrd_create	2006-10-13 15:50:44.000000000 +0300
+@@ -3,7 +3,7 @@
+ #
+ # Author:	  Tomas M. <http://www.linux-live.org>
+ 
+-. ../config || exit 1
++. /etc/linux-live/config || exit 1
+ 
+ # rcopy is a recursive cp, which copies also symlink's real source
+ # $1 = source (may be a regular file or symlink)
 @@ -109,7 +109,22 @@
  ln -s busybox $INITRD_TREE/bin/cat
  ln -s busybox $INITRD_TREE/bin/grep

================================================================
Index: SOURCES/linux-live-config.patch
diff -u SOURCES/linux-live-config.patch:1.2 SOURCES/linux-live-config.patch:1.3
--- SOURCES/linux-live-config.patch:1.2	Fri Oct 13 14:52:50 2006
+++ SOURCES/linux-live-config.patch	Fri Oct 13 16:54:58 2006
@@ -73,14 +73,3 @@
  if [ "`ls $VMLINUZ 2>>$DEBUG`" = "" ]; then echo "cannot find $VMLINUZ"; exit 1; fi
  
  header "Creating LiveCD from your Linux"
---- linux-live/initrd/initrd_create~	2006-10-13 15:48:19.000000000 +0300
-+++ linux-live/initrd/initrd_create	2006-10-13 15:50:44.000000000 +0300
-@@ -3,7 +3,7 @@
- #
- # Author:	  Tomas M. <http://www.linux-live.org>
- 
--. ../config || exit 1
-+. /etc/linux-live/config || exit 1
- 
- # rcopy is a recursive cp, which copies also symlink's real source
- # $1 = source (may be a regular file or symlink)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-live-modprobe.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/linux-live-config.patch?r1=1.2&r2=1.3&f=u