wok rev 23950
syslinux/taziso: fix tazbootkey
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Sep 20 21:21:51 2020 +0000 (2020-09-20) |
parents | 16f82aa57dfd |
children | 1f97fc4c73f1 |
files | syslinux/stuff/iso2exe/taziso |
line diff
1.1 --- a/syslinux/stuff/iso2exe/taziso Sun Sep 20 18:21:19 2020 +0000 1.2 +++ b/syslinux/stuff/iso2exe/taziso Sun Sep 20 21:21:51 2020 +0000 1.3 @@ -1177,7 +1177,7 @@ 1.4 t248=B3667A2E; t249=C4614AB8; t250=5D681B02; t251=2A6F2B94; 1.5 t252=B40BBE37; t253=C30C8EA1; t254=5A05DF1B; t255=2D02EF8D; 1.6 crc=$((0xFFFFFFFF)) 1.7 - dd if="$ISO" bs=1 skip=$(($1)) count=$(($2)) 2> /dev/null | \ 1.8 + dd if=$device bs=1 skip=$(($1)) count=$(($2)) 2> /dev/null | \ 1.9 od -v -w1 -t u1 -An | { 1.10 while read n; do 1.11 local x=$((($crc ^ $n) & 255)) 1.12 @@ -1247,7 +1247,8 @@ 1.13 mkdosfs -n 'SLITAZ HOME' $homedev 1.14 1.15 # update boot/exe crc16 1.16 - i=$(($(get 2 $1) - 1 + ($(get 4 $1) - 1)*512)) 1.17 + words2bin 0 | ddq bs=1 seek=18 of=$device 1.18 + i=$(($(get 2 $device) - 1 + ($(get 4 $device) - 1)*512)) 1.19 i=$(($(od -v -N $i -t u2 -w2 -An $device | \ 1.20 awk '{ i+= $0 } END { print (i % 65536) }') \ 1.21 + $(get $(($i+1)) $device 1))) 1.22 @@ -1255,8 +1256,9 @@ 1.23 1.24 $DIALOG --clear --title " Set /home persistent " \ 1.25 --yes-label "Continue" --yesno \ 1.26 -"\nThe USB key will run fully in ram. The datas will be lost after reboot.\n\n 1.27 -This option will mount /home on the USB key during the boot process.\n" 16 70 1.28 +"\nThe USB key will run fully in ram. The datas will be lost after each reboot.\n\n 1.29 +This option will mount /home on the USB key vfat during the boot process.\n\n 1.30 +Your own data will be saved, but the system stay not upgradable.\n" 16 70 1.31 if [ $? -eq 0 ]; then 1.32 data="append=home=$(blkid $homedev | sed 's|.* UUID="||;s|".*||') kmap=$(cat /etc/keymap.conf) lang=${LANG%.UTF*} tz=$(cat /etc/TZ) loadfs" 1.33 cat <<EOT | ddn bs=512 seek=$custom of=$device