# HG changeset patch # User Christophe Lincoln # Date 1329053176 -3600 # Node ID 204840df8a13030db1466f494d6c20fc4fd773e4 # Parent 6095f1582327b3363b57cc6e5370033c848797c1 syslinux: New graphical boot menu for Live CD/USB system with easy access to web boot, help, cmdline and i18n config diff -r 6095f1582327 -r 204840df8a13 syslinux-modules/receipt --- a/syslinux-modules/receipt Sun Feb 12 03:00:54 2012 +0100 +++ b/syslinux-modules/receipt Sun Feb 12 14:26:16 2012 +0100 @@ -15,7 +15,7 @@ mkdir -p $fs/usr/share/boot for i in $src/com32/*/*.c32 ; do case "$i" in - */reboot.c32|*/ifmem.c32) continue;; + */reboot.c32|*/ifmem.c32|*/vesamenu.c32) continue;; esac lzma e $i $fs/usr/share/boot/$(basename $i).lzma 2> /dev/null done diff -r 6095f1582327 -r 204840df8a13 syslinux/receipt --- a/syslinux/receipt Sun Feb 12 03:00:54 2012 +0100 +++ b/syslinux/receipt Sun Feb 12 14:26:16 2012 +0100 @@ -38,13 +38,15 @@ cp -a $src/core/isolinux.bin $fs/boot/isolinux cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux cp -a $src/com32/modules/ifmem.c32 $fs/boot/isolinux + cp -a $src/com32/menu/vesamenu.c32 $fs/boot/isolinux cp -a $src/modules/poweroff.com $fs/boot/isolinux - cp $stuff/*.cfg $stuff/*.txt $stuff/*.msg $fs/boot/isolinux + # $stuff/isolinux.msg is the old way the have a splash image. + cp $stuff/*.cfg $stuff/*.txt $stuff/help.* $stuff/opts.* $fs/boot/isolinux while read cfg kbd loc ; do sed -e "s/^display/kbdmap $cfg.kbd\ndisplay/" \ -e "s/^label/say Now using $kbd keyboard and $loc locale.\nlabel/" \ -e "s/rootfs.gz/rootfs.gz lang=$loc kmap=$kbd/" \ - < $fs/boot/isolinux/isolinux.cfg > $fs/boot/isolinux/$cfg.cfg + < $fs/boot/isolinux/default.cfg > $fs/boot/isolinux/$cfg.cfg cp $src/$kbd.kbd $fs/boot/isolinux/$cfg.kbd cat >> $fs/boot/isolinux/common.cfg < pour booter, ou pour afficher l'aide. - [Login] 'hacker' ou 'root' avec le mot de passe 'root'. - - to boot the Box or for help. - [Login] 'hacker' or 'root' with password 'root'. - - - */ + SliTaz GNU/linux - Boot prompt + Press to boot or for help. + diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/enhelp.txt --- a/syslinux/stuff/enhelp.txt Sun Feb 12 03:00:54 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -===================================================================== -F5 SliTaz GNU/Linux - Temporary Autonomous Zone. help -===================================================================== - - SliTaz operates in RAM, it does not alter your current distribution. - SliTaz runs a Linux kernel and free software from the GNU project. - When launched, SliTaz gives you many useful commands, file - handling, internet etc. - - Launch SliTaz. - Display splash image. - Display welcome message. - Display this page. - List available boot options. - [country] Select keyboard [be,br,ca,de,de_CH,en,es,fi,fr,fr_CH...] - - Slitaz GNU/Linux is provided "as is", without a warranty of any kind, - expressed or implied. This program is distributed in the hope that it - will be useful. - - Web site : http://www.slitaz.org/ - IRC channel : irc.freenode.net #slitaz - diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/enopts.txt --- a/syslinux/stuff/enopts.txt Sun Feb 12 03:00:54 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -===================================================================== -F6 SliTaz GNU/Linux - Temporary Autonomous Zone. options -===================================================================== - - irqpoll : Recommended if problems with interrupts. - no387 : Disable mathematical coprocessor emulation. - vga=XXX : Change video mode or framebuffer. - 788 (800x600), 791 (1024x768), 775 (1280x1024). - - -------------------- SliTaz boot options ------------------ - home=sda[1-9] : Mount and use USB key or external disk partition - as /home partition. The home=usb option mounts the - first partition (sda1) on /home. - config=, : Execute a script found on a device. - Example : config=/dev/hda1,slitaz.sh - modprobe= : Force module(s) to load. - lang=* : Select language [en,fr_CH,fr_FR] - kmap=* : Select keyboard [de-latin1,fr-latin1,fr_CH-latin1...] - sound=no : Remove all sound kernel modules. - sound=noconf : Do not configure sound card. - screen= : Define screen type [text, 640x480x16..1920x1440x24] - user=* : Username account. Default "tux". - xarg=* : Extra parameter for the X server [-2button,-dumb,-nozap...] - - usage: slitaz [option]; Example : - boot: slitaz irqpoll screen=1280x800x24 modprobe=3c59x xarg=-2button - diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/help.en --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/syslinux/stuff/help.en Sun Feb 12 14:26:16 2012 +0100 @@ -0,0 +1,27 @@ + + SliTaz GNU/Linux - Help + ======================= + + SliTaz operates in RAM, it does not alter your current distribution. + SliTaz runs a Linux kernel and free software from the GNU project. + When launched, SliTaz gives you many useful commands, file handling, + internet and more than 3000 installable packages from our repository. + + Display this help file + Display SliTaz boot options + [fr] Affiche l'aide + [fr] Affiche les options de demarrage + Launch SliTaz from cmdline + [country] Select keyboard from cmdline + [be,br,ca,de,de_CH,en,es,fi,fr,fr_CH,hu,it,jp,pt,ru,us] + + Slitaz GNU/Linux is provided "as is", without a warranty of any kind, + expressed or implied. This program is distributed in the hope that it + will be useful. Thanks to use SliTaz :-) + + Web site : http://www.slitaz.org/ + Support forum : http://forum.slitaz.org/ + IRC channel : irc.freenode.net #slitaz + + + diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/help.fr --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/syslinux/stuff/help.fr Sun Feb 12 14:26:16 2012 +0100 @@ -0,0 +1,26 @@ + + SliTaz GNU/Linux - Aide + ======================= + + SliTaz fonctionne en RAM, il ne touche pas a votre distribution + actuelle. SliTaz utilise un noyau Linux et des logiciels libres, + issus du projet GNU. Une fois lance vous disposez d'un shell avec de + nombreuses commandes utiles, manipulation de fichiers, internet, etc. + + Display this help file + Display SliTaz boot options + [fr] Affiche l'aide + [fr] Affiche les options de demarrage + Lance SliTaz depuis la ligne de commande + [pays] Selectionne le clavier en ligne de commande + [be,br,ca,de,de_CH,en,es,fi,fr,fr_CH,hu,it,jp,pt,ru,us] + + Slitaz GNU/Linux est distribue sans aucune garantie, et publie + car potentiellement utile. SliTaz est le fruit du travail de toute + une communauté à traver le monde. Merci d'utiliser SliTaz :-) + + Site web : http://www.slitaz.org/ + Forum de support : http://forum.slitaz.org/ + Canal IRC : irc.freenode.net #slitaz + + diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/help.txt --- a/syslinux/stuff/help.txt Sun Feb 12 03:00:54 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -===================================================================== -F1 SliTaz GNU/Linux - Temporary Autonomous Zone. help -===================================================================== - - SliTaz fonctionne en RAM, il ne touche pas a votre distribution - actuelle. SliTaz utilise un noyau Linux et des logiciels libres, - issus du projet GNU. Une fois lance vous disposez d'un shell avec de - nombreuses commandes utiles, manipulation de fichiers, internet, etc. - - Lance SliTaz. - Affiche cette page. - Liste les options disponibles au boot. - Affiche l'image splash. - Affiche le message de bienvenue. - [pays] Selectionne le clavier [be,br,ca,de,de_CH,en,es,fi,fr...] - - Slitaz GNU/Linux est distribue sans aucune garantie, et publie - car potentiellement utile. SliTaz n'as aucune pretention, nous ne - sommes que des passionnes par l'informatique libre, et qui aimons - la liberte. - - Site web : http://www.slitaz.org/ - Canal IRC : irc.freenode.net #slitaz - - - diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/i18n.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/syslinux/stuff/i18n.cfg Sun Feb 12 14:26:16 2012 +0100 @@ -0,0 +1,53 @@ +# Languages submenu +MENU BEGIN ^lang +MENU TITLE Languages + +# de +LABEL de + MENU LABEL Deutsch + CONFIG de.cfg +LABEL de_CH + MENU LABEL Deutsch Schweitz + CONFIG de_CH.cfg +LABEL deCH + MENU HIDE + CONFIG de_CH.cfg +# en +LABEL en + MENU LABEL English UK + CONFIG en.cfg +LABEL us + MENU LABEL English US + CONFIG us.cfg +# es +LABEL es + MENU LABEL Espanol + CONFIG es.cfg +# fr +LABEL fr + MENU LABEL Francais + CONFIG fr.cfg +LABEL be + MENU LABEL Francais Belgique + CONFIG be.cfg +LABEL ca + MENU LABEL Francais Canada + CONFIG ca.cfg +LABEL fr_CH + MENU LABEL Francais Suisse + CONFIG fr_CH.cfg +LABEL frCH + MENU HIDE + CONFIG fr_CH.cfg +# pt +LABEL pt + MENU LABEL Portugues Brazil + CONFIG pt.cfg +# ru +LABEL ru + MENU LABEL Russian + CONFIG ru.cfg +LABEL exit + MENU LABEL Back to main menu +MENU EXIT +MENU END diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/isolinux.cfg --- a/syslinux/stuff/isolinux.cfg Sun Feb 12 03:00:54 2012 +0100 +++ b/syslinux/stuff/isolinux.cfg Sun Feb 12 14:26:16 2012 +0100 @@ -1,6 +1,57 @@ -display isolinux.msg -label slitaz - kernel /boot/bzImage - append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin +UI vesamenu.c32 +DEFAULT slitaz +PROMPT 0 +TIMEOUT 80 -include common.cfg +# Menu settings +MENU TITLE SliTaz GNU/Linux - Cooking XXXXXXXX +MENU BACKGROUND splash.jpg +MENU WIDTH 78 +MENU MARGIN 6 +MENU ROWS 6 +MENU VSHIFT 6 +MENU TIMEOUTROW 14 +MENU TABMSGROW 12 +MENU CMDLINEROW 12 + +# Menu colors +MENU COLOR border * #00000000 #00000000 none +MENU COLOR title * #ffffffff #00000000 * +MENU COLOR sel 0 #ffffffff #00000000 none +MENU COLOR unsel 0 #50ffffff #00000000 none +#MENU COLOR help 37;40 #c0ffffff #a0000000 std +MENU COLOR help * #ffffffff #00000000 * +MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std +MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std +MENU COLOR msg07 37;40 #90ffffff #a0000000 std +MENU COLOR tabmsg 31;40 #30ffffff #00000000 std + +# Labels +LABEL slitaz + MENU LABEL SliTaz Live + KERNEL /boot/bzImage + APPEND initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin + +LABEL help + MENU LABEL Help & Options + MENU HELP help.en + +INCLUDE i18n.cfg + +LABEL cmdline + MENU LABEL Command Line + MENU QUIT + +LABEL web zeb + MENU LABEL Web Boot + KERNEL /boot/gpxe + +LABEL reboot + MENU LABEL Reboot System + COM32 reboot.c32 + +# Help files +F1 help.en +F2 opts.en +F3 help.fr +F4 opts.fr diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/options.txt --- a/syslinux/stuff/options.txt Sun Feb 12 03:00:54 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -===================================================================== -F2 SliTaz GNU/Linux - Temporary Autonomous Zone. options -===================================================================== - - irqpoll : Recommende lors de problemes avec les interruptions. - no387 : Desactive l'emulation du coprocesseur mathematique. - vga=XXX : Change le mode video ou framebuffer. - 788 (800x600), 791 (1024x768), 775 (1280x1024). - - ------------------- SliTaz boot options ------------------- - home=sda[1-9] : Monte et utilise une partition d'une cle USB ou d'un - disque dur externe comme partition /home. L'option - home=usb monte la premiere partition (sda1) sur /home. - config=, : Execute un script se trouvant sur un - peripherique. Exemple : config=/dev/hda1,slitaz.sh - modprobe= : Force le chargement de module(s). - lang=* : Specifie la langue [en,fr_CH,fr_FR] - kmap=* : Specifie le clavier [de-latin1,fr-latin1,fr_CH-latin1...] - sound=no : Supprime tous les modules son du noyau. - sound=noconf : Ne configure pas la carte son. - screen= : Definit le type d'ecran [text,640x480x16..1920x1440x24] - user=* : Compte utilisateur. Par defaut "tux". - xarg=* : Parametre pour le serveur X [-2button,-dumb,-nozap...] - - usage: slitaz [option], par exemple : - boot: slitaz irqpoll screen=1280x800x24 modprobe=3c59x xarg=-2button - diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/opts.en --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/syslinux/stuff/opts.en Sun Feb 12 14:26:16 2012 +0100 @@ -0,0 +1,27 @@ + + SliTaz GNU/Linux - Boot options + =============================== + + irqpoll Recommended if problems with interrupts. + no387 Disable mathematical coprocessor emulation. + vga=XXX Change video mode or framebuffer. + 788 (800x600), 791 (1024x768), 775 (1280x1024). + home=sda[1-9] Mount and use USB key or external disk partition + as /home partition. The home=usb option mounts the + first partition (sda1) on /home. + config=, : Execute a script found on a device. + Example : config=/dev/hda1,slitaz.sh + modprobe= : Force module(s) to load. + lang=* Select language [en,fr_CH,fr_FR] + kmap=* Select keyboard [de-latin1,fr-latin1,fr_CH-latin1...] + sound=no Remove all sound kernel modules. + sound=noconf Do not configure sound card. + user=* Username account. Default "tux". + + Usage: slitaz [option] + Example: slitaz irqpoll modprobe=3c59x sound=no + + + + + diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/opts.fr --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/syslinux/stuff/opts.fr Sun Feb 12 14:26:16 2012 +0100 @@ -0,0 +1,27 @@ + + SliTaz GNU/Linux - Options de demarrage + ======================================= + + irqpoll Recommende lors de problemes avec les interruptions. + no387 Desactive l'emulation du coprocesseur mathematique. + vga=XXX Change le mode video ou framebuffer. + 788 (800x600), 791 (1024x768), 775 (1280x1024). + home=sda[1-9] Monte et utilise une partition d'une cle USB ou d'un + disque dur externe comme partition /home. L'option + home=usb monte la premiere partition (sda1) sur /home. + config=, : Execute un script se trouvant sur un + peripherique. Exemple : config=/dev/hda1,slitaz.sh + modprobe= : Force le chargement de module(s). + lang=* Specifie la langue [en,fr_CH,fr_FR] + kmap=* Specifie le clavier [de-latin1,fr-latin1,fr_CH-latin1...] + sound=no Supprime tous les modules son du noyau. + sound=noconf Ne configure pas la carte son. + user=* Compte utilisateur. Par defaut "tux". + + Utilisation: slitaz [option] + Exemple : slitaz irqpoll modprobe=3c59x sound=no + + + + + diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/tools/logo.png Binary file syslinux/stuff/tools/logo.png has changed diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/tools/slitaz.css --- a/syslinux/stuff/tools/slitaz.css Sun Feb 12 03:00:54 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,358 +0,0 @@ -/* - CSS style for SliTaz GNU/Linux website - www.slitaz.org - (c) 2007 Pankso -*/ - -body { - background: #222222; - color: black; - font: 13px sans-serif, vernada, arial; - margin: 0; -/* padding-bottom: 100%;*/ -} - -/* Accessibility */ - -#access { - position: absolute; - top: 1px; - right: 6px; - text-align: right; - width: 100%; - margin: 0; - font-size: 12px; - font-weight: bold; -} - -#access a { - background: inherit; - color: #222222; - text-decoration: none; -} - -#access a:hover { - background: inherit; - color: #EDEDED; -} - -/* Header and title */ - -#header{ - background: #f0ba08 url(http://www.slitaz.org/pics/website/header.png) repeat-x top; - /*background: #DF5F06 repeat-x top;*/ - color: black; - width: 100%; - height: 50px ; - border-top: 1px solid black; - border-bottom: 1px solid black; - margin-bottom: 30px; -} - -#titre{ - font-size: 16px; - font-weight: bolder ; - margin-left: 232px; - margin-top: 4px; - padding-top: 25px ; -} - -#logo { - position: absolute; - float: left; - margin-left: 32px; - margin-right: 20px; - margin-top: 0px; -} - -/* Navigation */ - -#nav { - position: absolute; - top: 100px; - right: 6px; - background: #eaeaea url(http://www.slitaz.org/pics/website/nav-tr.png) no-repeat top right; - color: black; - float: right; - width: 152px; - line-height: 1.3em; - text-align: center; - font-size: 12px; - font-weight: bold; -} - -#nav_top { - background: transparent url(http://www.slitaz.org/pics/website/nav-tl.png) no-repeat top left; - height: 12px; -} - -#nav_bottom { - background: transparent url(http://www.slitaz.org/pics/website/nav-bl.png) no-repeat bottom left; - height: 12px; -} - -#nav_bottom_img { - background: transparent url(http://www.slitaz.org/pics/website/nav-br.png) no-repeat bottom right; - height: 12px; -} - -#nav ul{ - list-style-type: none; - margin: 0px 0px 0px 6px; - padding: 2px; -} - -#nav li { - display: inline; -} - -#nav a { - color: #3E1220; - background: inherit; - display: block; - padding: 0.5px; - text-decoration: none; -} - -#nav a:hover { - color: #DF8F06; - text-decoration: none; - display: block; -} - -#nav i { - color: #DF5F06; -} - -/* Page content */ - -#content, #content_bottom, #content_top { - background: white; - color: black; - text-align: justify; -} - -#content_top { - height: 14px; - margin: 0px 70px 0px 70px; -} - -#content { - height: auto; - margin: -6px 70px 0px 70px; - padding: 0px 72px 1px 72px; - /*background: white; - color: #333333;*/ -} - -#content_bottom { - height: 14px; - margin: 0px 70px 0px 70px; - /*clear: both;*/ -} - -#content li { - line-height: 1.5em; - text-align: left; -} - -/* Legal informations */ - -#copy { - font-size: 11px ; - text-align: center ; - background: transparent; - color: #a8a8a8; - padding-top: 10px; -} - -#copy a { - background: inherit; - color: #a8a8a8; -} - -#copy a:hover { - background: inherit; - color: #EDEDED; -} - -/* Footer */ - -#bottom { - float: none; - background: inherit; - color: black; - width: auto; - clear: both; - padding: 0; - margin: 0; - text-align: center; - vertical-align: middle; -} - -#news li { - list-style-type: square; - border-bottom: 1px dotted #BEBEBE; - margin-left: -25px; - padding: 4px 0px 4px 0px; -} -#gallery { - text-align: center; -} - -/* CSS class. */ - -.top_left, .top_right, .bottom_left, .bottom_right { - height: 14px; - width: 14px; - color: white; - background-color: #333333; - background-repeat: no-repeat; -} - -.top_left { - background-image: url(http://www.slitaz.org/pics/website/content-tl.png); - background-position: left top; - position: absolute; -} - -.top_right { - background-image: url(http://www.slitaz.org/pics/website/content-tr.png); - float: right; -} - -.bottom_left { - background-image: url(http://www.slitaz.org/pics/website/content-bl.png); - position: absolute; -} - -.bottom_right { - background-image: url(http://www.slitaz.org/pics/website/content-br.png); - float: right; -} - -.buttons { - background: inherit; - color: white; - float: right; - position: absolute; - right: 0px; - top: 52px; - padding: 2px 16px 2px 16px; - font-size: 12px; - font-weight: bold; -} - -/* HTML styles */ - -h1 { - color: #3E1220; - background: inherit; - text-align: left; - margin: 0px 0px 8px -58px; -} - -h2 { - color: #DF8F06; - border-left: 10px solid #F3F3F3; - padding: 0px 0px 0px 4px; - margin: 0; -} - -h3 { - font-weight: bold; - color: #6c0023; - background: inherit; -} - -a { - text-decoration: underline; - color: #0F314E; - background: inherit; -} - -a:hover { - text-decoration: none; - color: blue; - background: inherit; -} - -code { - font-size: 12px; - color: #669900; - background: inherit; -} - -tt { - color: #15EE15; - background: inherit; -} - -img { - border: 0pt none; -} - -fieldset { - background: #E2ECf6; - color: black; - margin-top: 25px; - border: 1px solid black; -} - -legend { - border: 1px solid black; - color: #6c0023; - background: #eaeaea; - font-weight: bold; -} - -pre { - padding: 5px; - color: black; - background: #E1E0B0; -} - -pre.script { - padding: 10px; - color: black; - background: #E8E8E8; - border: 1px inset #606060; -} - -textarea { - background: #E5E5E5; - margin-top: 12px; -} - -input[type=submit] { - background: #E5E5E5; - color: black; - border: 1px outset #111111; - font-weight: bold; -} - -input[type=submit]:hover { - background: #F3F3F3; - color: black; -} - -/* Packages pages */ - -.pkg_nav { - border-top: 1px solid black; - margin-top: 10px; - padding-top: 10px; -} - -pre.package { - padding: 0px; - color: black; - background: white; -} - -p.get { - text-align: center; - padding: 10px; - color: black; - background: #F3F3F3; - border: 1px solid #DEDEDE; -} diff -r 6095f1582327 -r 204840df8a13 syslinux/stuff/tools/slitaz.html --- a/syslinux/stuff/tools/slitaz.html Sun Feb 12 03:00:54 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,105 +0,0 @@ - - - - SliTaz GNU/Linux - - - - - - - - - - - - - - - - - -
-
-
-
- - -