SOURCES: linux-live-config.patch - read config from /etc

[glen]

Author: glen                         Date: Fri Oct 13 12:52:55 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- read config from /etc

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

---- Diffs:

================================================================
Index: SOURCES/linux-live-config.patch
diff -u SOURCES/linux-live-config.patch:1.1 SOURCES/linux-live-config.patch:1.2
--- SOURCES/linux-live-config.patch:1.1	Tue Oct  3 11:35:08 2006
+++ SOURCES/linux-live-config.patch	Fri Oct 13 14:52:50 2006
@@ -47,8 +47,19 @@
  # where to save resulting livecd ISO image
 -ISO_IMAGE=/tmp/livecd.iso
 +ISO_IMAGE=${ISO_IMAGE:-/home/glen/livecd.iso}
---- linux-live-5.5.0/runme.sh	2006-09-26 22:21:02.000000000 +0300
-+++ _broken-linux-live-5.5.0/runme.sh	2006-09-21 20:07:07.000000000 +0300
+--- linux-live/runme.sh	2006-10-13 15:11:34.000000000 +0300
++++ linux-live/runme.sh	2006-10-13 15:33:24.000000000 +0300
+@@ -10,8 +10,8 @@
+ echo "Changing current directory to $CHANGEDIR"
+ cd $CHANGEDIR
+ 
+-. ./config || exit 1
+-. liblinuxlive || exit 1
++. /etc/linux-live/config || exit 1
++. /usr/lib/liblinuxlive || exit 1
+ 
+ # only root can continue, because only root can read all files from your system
+ allow_only_root
 @@ -19,9 +19,9 @@
  # search for kernel
  VMLINUZ=$ROOT/boot/vmlinuz
@@ -62,3 +73,14 @@
  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-config.patch?r1=1.1&r2=1.2&f=u