slitaz-tools rev 490
bootfloppybox: fix floppy full case
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat May 01 15:46:47 2010 +0200 (2010-05-01) |
parents | ba631807a0e1 |
children | 423776a7bd8b |
files | tinyutils/bootfloppybox |
line diff
1.1 --- a/tinyutils/bootfloppybox Thu Apr 29 07:11:47 2010 -0400 1.2 +++ b/tinyutils/bootfloppybox Sat May 01 15:46:47 2010 +0200 1.3 @@ -330,15 +330,15 @@ 1.4 uudecode <<EOT | dd of=$bs conv=notrunc 2> /dev/null 1.5 begin-base64 644 - 1.6 /L+6nWgAkAcGF4n8McC5HQDzq1sfD6mg8X1ABlfFd3ixBvOlZWaPR3gGH8ZF 1.7 -+D/6l1hB6CsBvgACA3QO6HYBWwseKAJ0K1PoUgFe6GcBsCDNELAIzRBO6GYB 1.8 -PAh0A4gErTk2KAJ08Og/ATwKdeCIfP6J5v9MEP9MGL/0AYFNHP+Ax0UwAJyw 1.9 -ELEFSLSTiUQcsAGJRBSYZpjT4EhmAwVm0+hoABAHv4AAKficcwIBxzHbUFbo 1.10 -5QBeuQCAtIf+RBzNFVidd9yhGgK/HAKxCThEHHK4k80T6gAAIJCwRijIvtsB 1.11 -6NMAXesjgPkTcgQ4wXdjgP4CcgQ45ndkYIH9AAZ0KgZSUVOWtAJQsQa1BMHF 1.12 -BLAPIegEkCcUQCfojQD+zXXssCDNEOK06JcAmM0TYVJQKMh3ArABmDn4cgKJ 1.13 -+FC0As0TlV5YWnKgT0GAxwJOdfg4wXVFiMj+xrEBOOZ1O4j0/sW2ADou8AFy 1.14 -L4D9UHIqtQBgvt4B/kQMU+g6AFvoQQB1FlKYzRO4AQLNE1rQ1Dpk/nXqRgjk 1.15 -deVhlY7hT4zhiehHdYoWB7AxLAO0DrsHAM0QPA1088OwDejv/6wIwHX4w79s 1.16 ++D/6l1hB6DQBvgACA3QO6HYBWwseKAJ0LFNH6AoBXuhmAbAgzRCwCM0QTuhl 1.17 +ATwIdAOIBK05NigCdPDoPgE8CnXgiHz+ieb/TBD/TBi/9AGBTRz/gMdFMACc 1.18 +sBCxBUi0k4lEHLABiUQUmGaY0+BIZgMFZtPoaAAQB7+AACn4nHMCAccx21BW 1.19 +6J4AXrkAgLSH/kQczRVYnXfcoRoCvxwCsQk4RBxyuJPNE+oAACCQsEYoyL7b 1.20 +AejSAF3rI4D5E3IEOMF3a4D+AnIEOOZ3bGCB/QAGdCoGUlFTlrQCULEGtQTB 1.21 +xQSwDyHoBJAnFEAn6IwA/s117LAgzRDitOiWAJjNE2FSUCjIdwKwAZg5+HIC 1.22 +ifhQtALNE5VeWFpyoJVBjuGAxwJPdFFOdfSM4ZU4wXVFiMj+xrEBOOZ1O4j0 1.23 +/sW2AID9UHIwOi7wAXIqtQBgvt4B/kQMU+gxAFvoOAB1FlKYzRO4AQLNE1rQ 1.24 +1Dpk/nXqRgjkdeVh64sWB7AxLAO0DrsHAM0QPA1088OwDejv/6wIwHX4w79s 1.25 BLFbZQINuA0BZToNdArNFnT0mM0Wju9Hw1g6AEluc2VydCBkaXNrIDEuBw0A 1.26 AA== 1.27 ==== 1.28 @@ -402,7 +402,7 @@ 1.29 # Create boot floppy set from kernel, initrd & cmdline 1.30 floppyset() 1.31 { 1.32 - floppysetcat $@ | split -b 1440k /dev/stdin floppy$$ 1.33 + floppysetcat "$@" | split -b 1440k /dev/stdin floppy$$ 1.34 i=1 1.35 ls floppy$$* | while read file ; do 1.36 output=$(printf "fd%03d.img" $i) 1.37 @@ -539,7 +539,7 @@ 1.38 cmdline="$(grep append /tmp/iso$$/boot/isolinux/isolinux.cfg | tail -n 1 | sed 's/.*gz //')" 1.39 ( cd /tmp/rootfs$$/fs ; find | cpio -o -H newc ) | lzma e /tmp/rootfs$$/rootfs -si 1.40 echo "Create first stage boot floppies..." 1.41 - floppyset $bzimage /tmp/rootfs$$/rootfs $cmdline 1.42 + floppyset $bzimage /tmp/rootfs$$/rootfs "$cmdline" 1.43 base=100 1.44 for i in /tmp/rootfs$$/[1-9]* ; do 1.45 [ -d $i ] || continue 1.46 @@ -633,7 +633,7 @@ 1.47 retval=$? 1.48 exec 3>&- 1.49 check_retval 1.50 - bootfloppybox call mkfloppies $KERNEL $INITRD $CMDLINE && 1.51 + bootfloppybox call mkfloppies "$KERNEL" "$INITRD" "$CMDLINE" && 1.52 dialogwritefloppyset || 1.53 dialognofloppyset 1.54 } 1.55 @@ -763,7 +763,7 @@ 1.56 <button> 1.57 <input file icon="forward"></input> 1.58 <label>Create image set</label> 1.59 - <action>cd $OUTPUT_DIRECTORY; bootfloppybox call mkfloppies $KERNEL $INITRD $CMDLINE</action> 1.60 + <action>cd $OUTPUT_DIRECTORY; bootfloppybox call mkfloppies "$KERNEL" "$INITRD" "$CMDLINE"</action> 1.61 <action type="closewindow">IMAGE_SET</action> 1.62 </button> 1.63 </hbox> 1.64 @@ -918,7 +918,7 @@ 1.65 ;; 1.66 mkfloppies) 1.67 shift 2 1.68 - floppyset $@ 1.69 + floppyset "$@" 1.70 sz=$(cat fd???.img | wc -c) 1.71 if [ -n "$XAUTHORITY" ]; then 1.72 gtkdialogshowfloppyset $sz