# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1428397946 -7200
# Node ID f09ef19be78de21809967ee25f950a6d47c0521f
# Parent  9aeb8fa5beaaccd1ebf518fa5345cffdc56e4191
boot.cgi: disable daemons for user

diff -r 9aeb8fa5beaa -r f09ef19be78d boot.cgi
--- a/boot.cgi	Tue Apr 07 04:12:24 2015 +0300
+++ b/boot.cgi	Tue Apr 07 11:12:26 2015 +0200
@@ -344,7 +344,7 @@
 
 <form>
 	<button name="log"     data-icon="logs"   >$(gettext 'Boot logs'     )</button>
-	<button name="daemons" data-icon="daemons">$(gettext 'Manage daemons')</button>
+	<button name="daemons" data-icon="daemons" data-root>$(gettext 'Manage daemons')</button>
 EOT
 		[ -w /boot/grub/menu.lst ] && cat <<EOT
 	<button name="grub"    data-icon="grub"   >$(gettext 'Boot loader'   )</button>
diff -r 9aeb8fa5beaa -r f09ef19be78d lib/libtazpanel
--- a/lib/libtazpanel	Tue Apr 07 04:12:24 2015 +0300
+++ b/lib/libtazpanel	Tue Apr 07 11:12:26 2015 +0200
@@ -206,9 +206,13 @@
 # Get the list of console keymaps
 
 list_keymaps() {
-	find /usr/share/kbd/keymaps/i386 -type f -name '*.map*' ! -path '*include*' | \
-	awk -F/ '{gsub(/.map.gz/, ""); printf "<option value=\"%s\">%s (%s)\n", $8, $8, $7}' | \
-	sort
+	if [ -d /usr/share/kbd ]; then			# kbd-base
+		find /usr/share/kbd/keymaps/i386 -type f -name '*.map*' ! -path '*include*' | \
+		awk -F/ '{gsub(/.map.gz/, ""); printf "<option value=\"%s\">%s (%s)\n", $8, $8, $7}' 
+	else						# kbd-busybox
+		ls /usr/share/kmap/*.kmap | \
+		sed 's|.*kmap/\(.*\).kmap|<option value="\1">\1|'
+	fi | sort
 }
 
 
diff -r 9aeb8fa5beaa -r f09ef19be78d styles/default/header.html
--- a/styles/default/header.html	Tue Apr 07 04:12:24 2015 +0300
+++ b/styles/default/header.html	Tue Apr 07 11:12:26 2015 +0200
@@ -55,7 +55,7 @@
       <li><a data-icon="" href="/boot.cgi?log=slim">$(gettext 'X session')</a></li>
      </menu>
     </li>
-    <li><a data-icon="daemons" href="/boot.cgi?daemons">$(gettext 'Manage daemons')</a></li>
+    <li><a data-icon="daemons" href="/boot.cgi?daemons" data-root>$(gettext 'Manage daemons')</a></li>
     $(for i in menu.d/boot/* ; do [ -f $i ] && sh $i menu $i ; done)
    </menu>
   </li>