# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1382784265 0
# Node ID 1019443a6c356ed42b499634009fb07308b0d89c
# Parent  bfdfb5b999b530cf36803ead780fb1661fba3fc2
ipxe: add local boot

diff -r bfdfb5b999b5 -r 1019443a6c35 ipxe/stuff/ipxe.cmd
--- a/ipxe/stuff/ipxe.cmd	Mon Oct 21 23:10:53 2013 +0200
+++ b/ipxe/stuff/ipxe.cmd	Sat Oct 26 10:44:25 2013 +0000
@@ -1,10 +1,11 @@
 #!ipxe
 
 set menu-timeout 3000
-dhcp
+dhcp ||
 
 :menu
 menu SliTaz net boot menu
+item --key b boot	Local boot
 item --key l lan	Your PXE boot
 item --key w web	SliTaz WEB boot
 item --key r rolling	SliTaz development version
@@ -14,6 +15,9 @@
 set menu-timeout 0
 goto ${target}
 
+:boot
+exit
+
 :exit
 help
 echo Type 'exit' to get the back to the menu
diff -r bfdfb5b999b5 -r 1019443a6c35 phpmyadmin/receipt
--- a/phpmyadmin/receipt	Mon Oct 21 23:10:53 2013 +0200
+++ b/phpmyadmin/receipt	Sat Oct 26 10:44:25 2013 +0000
@@ -44,6 +44,9 @@
 
 post_install()
 {
+	secret=$(dd if=/dev/urandom count=1 2> /dev/null | md5sum | sed 's/ .*//')
+	sed -i "s/^\(.*blowfish_secret'] = '\)'/\1$secret'/" \
+		$1/etc/phpmyadmin/config.inc.php
 	# Configure lighttpd server
 	if [ -f $1/etc/lighttpd/lighttpd.conf ]; then
 		if ! grep -q /usr/share/phpmyadmin/ $1/etc/lighttpd/lighttpd.conf; then
diff -r bfdfb5b999b5 -r 1019443a6c35 python-lxml/receipt
--- a/python-lxml/receipt	Mon Oct 21 23:10:53 2013 +0200
+++ b/python-lxml/receipt	Sat Oct 26 10:44:25 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="development"
 SHORT_DESC="Pythonic binding for the libxml2 and libxslt libraries.."
 MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="BSD GPL PSF"
+LICENSE="BSD GPL PSL"
 SOURCE="lxml"
 TARBALL="$SOURCE-$VERSION.tgz"
 WEB_SITE="http://codespeak.net/lxml/"