SVN: livecd/mklive: mklive templates-liveth/initrd/init templates/initrd/init

[qwiat]

Author: qwiat
Date: Thu Oct 14 23:21:48 2010
New Revision: 11845

Modified:
   livecd/mklive/mklive
   livecd/mklive/templates-liveth/initrd/init
   livecd/mklive/templates/initrd/init
Log:
- more USB modules
- Added label for ISO image


Modified: livecd/mklive/mklive
==============================================================================
--- livecd/mklive/mklive	(original)
+++ livecd/mklive/mklive	Thu Oct 14 23:21:48 2010
@@ -102,7 +102,7 @@
 	[ ! -f $sys_source/lib/modules/$kernel_rel/modules.dep ] && echo "Running depmod..." && chroot $sys_source depmod $kernel_rel
 
 	echo "Copying kernel modules to initrd skeleton..."
-	copy_module loop cdrom crc16 crc-t10dif usbhid hid ehci-hcd uhci-hcd ohci-hcd unionfs isofs squashfs
+	copy_module loop cdrom crc16 crc-t10dif usbhid hid ehci-hcd uhci-hcd ohci-hcd xhci-hcd unionfs isofs squashfs usb-storage sr_mod
 	copy_modules_dir kernel/drivers/ata kernel/drivers/scsi
 	[ -d $sys_source/lib/modules/$kernel_rel/kernel/fs/aufs ] && echo "found aufs module" && aufs_module_found=1 && copy_module aufs
 	echo "Copying firmware files to initrd skeleton..."
@@ -246,9 +246,10 @@
 echo "Creating squashfs filesystem: $tmp_iso_root/$live_rootfs_archive..."
 mksquashfs  $sys_source $tmp_iso_root/$live_rootfs_archive -comp $compr > /dev/null || die "Creating live rootfs failed"
 echo "Creating ISO image: $dst_iso..."
-mkisofs -o $dst_iso -b isolinux/isolinux.bin -c isolinux/boot.cat \
+mkisofs -o $dst_iso -V "PLD-Linux LiveCD" -b isolinux/isolinux.bin -c isolinux/boot.cat \
 	-no-emul-boot -boot-load-size 4 -boot-info-table -l -R \
-       	-r $tmp_iso_root  || die "Creating iso image failed."
+       	-r $tmp_iso_root \
+	|| die "Creating iso image failed."
 rm -rf $tmp_iso_root
 rm -rf $tmp_initrd
 echo "Image $dst_iso seems to be ready"

Modified: livecd/mklive/templates-liveth/initrd/init
==============================================================================
--- livecd/mklive/templates-liveth/initrd/init	(original)
+++ livecd/mklive/templates-liveth/initrd/init	Thu Oct 14 23:21:48 2010
@@ -44,7 +44,7 @@
 echo "Loading basic modules..."
 load_module crc16 crc-t10dif loop isofs squashfs
 echo "Loading hardware modules..."
-load_module cdrom scsi_mod sg sr_mod scsi_wait_scan usbhid hid usbcore ehci-hcd ohci-hcd uhci-hcd
+load_module cdrom scsi_mod sg sr_mod scsi_wait_scan usbhid hid usbcore usb-storage ehci-hcd ohci-hcd uhci-hcd xhci-hcd
 rmmod scsi_wait_scan
 is_module_loaded aufs && echo "AUFS enabled" || load_module unionfs
 

Modified: livecd/mklive/templates/initrd/init
==============================================================================
--- livecd/mklive/templates/initrd/init	(original)
+++ livecd/mklive/templates/initrd/init	Thu Oct 14 23:21:48 2010
@@ -44,7 +44,7 @@
 echo "Loading basic modules..."
 load_module crc16 crc-t10dif loop isofs squashfs
 echo "Loading hardware modules..."
-load_module cdrom scsi_mod sg sr_mod scsi_wait_scan usbhid hid usbcore ehci-hcd ohci-hcd uhci-hcd
+load_module cdrom scsi_mod sg sr_mod scsi_wait_scan usbhid hid usbcore usb-storage ehci-hcd ohci-hcd uhci-hcd xhci-hcd
 rmmod scsi_wait_scan
 is_module_loaded aufs && echo "AUFS enabled" || load_module unionfs