slitaz-tools rev 269 2.7
desktopbox logout: add tazusb support (fix)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Oct 12 11:58:13 2008 +0000 (2008-10-12) |
parents | c52aada85f58 |
children | 45b9c79b4055 |
files | tinyutils/desktopbox |
line diff
1.1 --- a/tinyutils/desktopbox Sun Oct 12 11:46:22 2008 +0000 1.2 +++ b/tinyutils/desktopbox Sun Oct 12 11:58:13 2008 +0000 1.3 @@ -224,27 +224,27 @@ 1.4 <variable>NONE</variable> 1.5 </radiobutton> 1.6 </hbox>" 1.7 - EXTRA="COMP=none; [ '\$LZMA' = 'true' ] && COMP=lzma; [ '\$GZIP' = 'true' ] && COMP=gzip; [ '\$TAZUSB_WRITE' = 'true' ] && subox 'xterm -e \"tazusb writefs \$COMP\"';" 1.8 - #[ -f /home/boot/rootfs.gz ] || { TAZUSB_DIALOG=""; EXTRA=""; } 1.9 + EXTRA="COMP=none; [ \$LZMA = true ] && COMP=lzma; [ \$GZIP = true ] && COMP=gzip; [ \$TAZUSB_WRITE = true ] && { subox \"xterm -e '/usr/bin/tazusb writefs \$COMP'\"; sleep 1; while ps x | grep -v grep | grep -q tazusb; do sleep 1; done; };" 1.10 + [ -f /home/boot/rootfs.gz ] || { TAZUSB_DIALOG=""; EXTRA=""; } 1.11 # Logout for Openbox or JWM and system shutdown or reboot. 1.12 ACTIONS=" 1.13 <hbox> 1.14 <button> 1.15 <label>Logout X session</label> 1.16 <input file icon=\"video-display\"></input> 1.17 - <action>$EXTRA; openbox --exit || jwm -exit</action> 1.18 + <action>$EXTRA openbox --exit || jwm -exit</action> 1.19 <action type=\"exit\">Exit</action> 1.20 </button> 1.21 <button> 1.22 <label>Shutdown computer</label> 1.23 <input file icon=\"system-shutdown\"></input> 1.24 - <action>$EXTRA; poweroff</action> 1.25 + <action>$EXTRA poweroff</action> 1.26 <action type=\"exit\">Exit</action> 1.27 </button> 1.28 <button> 1.29 <label>Reboot system</label> 1.30 <input file icon=\"reload\"></input> 1.31 - <action>$EXTRA; reboot</action> 1.32 + <action>$EXTRA reboot</action> 1.33 <action type=\"exit\">Exit</action> 1.34 </button> 1.35 <button cancel>