wok-current rev 15385
ipxe: add local boot
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Oct 26 10:44:25 2013 +0000 (2013-10-26) |
parents | bfdfb5b999b5 |
children | 30f922b03115 |
files | ipxe/stuff/ipxe.cmd phpmyadmin/receipt python-lxml/receipt |
line diff
1.1 --- a/ipxe/stuff/ipxe.cmd Mon Oct 21 23:10:53 2013 +0200 1.2 +++ b/ipxe/stuff/ipxe.cmd Sat Oct 26 10:44:25 2013 +0000 1.3 @@ -1,10 +1,11 @@ 1.4 #!ipxe 1.5 1.6 set menu-timeout 3000 1.7 -dhcp 1.8 +dhcp || 1.9 1.10 :menu 1.11 menu SliTaz net boot menu 1.12 +item --key b boot Local boot 1.13 item --key l lan Your PXE boot 1.14 item --key w web SliTaz WEB boot 1.15 item --key r rolling SliTaz development version 1.16 @@ -14,6 +15,9 @@ 1.17 set menu-timeout 0 1.18 goto ${target} 1.19 1.20 +:boot 1.21 +exit 1.22 + 1.23 :exit 1.24 help 1.25 echo Type 'exit' to get the back to the menu
2.1 --- a/phpmyadmin/receipt Mon Oct 21 23:10:53 2013 +0200 2.2 +++ b/phpmyadmin/receipt Sat Oct 26 10:44:25 2013 +0000 2.3 @@ -44,6 +44,9 @@ 2.4 2.5 post_install() 2.6 { 2.7 + secret=$(dd if=/dev/urandom count=1 2> /dev/null | md5sum | sed 's/ .*//') 2.8 + sed -i "s/^\(.*blowfish_secret'] = '\)'/\1$secret'/" \ 2.9 + $1/etc/phpmyadmin/config.inc.php 2.10 # Configure lighttpd server 2.11 if [ -f $1/etc/lighttpd/lighttpd.conf ]; then 2.12 if ! grep -q /usr/share/phpmyadmin/ $1/etc/lighttpd/lighttpd.conf; then
3.1 --- a/python-lxml/receipt Mon Oct 21 23:10:53 2013 +0200 3.2 +++ b/python-lxml/receipt Sat Oct 26 10:44:25 2013 +0000 3.3 @@ -5,7 +5,7 @@ 3.4 CATEGORY="development" 3.5 SHORT_DESC="Pythonic binding for the libxml2 and libxslt libraries.." 3.6 MAINTAINER="pascal.bellard@slitaz.org" 3.7 -LICENSE="BSD GPL PSF" 3.8 +LICENSE="BSD GPL PSL" 3.9 SOURCE="lxml" 3.10 TARBALL="$SOURCE-$VERSION.tgz" 3.11 WEB_SITE="http://codespeak.net/lxml/"