SOURCES (DEVEL): linux-live-package.patch - 6.2.4
patrys
patrys at pld-linux.org
Fri Aug 15 21:54:09 CEST 2008
Author: patrys Date: Fri Aug 15 19:54:09 2008 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- 6.2.4
---- Files affected:
SOURCES:
linux-live-package.patch (1.10.2.8 -> 1.10.2.9)
---- Diffs:
================================================================
Index: SOURCES/linux-live-package.patch
diff -u SOURCES/linux-live-package.patch:1.10.2.8 SOURCES/linux-live-package.patch:1.10.2.9
--- SOURCES/linux-live-package.patch:1.10.2.8 Mon Dec 17 15:19:40 2007
+++ SOURCES/linux-live-package.patch Fri Aug 15 21:54:04 2008
@@ -1,26 +1,6 @@
---- linux-live-5.5.0/.config 2006-09-29 15:30:28.000000000 +0300
-+++ linux-live-5.5.0/.config 2006-10-17 22:53:07.000000000 +0300
-@@ -16,7 +16,8 @@
-
- # 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-}"
-
- # list of directories which will be modularized
- # You may add 'dev' inthere in the case your distro doesn't have udev installed
-@@ -20,7 +20,7 @@
-
- # 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=
-
- # 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
---- linux-live-5.5.0/build 2006-10-13 18:25:50.000000000 +0300
-+++ /usr/lib/linux-live/build 2007-12-16 17:40:02.000000000 +0200
+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
@@ -10,8 +10,8 @@
echo "Changing current directory to $CHANGEDIR"
cd $CHANGEDIR
@@ -45,7 +25,7 @@
if [ "$(ls $VMLINUZ 2>>$DEBUG)" = "" ]; then echo "cannot find $VMLINUZ"; exit 1; fi
header "Creating LiveCD from your Linux"
-@@ -40,7 +40,11 @@
+@@ -50,7 +50,11 @@
mkdir -p $CDDATA/$LIVECDNAME
cp -R cd-root/linux/* $CDDATA/$LIVECDNAME
@@ -58,7 +38,10 @@
cp -R DOC/LICENSE $CDDATA/$LIVECDNAME
cp $VMLINUZ $CDDATA/boot/vmlinuz
-@@ -78,9 +82,14 @@
+@@ -82,12 +86,17 @@
+ fi
+ done
+
-cd $CDDATA/$LIVECDNAME
echo "--------done----------"
-echo
@@ -70,19 +53,89 @@
-read junk
+
+if [ "$ISO_IMAGE" ]; then
-+ cd $CDDATA/$LIVECDNAME
-+ sh make_iso.sh "$ISO_IMAGE"
++ cd $CDDATA/$LIVECDNAME
++ sh make_iso.sh "$ISO_IMAGE"
+else
-+ echo
-+ echo "* run $CDDATA/$LIVECDNAME/make_iso.sh to create ISO image"
-+ echo "* or copy content of $CDDATA to your USB device"
-+ echo "and run ./boot/bootinst.sh (from the device!) to setup boot sector"
-+ echo
-+ echo "Now press Enter..."
-+ read junk
++ echo
++ echo "* run $CDDATA/$LIVECDNAME/make_iso.sh to create ISO image"
++ echo "* or copy content of $CDDATA to your USB device"
++ echo "and run ./boot/bootinst.sh (from the device!) to setup boot sector"
++ echo
++ echo "Now press Enter..."
++ read junk
+fi
---- linux-live-5.5.0/initrd/initrd_create 2006-10-17 19:42:57.000000000 +0300
-+++ linux-live-5.5.0/initrd/initrd_create 2006-12-21 21:36:56.000000000 +0200
+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
+@@ -5,7 +5,7 @@
+ LABEL linux
+ MENU LABEL Run linux
+ KERNEL /boot/vmlinuz
+-APPEND vga=769 initrd=/boot/initrd.gz ramdisk_size=6666 root=/dev/ram0 rw
++APPEND vga=769 initrd=/boot/initrd.gz ramdisk_size=9666 root=/dev/ram0 rw
+
+ LABEL memtest86
+ 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
+@@ -12,10 +12,11 @@
+ exit
+ fi
+
+-CDLABEL="SLAX"
++CDLABEL="LiveCD"
+ ISONAME=$(readlink -f "$1")
+
+-cd $(dirname $0)
++DIRNAME=$(dirname $0)
++DIR=$(cd $DIRNAME; cd ..; pwd)
+
+ if [ "$ISONAME" = "" ]; then
+ SUGGEST=$(readlink -f ../../$(basename $(pwd)).iso)
+@@ -26,4 +27,4 @@
+
+ mkisofs -o "$ISONAME" -v -J -R -D -A "$CDLABEL" -V "$CDLABEL" \
+ -no-emul-boot -boot-info-table -boot-load-size 4 \
+--b boot/isolinux/isolinux.bin -c boot/isolinux/isolinux.boot ../.
++-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 @@
+ # 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.
+-LIVECDNAME="mylinux"
++LIVECDNAME="pldlive"
+
+ # the size of RAMdisk (in KBytes)
+ # 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=$(uname -r)
++image=$(cd $ROOT; readlink boot/vmlinuz)
++KERNEL="${image#vmlinuz-}"
+
+ # 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 @@
+
+ # 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
+
+ # 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
@@ -3,7 +3,7 @@
#
# Author: Tomas M. <http://www.linux-live.org>
@@ -100,20 +153,20 @@
#
rcopy()
{
-@@ -16,7 +17,11 @@
+@@ -33,7 +34,11 @@
cp --parent -a "$REALPATH" "$DEST"
ln -sf "$REALPATH" "$DEST/$SOURCE"
else
- cp --parent -a "$SOURCE" "$DEST"
-+ if [ "$3" ]; then
-+ tar ${3:+-C "$3"} -cf - "${1#$3/}" | tar -C "$DEST" -xf -
-+ else
-+ cp --parent -a "$SOURCE" "$DEST"
-+ fi
++ if [ "$3" ]; then
++ tar ${3:+-C "$3"} -cf - "${1#$3/}" | tar -C "$DEST" -xf -
++ else
++ cp --parent -a "$SOURCE" "$DEST"
++ fi
fi
if [ "$?" -ne 0 ]; then
- echo "---------------------------"
-@@ -31,12 +36,13 @@
+ echo ""
+@@ -51,12 +56,13 @@
# copy file/dir only if it exists, else skip with no error
# $1 = source (may not exist)
# $2 = target PARENT
@@ -128,7 +181,7 @@
fi
}
-@@ -48,19 +54,13 @@
+@@ -69,8 +75,8 @@
##################################################
# Create INITRD image now:
@@ -139,176 +192,20 @@
INITRDIMG=initrd
if [ ! -d $ROOT/$LMK ]; then
- echo "cannot find your kernel modules (*.ko) in $ROOT/$LMK"
+@@ -78,12 +84,6 @@
exit 1
fi
--
+
-if [ "$(ls -1 rootfs/lib)" = "" ]; then
- echo "cannot find essential libc libraries."
- echo "please add ld-linux and libc.so to $(pwd)./rootfs/lib"
- exit 1
-fi
-
- debug "creating empty directory $INITRD_TREE"
---- linux-live-5.5.0/tools/liblinuxlive 2006-11-28 19:08:09.000000000 +0200
-+++ linux-live-5.5.0/tools/liblinuxlive 2006-12-21 21:50:27.000000000 +0200
-@@ -367,6 +367,13 @@
- list_partition_devices
- }
-
-+# List all network drivers
-+#
-+list_network_drivers()
-+{
-+ pcidev /m net
-+}
-+
- # Find file-path on given device
- # Mounts the device in $1 and returns path if found,
- # else unmounts and exits
-@@ -742,11 +742,18 @@
- modprobe_essential_modules()
- {
- debug_log "modprobe_essential_modules" "$*"
-+ echolog "Loading PCI modules"
-+ for m in $(modules_map pcimap); do
-+ modprobe_module $m
-+ done
-
- echolog "starting loop device support"
- modprobe_module loop
- echolog "starting cdrom filesystem support"
- modprobe_module isofs
-+ modprobe_module sr_mod
-+ modprobe_module ide-cd
-+ modprobe_module cdrom
- echolog "starting squashfs support"
- modprobe_module squashfs
- echolog "starting aufs support"
-@@ -756,6 +756,15 @@
- echolog "starting ntfs support"
- modprobe_module fuse # for ntfs-3g
- modprobe_module ntfs # for ro driver
-+
-+ echolog "starting xfs support"
-+ modprobe_module xfs
-+
-+ echolog "starting reiserfs support"
-+ modprobe_module reiserfs
-+
-+ echolog "starting ext3 support"
-+ modprobe_module ext3
- }
-
- # Modprobe kernel modules needed for USB masstorage devices
-@@ -464,6 +493,8 @@
- modprobe_module uhci-hcd
- fi
- modprobe_module usb-storage
-+ modprobe_module usbkbd
-+ modprobe_module usbhid
- }
-
- # Load drivers for PCMCIA Cardbus devices
-@@ -561,6 +593,35 @@
- mdev -s
- echo /bin/mdev > /proc/sys/kernel/hotplug
- }
-+
-+# create modprobe.conf file $1/etc/modprobe.conf with appropriate ethX module aliases
-+# $1 = root directory (union)
-+#
-+modprobe_update()
-+{
-+ i=0
-+ > $1/etc/modprobe.conf
-+ for drv in $(list_network_drivers); do
-+ echo "alias eth$i $drv" >> $1/etc/modprobe.conf
-+ i=$((i+1))
-+ done
-+}
-+
-+# list all pci devices recognized on this system
-+# $1 = pcimap | usbmap
-+modules_map()
-+{
-+ t=$1
-+ d=/proc/bus/pci/devices
-+ k=`uname -r`
-+ while read a id b; do
-+ v=0x0000${id%????}
-+ d=0x0000${id#????}
-+ # pci module vendor device subvendor subdevice class class_mask driver_data
-+ # nvidia 0x000010de 0xffffffff 0xffffffff 0xffffffff 0x00030200 0xffffffff 0x0
-+ echo $v $d
-+ done < $d | grep -f /proc/self/fd/0 /lib/modules/$k/modules.$t | cut -d' ' -f1 | sort -u
-+}
-
- # Modprobe kernel modules needed for the LiveCD
- #
---- linux-live-5.5.0/cd-root/boot/isolinux/isolinux.cfg 2006-05-05 23:25:22.000000000 +0300
-+++ linux-live-5.5.0/cd-root/boot/isolinux/isolinux.cfg 2006-10-03 14:03:53.000000000 +0300
-@@ -7,7 +7,7 @@
- LANEL linux
- MENU LABEL Run linux
- KERNEL /boot/vmlinuz
--APPEND vga=769 initrd=/boot/initrd.gz ramdisk_size=6666 root=/dev/ram0 rw
-+APPEND vga=769 initrd=/boot/initrd.gz ramdisk_size=6666 root=/dev/ram0 rw
-
- LABEL memtest
- MENU LABEL Run Memtest utility
---- linux-live-6.1.5/install~ 2007-05-14 18:50:44.000000000 +0200
-+++ linux-live-6.1.5/install 2007-12-15 22:00:36.196311512 +0100
-@@ -15,18 +15,8 @@
- if [ "$N" = "build" ]; then
- N=install
- else
-- . ./.config || exit 1
-+ . /etc/linux-live/config || exit 1
- if [ "$1" ]; then ROOT="$1"; fi
- fi
-
--if [ "$N" != "uninstall" ]; then
-- mkdir -p $ROOT/usr/bin
-- mkdir -p $ROOT/usr/lib
-- ls -1 ./tools | egrep -v "^lib" | while read FILE; do cp ./tools/$FILE $ROOT/usr/bin; done
-- cat ./tools/liblinuxlive | sed -r 's/^LIVECDNAME=.*/LIVECDNAME="'$LIVECDNAME'"/' > $ROOT/usr/lib/liblinuxlive
--else
-- ls -1 ./tools | egrep -v "^lib" | while read FILE; do rm -v $ROOT/usr/bin/$FILE; done
-- ls -1 ./tools | egrep "^lib" | while read FILE; do rm -v $ROOT/usr/lib/$FILE; done
--fi
-
--echo "Linux Live scripts were $N""ed successfuly in $1/"
-+# No need for installation in PLD
---- linux-live-6.1.5/initrd/initrd_create~ 2007-12-16 16:34:01.000000000 +0100
-+++ linux-live-6.1.5/initrd/initrd_create 2007-12-16 16:36:21.789095746 +0100
-@@ -141,6 +141,7 @@
- ln -s busybox $INITRD_TREE/bin/ls
- ln -s busybox $INITRD_TREE/bin/head
- ln -s busybox $INITRD_TREE/bin/cat
-+ln -s busybox $INITRD_TREE/bin/cut
- ln -s busybox $INITRD_TREE/bin/grep
- ln -s busybox $INITRD_TREE/bin/sleep
- ln -s busybox $INITRD_TREE/bin/sed
-@@ -152,6 +153,9 @@
-
- # necessary modules and dependency files
- mkdir -p $INITRD_TREE/$LMK/kernel/fs
-+rcopy $ROOT/$LMK/kernel/drivers/cdrom $INITRD_TREE
-+rcopy $ROOT/$LMK/kernel/drivers/ide $INITRD_TREE
-+rcopy $ROOT/$LMK/kernel/drivers/ide/pci $INITRD_TREE
- rcopy $ROOT/$LMK/kernel/fs/aufs $INITRD_TREE
- rcopy $ROOT/$LMK/kernel/fs/squashfs $INITRD_TREE
-
-@@ -161,6 +165,7 @@
- rcopy_ex $ROOT/$LMK/kernel/drivers/block/loop.* $INITRD_TREE 2>>$DEBUG
- rcopy_ex $ROOT/$LMK/kernel/fs/fuse/fuse.* $INITRD_TREE 2>>$DEBUG
-
-+rcopy_ex $ROOT/$LMK/kernel/fs/exportfs $INITRD_TREE 2>>$DEBUG
- rcopy_ex $ROOT/$LMK/kernel/fs/isofs $INITRD_TREE 2>>$DEBUG
- rcopy_ex $ROOT/$LMK/kernel/fs/fat $INITRD_TREE 2>>$DEBUG
- rcopy_ex $ROOT/$LMK/kernel/fs/vfat $INITRD_TREE 2>>$DEBUG--- linux-live-6.1.5/initrd/linuxrc 2007-09-10 16:44:18.000000000 +0200
-@@ -200,44 +200,30 @@
+ debug "creating empty directory $INITRD_TREE"
+ rm -Rf $INITRD_TREE
+ mkdir $INITRD_TREE
+@@ -190,44 +190,30 @@
chmod ago-x $INITRD_TREE/usr.lzm
rm -Rf $INITRD_TREE/usr/*
@@ -356,29 +253,94 @@
debug "deleting directory $MOUNTDIR"
-rmdir $MOUNTDIR
-+rm -Rf $MOUNTDIR
++rm -rf $MOUNTDIR
debug "deleting directory $INITRD_TREE"
rm -Rf $INITRD_TREE
---- linux-live/initrd/linuxrc 2007-12-16 19:20:07.382382548 +0100
-+++ linux-live/initrd/linuxrc 2007-12-16 19:20:07.382382548 +0100
-@@ -223,10 +223,10 @@
- cp -fdR /dev .
-
- # find chroot and init
--if [ -x bin/chroot ]; then CHROOT=/bin/chroot; fi
--if [ -x sbin/chroot ]; then CHROOT=/sbin/chroot; fi
--if [ -x usr/bin/chroot ]; then CHROOT=/usr/bin/chroot; fi
--if [ -x usr/sbin/chroot ]; then CHROOT=/usr/sbin/chroot; fi
-+if [ -x bin/chroot ]; then CHROOT=bin/chroot; fi
-+if [ -x sbin/chroot ]; then CHROOT=sbin/chroot; fi
-+if [ -x usr/bin/chroot ]; then CHROOT=usr/bin/chroot; fi
-+if [ -x usr/sbin/chroot ]; then CHROOT=usr/sbin/chroot; fi
- if [ "$CHROOT" = "" ]; then fatal "Can't find executable chroot command"; fi
-
- if [ -x bin/init ]; then INIT=bin/init; fi
-@@ -238,18 +238,9 @@
- header "linux live end, starting the Linux distribution"
+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
+@@ -596,6 +596,13 @@
+ list_partition_devices
+ }
+
++# List all network drivers
++#
++list_network_drivers()
++{
++ pcidev /m net
++}
++
+ # Format mountdir for device. This function used to append _cdrom or _removable
+ # suffix to the directory name so KDE was able to assign a nice icon for evey
+ # device, but this should be done using HAL in KDE nowadays, so we do not
+@@ -732,16 +739,52 @@
+ echo /bin/mdev > /proc/sys/kernel/hotplug # use mdev as a hotplug handler
+ }
+
++# create modprobe.conf file $1/etc/modprobe.conf with appropriate ethX module aliases
++# $1 = root directory (union)
++#
++modprobe_update()
++{
++ i=0
++ > $1/etc/modprobe.conf
++ for drv in $(list_network_drivers); do
++ echo "alias eth$i $drv" >> $1/etc/modprobe.conf
++ i=$((i+1))
++ done
++}
++
++# list all pci devices recognized on this system
++# $1 = pcimap | usbmap
++modules_map()
++{
++ t=$1
++ d=/proc/bus/pci/devices
++ k=`uname -r`
++ while read a id b; do
++ v=0x0000${id%????}
++ d=0x0000${id#????}
++ # pci module vendor device subvendor subdevice class class_mask driver_data
++ # nvidia 0x000010de 0xffffffff 0xffffffff 0xffffffff 0x00030200 0xffffffff 0x0
++ echo $v $d
++ done < $d | grep -f /proc/self/fd/0 /lib/modules/$k/modules.$t | cut -d' ' -f1 | sort -u
++}
++
+ # Modprobe kernel modules needed for the LiveCD
+ #
+ modprobe_essential_modules()
+ {
+ debug_log "modprobe_essential_modules" "$*"
+
++ echolog "Loading PCI modules"
++ for m in $(modules_map pcimap); do
++ modprobe_module $m
++ done
+ echolog "starting loop device support"
+ modprobe_module loop
+ echolog "starting cdrom filesystem support"
+ modprobe_module isofs
++ modprobe_module sr_mod
++ modprobe_module ide-cd
++ modprobe_module cdrom
+ echolog "starting squashfs support"
+ modprobe_module squashfs
+ echolog "starting aufs support with brs=1"
+@@ -784,6 +827,8 @@
+ modprobe_module uhci-hcd
+ fi
+ modprobe_module usb-storage
++ modprobe_module usbkbd
++ modprobe_module usbhid
+ }
+
+ # 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
+@@ -250,18 +250,9 @@
+
mount -n -o remount,ro aufs .
-# We will copy init from the distro to initrd (there should be 2MB free)
@@ -399,18 +361,128 @@
header "!!ERROR!!"
fatal "You are not supposed to be here, something went wrong!"
---- ./cd-root/linux/make_iso.sh 2007-05-14 20:03:33.000000000 +0300
-+++ /usr/lib/linux-live/cd-root/linux/make_iso.sh 2007-12-16 18:11:49.000000000 +0200
-@@ -22,6 +22,12 @@
- if [ "$ISONAME" = "" ]; then ISONAME="$SUGGEST"; fi
+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
+@@ -15,18 +15,7 @@
+ if [ "$N" = "build" ]; then
+ N=install
+ else
+- . ./.config || exit 1
++ . /etc/linux-live/config || exit 1
+ if [ "$1" ]; then ROOT="$1"; fi
fi
-+echo "Writing ISO image to $ISONAME"
- mkisofs -o "$ISONAME" -v -J -R -D -A "$CDLABEL" -V "$CDLABEL" \
- -no-emul-boot -boot-info-table -boot-load-size 4 \
- -b boot/isolinux/isolinux.bin -c boot/isolinux/isolinux.boot ../.
+-if [ "$N" != "uninstall" ]; then
+- mkdir -p $ROOT/usr/bin
+- mkdir -p $ROOT/usr/lib
+- ls -1 ./tools | egrep -v "^lib" | while read FILE; do cp ./tools/$FILE $ROOT/usr/bin; done
+- cat ./tools/liblinuxlive | sed -r 's/^LIVECDNAME=.*/LIVECDNAME="'$LIVECDNAME'"/' > $ROOT/usr/lib/liblinuxlive
+-else
+- ls -1 ./tools | egrep -v "^lib" | while read FILE; do rm -v $ROOT/usr/bin/$FILE; done
+- ls -1 ./tools | egrep "^lib" | while read FILE; do rm -v $ROOT/usr/lib/$FILE; done
+-fi
+-
+-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
+@@ -596,6 +596,13 @@
+ list_partition_devices
+ }
+
++# List all network drivers
++#
++list_network_drivers()
++{
++ pcidev /m net
++}
+
-+if [ $? != 0 ]; then
-+ echo "Error writing ISO image to $ISONAME"
-+ exit 1
-+fi
+ # Format mountdir for device. This function used to append _cdrom or _removable
+ # suffix to the directory name so KDE was able to assign a nice icon for evey
+ # device, but this should be done using HAL in KDE nowadays, so we do not
+@@ -732,16 +739,52 @@
+ echo /bin/mdev > /proc/sys/kernel/hotplug # use mdev as a hotplug handler
+ }
+
++# create modprobe.conf file $1/etc/modprobe.conf with appropriate ethX module aliases
++# $1 = root directory (union)
++#
++modprobe_update()
++{
++ i=0
++ > $1/etc/modprobe.conf
++ for drv in $(list_network_drivers); do
++ echo "alias eth$i $drv" >> $1/etc/modprobe.conf
++ i=$((i+1))
++ done
++}
++
++# list all pci devices recognized on this system
++# $1 = pcimap | usbmap
++modules_map()
++{
++ t=$1
++ d=/proc/bus/pci/devices
++ k=`uname -r`
++ while read a id b; do
++ v=0x0000${id%????}
++ d=0x0000${id#????}
++ # pci module vendor device subvendor subdevice class class_mask driver_data
++ # nvidia 0x000010de 0xffffffff 0xffffffff 0xffffffff 0x00030200 0xffffffff 0x0
++ echo $v $d
++ done < $d | grep -f /proc/self/fd/0 /lib/modules/$k/modules.$t | cut -d' ' -f1 | sort -u
++}
++
+ # Modprobe kernel modules needed for the LiveCD
+ #
+ modprobe_essential_modules()
+ {
+ debug_log "modprobe_essential_modules" "$*"
+
++ echolog "Loading PCI modules"
++ for m in $(modules_map pcimap); do
++ modprobe_module $m
++ done
+ echolog "starting loop device support"
+ modprobe_module loop
+ echolog "starting cdrom filesystem support"
+ modprobe_module isofs
++ modprobe_module sr_mod
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-live-package.patch?r1=1.10.2.8&r2=1.10.2.9&f=u
More information about the pld-cvs-commit
mailing list