# HG changeset patch # User Xander Ziiryanoff # Date 1470324517 -7200 # Node ID da648e687bb6fb80127283a2feba8dd167f97c39 # Parent 486e3e2333a7f42e57f4c726f0fb152daf497c75 writeiso: follow changes in syslinux diff -r 486e3e2333a7 -r da648e687bb6 live.cgi --- a/live.cgi Wed Jun 29 10:10:57 2016 +0200 +++ b/live.cgi Thu Aug 04 17:28:37 2016 +0200 @@ -278,7 +278,7 @@ EOT - if [ $(id -u) -eq 0 -a ! -d /media/cdrom/boot/isolinux -a ! -f /boot/*slitaz* ]; then + if [ $(id -u) -eq 0 -a ! -d /media/cdrom/boot/isolinux ]; then msg warn "$(_ 'Cannot find SliTaz ISO/CD mounted in /media/cdrom (You will get only rootfs.gz)')" fi diff -r 486e3e2333a7 -r da648e687bb6 tazlito --- a/tazlito Wed Jun 29 10:10:57 2016 +0200 +++ b/tazlito Thu Aug 04 17:28:37 2016 +0200 @@ -2585,20 +2585,13 @@ umount /media/cdrom } - bootloader="$LOCALSTATE/installed/syslinux/volatile.cpio.gz" if mount /dev/cdrom /media/cdrom 2>/dev/null; then copy_from_cd; elif mount | grep /media/cdrom; then copy_from_cd; - elif [ -f "$bootloader" -a -f /boot/vmlinuz*slitaz* ]; then - cp $bootloader $ROOTCD - cd $ROOTCD - zcat volatile.cpio.gz | cpio -id - rm -f volatile.cpio.gz - [ -f /boot/*slitaz ] && \ - cp /boot/vmlinuz*slitaz $ROOTCD/boot/bzImage - [ -f /boot/*slitaz64 ] && \ - cp /boot/vmlinuz*slitaz64 $ROOTCD/boot/bzImage64 + #elif [ -f "$bootloader" -a -f /boot/vmlinuz*slitaz* ]; then + # [ -f /boot/*slitaz ] && cp /boot/vmlinuz*slitaz $ROOTCD/boot/bzImage + # [ -f /boot/*slitaz64 ] && cp /boot/vmlinuz*slitaz64 $ROOTCD/boot/bzImage64 else touch /tmp/.write-iso-error longline "When SliTaz is running in RAM the kernel and bootloader \