SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ovz-web-panel/stuff/owp-1.7.u	Wed May 25 21:22:35 2011 +0200
     1.3 @@ -0,0 +1,22 @@
     1.4 +--- ovz-web-panel-ori/app/models/hardware_server.rb	Fri Nov 19 18:54:08 2010
     1.5 ++++ ovz-web-panel/app/models/hardware_server.rb	Fri Dec 31 23:59:40 2010
     1.6 +@@ -174,7 +174,7 @@
     1.7 +   end
     1.8 +   
     1.9 +   def sync_backups
    1.10 +-    backups_list = rpc_client.exec('ls', "--block-size=M -s #{backups_dir}")['output']
    1.11 ++    backups_list = rpc_client.exec('ls', "-h -s #{backups_dir}")['output']
    1.12 +     backups_list = backups_list.split("\n")
    1.13 +     # remove totals line
    1.14 +     backups_list.shift
    1.15 +--- ovz-web-panel-ori/script/owp	Mon Oct 25 19:09:40 2010
    1.16 ++++ ovz-web-panel/script/owp	Sat Jan  1 01:08:42 2011
    1.17 +@@ -61,7 +61,7 @@
    1.18 + 
    1.19 + stop() {
    1.20 +   echo "Stopping OpenVZ Web Panel server"
    1.21 +-  PANEL_APP_PID=`ps auxww | grep ruby | grep script/server | awk '{ print $2 }'`
    1.22 ++  PANEL_APP_PID=`ps  | grep ruby | grep script/server | awk '{ print $1 }'`
    1.23 +   [ -n "$PANEL_APP_PID" ] && kill -2 $PANEL_APP_PID
    1.24 +   [ "$ENVIRONMENT" = "HW-NODE" ] && ruby $INSTALL_DIR/utils/hw-daemon/hw-daemon.rb stop
    1.25 +   ruby $INSTALL_DIR/utils/watchdog/watchdog.rb stop