tazlito rev 428
writeiso: follow changes in syslinux
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Thu Aug 04 17:28:37 2016 +0200 (2016-08-04) |
parents | 486e3e2333a7 |
children | 6daedd809d1b |
files | live.cgi tazlito |
line diff
1.1 --- a/live.cgi Wed Jun 29 10:10:57 2016 +0200 1.2 +++ b/live.cgi Thu Aug 04 17:28:37 2016 +0200 1.3 @@ -278,7 +278,7 @@ 1.4 </table> 1.5 EOT 1.6 1.7 - if [ $(id -u) -eq 0 -a ! -d /media/cdrom/boot/isolinux -a ! -f /boot/*slitaz* ]; then 1.8 + if [ $(id -u) -eq 0 -a ! -d /media/cdrom/boot/isolinux ]; then 1.9 msg warn "$(_ 'Cannot find SliTaz ISO/CD mounted in /media/cdrom (You will get only rootfs.gz)')" 1.10 fi 1.11
2.1 --- a/tazlito Wed Jun 29 10:10:57 2016 +0200 2.2 +++ b/tazlito Thu Aug 04 17:28:37 2016 +0200 2.3 @@ -2585,20 +2585,13 @@ 2.4 umount /media/cdrom 2.5 } 2.6 2.7 - bootloader="$LOCALSTATE/installed/syslinux/volatile.cpio.gz" 2.8 if mount /dev/cdrom /media/cdrom 2>/dev/null; then 2.9 copy_from_cd; 2.10 elif mount | grep /media/cdrom; then 2.11 copy_from_cd; 2.12 - elif [ -f "$bootloader" -a -f /boot/vmlinuz*slitaz* ]; then 2.13 - cp $bootloader $ROOTCD 2.14 - cd $ROOTCD 2.15 - zcat volatile.cpio.gz | cpio -id 2.16 - rm -f volatile.cpio.gz 2.17 - [ -f /boot/*slitaz ] && \ 2.18 - cp /boot/vmlinuz*slitaz $ROOTCD/boot/bzImage 2.19 - [ -f /boot/*slitaz64 ] && \ 2.20 - cp /boot/vmlinuz*slitaz64 $ROOTCD/boot/bzImage64 2.21 + #elif [ -f "$bootloader" -a -f /boot/vmlinuz*slitaz* ]; then 2.22 + # [ -f /boot/*slitaz ] && cp /boot/vmlinuz*slitaz $ROOTCD/boot/bzImage 2.23 + # [ -f /boot/*slitaz64 ] && cp /boot/vmlinuz*slitaz64 $ROOTCD/boot/bzImage64 2.24 else 2.25 touch /tmp/.write-iso-error 2.26 longline "When SliTaz is running in RAM the kernel and bootloader \