wok rev 18783
syslinux: set tz command line argument
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Jan 03 13:17:18 2016 +0100 (2016-01-03) |
parents | 0baf19fb14de |
children | a7830cbdb6b6 |
files | syslinux/receipt syslinux/stuff/iso2exe/iso2exe.c |
line diff
1.1 --- a/syslinux/receipt Sat Jan 02 22:26:27 2016 +0100 1.2 +++ b/syslinux/receipt Sun Jan 03 13:17:18 2016 +0100 1.3 @@ -58,52 +58,57 @@ 1.4 cp $stuff/*.cfg $stuff/*.txt $stuff/help.* $stuff/opts.* $fs/boot/isolinux 1.5 rm -f $fs/boot/isolinux/common.cfg $fs/boot/isolinux/default.cfg 1.6 rm -f $fs/boot/isolinux/display.txt 1.7 - while read label kbd loc menu; do 1.8 + while read label kbd loc tz menu; do 1.9 for i in ${kbd/,/ }; do 1.10 [ -e $src/kbd/$i ] || continue 1.11 cat >> $fs/boot/isolinux/i18n.cfg <<EOT 1.12 LABEL $label 1.13 MENU LABEL $menu 1.14 com32 c32box.c32 1.15 - append kbdmap kbd $i lang=$loc kmap=${kbd#*,} 1.16 + append kbdmap kbd $i lang=$loc kmap=${kbd#*,} tz=$tz 1.17 1.18 EOT 1.19 break 1.20 done 1.21 done <<EOT 1.22 -br br-abnt2 pt_BR Brasil (abnt2) 1.23 -br_ac\ brac us-acentos pt_BR Brasil (us-acentos) 1.24 -cz cz-lat2 cs_CZ Cesky 1.25 -dk dk-latin1 da_DK Dansk 1.26 -de de-latin1 de_DE Deutsch 1.27 -de_CH\ deCH de_CH-latin1 de_CH Deutsch Schweiz 1.28 -gr gr el_GR Ellinika 1.29 -en uk en_GB English UK 1.30 -us us en_US English US 1.31 -us_ac\ usac us-acentos en_US English US (acentos) 1.32 -us_dv\ usdv dvorak en_US English US (dvorak) 1.33 -us_dl\ usdl dvorak-l en_US English US (dvorak-l) 1.34 -us_dr\ usdr dvorak-r en_US English US (dvorak-r) 1.35 -es es es_ES Espanol 1.36 -fr fr-latin1 fr_FR Francais 1.37 -be be-latin1 fr_BE Francais Belgique 1.38 -ca cf fr_CA Francais Canada 1.39 -fr_CH\ frCH fr_CH-latin1 fr_CH Francais Suisse 1.40 -cr hr,croat hr_HR Hrvatski 1.41 -is is-latin1 is_IS Islenska 1.42 -it it it_IT Italiano 1.43 -hu hu hu_HU Magyar 1.44 -nl nl2 nl_NL Nederlands 1.45 -no\ nb no-latin1 nb_NO Norsk (Bokmal) 1.46 -nn no-latin1 nn_NO Norsk (Nynorsk) 1.47 -po pl2 pl_PL Polski 1.48 -pt pt-latin1 pt_PT Portugues 1.49 -ru ru ru_RU Russian 1.50 -sl slovene sl_SI Slovenski 1.51 -fi fi fi_FI Suomi 1.52 -se se-lat6 sv_SE Svenska 1.53 -tr trq tr_TR Turkce 1.54 +br br-abnt2 pt_BR America/Sao_Paulo Brasil (abnt2) 1.55 +br_ac\ brac us-acentos pt_BR America/Sao_Paulo Brasil (us-acentos) 1.56 +cz cz-lat2 cs_CZ Europe/Prague Cesky 1.57 +dk dk-latin1 da_DK Europe/Copenhagen Dansk 1.58 +de de-latin1 de_DE Europe/Berlin Deutsch 1.59 +de_CH\ deCH de_CH-latin1 de_CH Europe/Zurich Deutsch Schweiz 1.60 +gr gr el_GR Europe/Helsinki Ellinika 1.61 +en uk en_GB Europe/London English UK 1.62 +us us en_US America/New_York English US 1.63 +us_ac\ usac us-acentos en_US America/New_York English US (acentos) 1.64 +us_dv\ usdv dvorak en_US America/New_York English US (dvorak) 1.65 +us_dl\ usdl dvorak-l en_US America/New_York English US (dvorak-l) 1.66 +us_dr\ usdr dvorak-r en_US America/New_York English US (dvorak-r) 1.67 +es es es_ES Europe/Madrid Espanol 1.68 +fr fr-latin1 fr_FR Europe/Paris Francais 1.69 +be be-latin1 fr_BE Europe/Brussels Francais Belgique 1.70 +ca cf fr_CA America/Montreal Francais Canada 1.71 +fr_CH\ frCH fr_CH-latin1 fr_CH Europe/Zurich Francais Suisse 1.72 +cr hr,croat hr_HR Europe/Zagreb Hrvatski 1.73 +is is-latin1 is_IS Atlantic/Reykjavik Islenska 1.74 +it it it_IT Europe/Rome Italiano 1.75 +hu hu hu_HU Europe/Budapest Magyar 1.76 +nl nl2 nl_NL Europe/Amsterdam Nederlands 1.77 +no\ nb no-latin1 nb_NO Europe/Oslo Norsk (Bokmal) 1.78 +nn no-latin1 nn_NO Europe/Oslo Norsk (Nynorsk) 1.79 +po pl2 pl_PL Europe/Warsaw Polski 1.80 +pt pt-latin1 pt_PT Europe/Lisbon Portugues 1.81 +ru ru ru_RU Europe/Moscow Russian 1.82 +sl slovene sl_SI Europe/Ljubljan Slovenski 1.83 +fi fi fi_FI Europe/Helsinki Suomi 1.84 +se se-lat6 sv_SE Europe/Stockholm Svenska 1.85 +tr trq tr_TR Asia/Istanbul Turkce 1.86 EOT 1.87 +#hr croat hr_HR Europe/Zagreb Hrvatski 1.88 +#grpc gr-pc el_GR Europe/Helsinki Ellinika 1.89 +#jp jp106 ja_JP Asia/Tokyo Japanese 1.90 +#sg sg-latin1 de_CH Europe/Zurich Deutsch Schweiz (sg) 1.91 +#tr5 tr_q-latin5 tr_TR Asia/Istanbul Turkce (latin5) 1.92 1.93 cat >> $fs/boot/isolinux/i18n.cfg <<EOT 1.94 LABEL exit
2.1 --- a/syslinux/stuff/iso2exe/iso2exe.c Sat Jan 02 22:26:27 2016 +0100 2.2 +++ b/syslinux/stuff/iso2exe/iso2exe.c Sun Jan 03 13:17:18 2016 +0100 2.3 @@ -10,7 +10,12 @@ 2.4 #include <windows.h> 2.5 #endif 2.6 #ifdef __MSDOS__ 2.7 -#define ftruncate(a,b) 2.8 +int ftruncate(int fd, long newsize) 2.9 +{ 2.10 + if (lseek(fd, newsize, SEEK_SET) != -1L) 2.11 + return write(fd, NULL, 0); 2.12 + return -1; 2.13 +} 2.14 #endif 2.15 #ifdef __MINGW32__ 2.16 #define ftruncate chsize 2.17 @@ -263,12 +268,13 @@ 2.18 } 2.19 } 2.20 2.21 -static void clear_config(unsigned i) 2.22 +static unsigned clear_config(unsigned i) 2.23 { 2.24 for (;i % 512; i++) { 2.25 /* clear custom config */ 2.26 write(fd, buffer + 2048, 2048); 2.27 } 2.28 + return i; 2.29 } 2.30 2.31 static unsigned install(char *filename) 2.32 @@ -309,7 +315,7 @@ 2.33 } 2.34 i = getcustomsector(); 2.35 lseek(fd, i * 2048UL, SEEK_SET); 2.36 - clear_config(i); 2.37 + i = clear_config(i); 2.38 ftruncate(fd, i * 2048UL); 2.39 close(fd); 2.40 status = 0;