SOURCES (DEVEL): linux-live-package.patch - fix config

patrys patrys at pld-linux.org
Fri Aug 15 22:29:51 CEST 2008 

Author: patrys                       Date: Fri Aug 15 20:29:51 2008 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- fix config

---- Files affected:
SOURCES:
   linux-live-package.patch (1.10.2.10 -> 1.10.2.11) 

---- Diffs:

================================================================
Index: SOURCES/linux-live-package.patch
diff -u SOURCES/linux-live-package.patch:1.10.2.10 SOURCES/linux-live-package.patch:1.10.2.11
--- SOURCES/linux-live-package.patch:1.10.2.10	Fri Aug 15 22:05:49 2008
+++ SOURCES/linux-live-package.patch	Fri Aug 15 22:29:45 2008
@@ -1,6 +1,6 @@
 diff -urN linux-live-6.2.4.orig/build linux-live-6.2.4/build
 --- linux-live-6.2.4.orig/build	2008-08-15 21:18:01.200408725 +0200
-+++ linux-live-6.2.4/build	2008-08-15 21:22:08.847408414 +0200
++++ linux-live-6.2.4/build	2008-08-15 22:05:24.492408793 +0200
 @@ -10,8 +10,8 @@
  echo "Changing current directory to $CHANGEDIR"
  cd $CHANGEDIR
@@ -66,7 +66,7 @@
 +fi
 diff -urN linux-live-6.2.4.orig/cd-root/boot/isolinux/isolinux.cfg linux-live-6.2.4/cd-root/boot/isolinux/isolinux.cfg
 --- linux-live-6.2.4.orig/cd-root/boot/isolinux/isolinux.cfg	2008-08-15 21:18:01.196408776 +0200
-+++ linux-live-6.2.4/cd-root/boot/isolinux/isolinux.cfg	2008-08-15 21:31:09.593408953 +0200
++++ linux-live-6.2.4/cd-root/boot/isolinux/isolinux.cfg	2008-08-15 22:05:24.493407244 +0200
 @@ -5,7 +5,7 @@
  LABEL linux
  MENU LABEL Run linux
@@ -78,7 +78,7 @@
  MENU LABEL Run Memtest utility
 diff -urN linux-live-6.2.4.orig/cd-root/linux/make_iso.sh linux-live-6.2.4/cd-root/linux/make_iso.sh
 --- linux-live-6.2.4.orig/cd-root/linux/make_iso.sh	2008-08-15 21:18:01.200408725 +0200
-+++ linux-live-6.2.4/cd-root/linux/make_iso.sh	2008-08-15 21:51:34.370395344 +0200
++++ linux-live-6.2.4/cd-root/linux/make_iso.sh	2008-08-15 22:05:24.493407244 +0200
 @@ -12,10 +12,11 @@
    exit
  fi
@@ -101,8 +101,8 @@
 +-b boot/isolinux/isolinux.bin -c boot/isolinux/isolinux.boot "$DIR"
 diff -urN linux-live-6.2.4.orig/.config linux-live-6.2.4/.config
 --- linux-live-6.2.4.orig/.config	2008-08-15 21:18:01.200408725 +0200
-+++ linux-live-6.2.4/.config	2008-08-15 21:31:23.750645139 +0200
-@@ -6,16 +6,17 @@
++++ linux-live-6.2.4/.config	2008-08-15 22:27:43.371409126 +0200
+@@ -6,16 +6,12 @@
  # Live CD Name. Defaults to 'mylinux'; you should change it to your own
  # name if you wish your own branding. Eg. Slax changes it to 'slax'
  # Must not contain any spaces. You'll be asked for this during livecd creation.
@@ -113,29 +113,32 @@
  # if you change this, then you will need to change the same
  # in the following files as well: ./cd-root/boot/isolinux.cfg, ./cd-root/boot/syslinux.cfg, ./cd-root/boot/DOS/config
 -RAM0SIZE=6666
-+RAM0SIZE=9666
- 
- # kernel version. Change it to "2.6.10" for example, if you are building
- # LiveCD with a different kernel than the one you are actually running
+-
+-# kernel version. Change it to "2.6.10" for example, if you are building
+-# LiveCD with a different kernel than the one you are actually running
 -KERNEL=$(uname -r)
-+image=$(cd $ROOT; readlink boot/vmlinuz)
-+KERNEL="${image#vmlinuz-}"
++RAM0SIZE=9666
  
  # list of directories which will be modularized
  # no subdirectories are allowed, no slashes. You can't use /var/tmp here for example
-@@ -30,7 +31,8 @@
+@@ -30,7 +26,13 @@
  
  # change this variable if you installed your distro to some directory.
  # for example ROOT=/tmp/newdir. You may leave it empty, then it defaults to /
 -ROOT=
 +#ROOT=/root/chroot
-+#ISO_IMAGE=/root/mylinux.iso
++#ISO_IMAGE="/root/$LIVECDNAME.iso"
++
++# kernel version. Change it to "2.6.10" for example, if you are building
++# LiveCD with a different kernel than the one you are actually running
++image=$(cd $ROOT; readlink boot/vmlinuz)
++KERNEL="${image#vmlinuz-}"
  
  # If the writable branch (used for changes) doesn't support symlinks or if it
  # doesn't handle chmod attributes well, overmount it using the posix overlay 
 diff -urN linux-live-6.2.4.orig/initrd/initrd_create linux-live-6.2.4/initrd/initrd_create
 --- linux-live-6.2.4.orig/initrd/initrd_create	2008-08-15 21:18:01.185408216 +0200
-+++ linux-live-6.2.4/initrd/initrd_create	2008-08-15 21:34:54.162395305 +0200
++++ linux-live-6.2.4/initrd/initrd_create	2008-08-15 22:05:24.494395149 +0200
 @@ -3,7 +3,7 @@
  #
  # Author:	  Tomas M. <http://www.linux-live.org>
@@ -259,7 +262,7 @@
  rm -Rf $INITRD_TREE
 diff -urN linux-live-6.2.4.orig/initrd/liblinuxlive linux-live-6.2.4/initrd/liblinuxlive
 --- linux-live-6.2.4.orig/initrd/liblinuxlive	2008-08-15 21:18:01.184408508 +0200
-+++ linux-live-6.2.4/initrd/liblinuxlive	2008-08-15 21:29:26.016400213 +0200
++++ linux-live-6.2.4/initrd/liblinuxlive	2008-08-15 22:05:24.494395149 +0200
 @@ -596,6 +596,13 @@
     list_partition_devices
  }
@@ -338,7 +341,7 @@
  # Load drivers for PCMCIA CardBus devices
 diff -urN linux-live-6.2.4.orig/initrd/linuxrc linux-live-6.2.4/initrd/linuxrc
 --- linux-live-6.2.4.orig/initrd/linuxrc	2008-08-15 21:18:01.185408216 +0200
-+++ linux-live-6.2.4/initrd/linuxrc	2008-08-15 21:36:32.449395259 +0200
++++ linux-live-6.2.4/initrd/linuxrc	2008-08-15 22:05:24.495395066 +0200
 @@ -250,18 +250,9 @@
  
  mount -n -o remount,ro aufs .
@@ -363,7 +366,7 @@
  fatal "You are not supposed to be here, something went wrong!"
 diff -urN linux-live-6.2.4.orig/install linux-live-6.2.4/install
 --- linux-live-6.2.4.orig/install	2008-08-15 21:18:01.196408776 +0200
-+++ linux-live-6.2.4/install	2008-08-15 21:32:25.221395472 +0200
++++ linux-live-6.2.4/install	2008-08-15 22:05:24.495395066 +0200
 @@ -15,18 +15,7 @@
  if [ "$N" = "build" ]; then
     N=install
@@ -386,7 +389,7 @@
 -echo "Linux Live scripts were $N""ed successfuly in $1/"
 diff -urN linux-live-6.2.4.orig/tools/liblinuxlive linux-live-6.2.4/tools/liblinuxlive
 --- linux-live-6.2.4.orig/tools/liblinuxlive	2008-08-15 21:18:01.184408508 +0200
-+++ linux-live-6.2.4/tools/liblinuxlive	2008-08-15 21:29:26.016400213 +0200
++++ linux-live-6.2.4/tools/liblinuxlive	2008-08-15 22:05:24.496395473 +0200
 @@ -596,6 +596,13 @@
     list_partition_devices
  }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-live-package.patch?r1=1.10.2.10&r2=1.10.2.11&f=u

More information about the pld-cvs-commit mailing list