tazpanel rev 440
boot.cgi: disable daemons for user
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Apr 07 11:12:26 2015 +0200 (2015-04-07) |
parents | 9aeb8fa5beaa |
children | adedebded23a |
files | boot.cgi lib/libtazpanel styles/default/header.html |
line diff
1.1 --- a/boot.cgi Tue Apr 07 04:12:24 2015 +0300 1.2 +++ b/boot.cgi Tue Apr 07 11:12:26 2015 +0200 1.3 @@ -344,7 +344,7 @@ 1.4 1.5 <form> 1.6 <button name="log" data-icon="logs" >$(gettext 'Boot logs' )</button> 1.7 - <button name="daemons" data-icon="daemons">$(gettext 'Manage daemons')</button> 1.8 + <button name="daemons" data-icon="daemons" data-root>$(gettext 'Manage daemons')</button> 1.9 EOT 1.10 [ -w /boot/grub/menu.lst ] && cat <<EOT 1.11 <button name="grub" data-icon="grub" >$(gettext 'Boot loader' )</button>
2.1 --- a/lib/libtazpanel Tue Apr 07 04:12:24 2015 +0300 2.2 +++ b/lib/libtazpanel Tue Apr 07 11:12:26 2015 +0200 2.3 @@ -206,9 +206,13 @@ 2.4 # Get the list of console keymaps 2.5 2.6 list_keymaps() { 2.7 - find /usr/share/kbd/keymaps/i386 -type f -name '*.map*' ! -path '*include*' | \ 2.8 - awk -F/ '{gsub(/.map.gz/, ""); printf "<option value=\"%s\">%s (%s)\n", $8, $8, $7}' | \ 2.9 - sort 2.10 + if [ -d /usr/share/kbd ]; then # kbd-base 2.11 + find /usr/share/kbd/keymaps/i386 -type f -name '*.map*' ! -path '*include*' | \ 2.12 + awk -F/ '{gsub(/.map.gz/, ""); printf "<option value=\"%s\">%s (%s)\n", $8, $8, $7}' 2.13 + else # kbd-busybox 2.14 + ls /usr/share/kmap/*.kmap | \ 2.15 + sed 's|.*kmap/\(.*\).kmap|<option value="\1">\1|' 2.16 + fi | sort 2.17 } 2.18 2.19
3.1 --- a/styles/default/header.html Tue Apr 07 04:12:24 2015 +0300 3.2 +++ b/styles/default/header.html Tue Apr 07 11:12:26 2015 +0200 3.3 @@ -55,7 +55,7 @@ 3.4 <li><a data-icon="" href="/boot.cgi?log=slim">$(gettext 'X session')</a></li> 3.5 </menu> 3.6 </li> 3.7 - <li><a data-icon="daemons" href="/boot.cgi?daemons">$(gettext 'Manage daemons')</a></li> 3.8 + <li><a data-icon="daemons" href="/boot.cgi?daemons" data-root>$(gettext 'Manage daemons')</a></li> 3.9 $(for i in menu.d/boot/* ; do [ -f $i ] && sh $i menu $i ; done) 3.10 </menu> 3.11 </li>