From 149ba951544e6d72d255000b2fb2eb2f9e3ab4df Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Tue, 18 Dec 2007 15:30:44 +0000 Subject: [PATCH] Pkging for web rpm is ready git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@185 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-web/cmds/grpattr | 4 +- xCAT-web/css/xcat.css | 155 --- xCAT-web/css/xcattop.css | 132 --- xCAT-web/lib/functions.php | 15 +- xCAT-web/lib/phpinfo.php | 9 + xCAT-web/machines/groups.php | 2 - xCAT-web/manage/dsh.php | 2 +- xCAT-web/manage/dsh_action.php | 4 +- xCAT-web/themes/alert.css | 119 --- xCAT-web/themes/alert/bottom.gif | Bin 70 -> 0 bytes xCAT-web/themes/alert/bottom_left.gif | Bin 49 -> 0 bytes xCAT-web/themes/alert/bottom_right.gif | Bin 49 -> 0 bytes xCAT-web/themes/alert/left.gif | Bin 84 -> 0 bytes xCAT-web/themes/alert/overlay.png | Bin 2829 -> 0 bytes xCAT-web/themes/alert/progress.gif | Bin 1542 -> 0 bytes xCAT-web/themes/alert/right.gif | Bin 84 -> 0 bytes xCAT-web/themes/alert/top.gif | Bin 70 -> 0 bytes xCAT-web/themes/alert/top_left.gif | Bin 49 -> 0 bytes xCAT-web/themes/alert/top_right.gif | Bin 49 -> 0 bytes xCAT-web/themes/alert_lite.css | 88 -- xCAT-web/themes/alphacube.css | 150 --- xCAT-web/themes/alphacube/bottom-left-c.gif | Bin 60 -> 0 bytes xCAT-web/themes/alphacube/bottom-middle.gif | Bin 50 -> 0 bytes xCAT-web/themes/alphacube/bottom-right-c.gif | Bin 61 -> 0 bytes .../themes/alphacube/button-close-focus.gif | Bin 699 -> 0 bytes .../themes/alphacube/button-max-focus.gif | Bin 765 -> 0 bytes .../themes/alphacube/button-min-focus.gif | Bin 472 -> 0 bytes xCAT-web/themes/alphacube/frame-left.gif | Bin 64 -> 0 bytes xCAT-web/themes/alphacube/frame-right.gif | Bin 64 -> 0 bytes xCAT-web/themes/alphacube/left-top.gif | Bin 171 -> 0 bytes xCAT-web/themes/alphacube/right-top.gif | Bin 168 -> 0 bytes xCAT-web/themes/alphacube/top-middle.gif | Bin 97 -> 0 bytes xCAT-web/themes/behavior.htc | 51 - xCAT-web/themes/darkX.css | 121 --- .../themes/darkX/button-close-focused.png | Bin 904 -> 0 bytes .../themes/darkX/button-maximize-focused.png | Bin 882 -> 0 bytes .../themes/darkX/button-minimize-focused.png | Bin 839 -> 0 bytes .../darkX/frame-bottom-left-focused.png | Bin 142 -> 0 bytes .../themes/darkX/frame-bottom-mid-focused.png | Bin 142 -> 0 bytes .../darkX/frame-bottom-right-focused.png | Bin 142 -> 0 bytes xCAT-web/themes/darkX/frame-left-focused.png | Bin 142 -> 0 bytes xCAT-web/themes/darkX/frame-right-focused.png | Bin 142 -> 0 bytes .../themes/darkX/titlebar-left-focused.png | Bin 180 -> 0 bytes .../themes/darkX/titlebar-mid-focused.png | Bin 175 -> 0 bytes .../themes/darkX/titlebar-right-focused.png | Bin 180 -> 0 bytes xCAT-web/themes/debug.css | 25 - xCAT-web/themes/iefix/blank.gif | Bin 49 -> 0 bytes xCAT-web/themes/iefix/iepngfix.css | 3 - xCAT-web/themes/iefix/iepngfix.htc | 54 - xCAT-web/themes/lighting.css | 960 ------------------ .../themes/lighting/background_buttons.gif | Bin 70 -> 0 bytes xCAT-web/themes/lighting/bottom-left-blue.png | Bin 335 -> 0 bytes .../themes/lighting/bottom-left-darkblue.png | Bin 334 -> 0 bytes .../themes/lighting/bottom-left-green.png | Bin 347 -> 0 bytes xCAT-web/themes/lighting/bottom-left-grey.png | Bin 346 -> 0 bytes .../themes/lighting/bottom-middle-blue.png | Bin 156 -> 0 bytes .../lighting/bottom-middle-darkblue.png | Bin 154 -> 0 bytes .../themes/lighting/bottom-middle-green.png | Bin 155 -> 0 bytes .../themes/lighting/bottom-middle-grey.png | Bin 156 -> 0 bytes .../themes/lighting/bottom-right-blue.png | Bin 397 -> 0 bytes .../themes/lighting/bottom-right-darkblue.png | Bin 392 -> 0 bytes .../themes/lighting/bottom-right-green.png | Bin 390 -> 0 bytes .../themes/lighting/bottom-right-grey.png | Bin 424 -> 0 bytes .../themes/lighting/button-close-blue.png | Bin 308 -> 0 bytes .../themes/lighting/button-close-darkblue.png | Bin 308 -> 0 bytes .../themes/lighting/button-close-green.png | Bin 305 -> 0 bytes .../themes/lighting/button-close-grey.png | Bin 320 -> 0 bytes .../themes/lighting/button-maximize-blue.png | Bin 218 -> 0 bytes .../lighting/button-maximize-darkblue.png | Bin 212 -> 0 bytes .../themes/lighting/button-maximize-green.png | Bin 226 -> 0 bytes .../themes/lighting/button-maximize-grey.png | Bin 218 -> 0 bytes .../themes/lighting/button-minimize-blue.png | Bin 164 -> 0 bytes .../lighting/button-minimize-darkblue.png | Bin 172 -> 0 bytes .../themes/lighting/button-minimize-green.png | Bin 172 -> 0 bytes .../themes/lighting/button-minimize-grey.png | Bin 184 -> 0 bytes xCAT-web/themes/lighting/left-blue.png | Bin 144 -> 0 bytes xCAT-web/themes/lighting/left-darkblue.png | Bin 143 -> 0 bytes xCAT-web/themes/lighting/left-green.png | Bin 144 -> 0 bytes xCAT-web/themes/lighting/left-grey.png | Bin 144 -> 0 bytes xCAT-web/themes/lighting/pngbehavior.htc | 67 -- xCAT-web/themes/lighting/right-blue.png | Bin 146 -> 0 bytes xCAT-web/themes/lighting/right-darkblue.png | Bin 146 -> 0 bytes xCAT-web/themes/lighting/right-green.png | Bin 146 -> 0 bytes xCAT-web/themes/lighting/right-grey.png | Bin 155 -> 0 bytes xCAT-web/themes/lighting/spinner.gif | Bin 2037 -> 0 bytes xCAT-web/themes/lighting/top-left-blue.png | Bin 336 -> 0 bytes .../themes/lighting/top-left-darkblue.png | Bin 360 -> 0 bytes xCAT-web/themes/lighting/top-left-green.png | Bin 339 -> 0 bytes xCAT-web/themes/lighting/top-left-grey.png | Bin 352 -> 0 bytes xCAT-web/themes/lighting/top-middle-blue.png | Bin 200 -> 0 bytes .../themes/lighting/top-middle-darkblue.png | Bin 226 -> 0 bytes xCAT-web/themes/lighting/top-middle-green.png | Bin 208 -> 0 bytes xCAT-web/themes/lighting/top-middle-grey.png | Bin 185 -> 0 bytes xCAT-web/themes/lighting/top-right-blue.png | Bin 423 -> 0 bytes .../themes/lighting/top-right-darkblue.png | Bin 451 -> 0 bytes xCAT-web/themes/lighting/top-right-green.png | Bin 440 -> 0 bytes xCAT-web/themes/lighting/top-right-grey.png | Bin 495 -> 0 bytes xCAT-web/themes/mac_os_x.css | 333 ------ xCAT-web/themes/mac_os_x/B.png | Bin 268 -> 0 bytes xCAT-web/themes/mac_os_x/BL.png | Bin 5068 -> 0 bytes xCAT-web/themes/mac_os_x/BL_Main.png | Bin 5068 -> 0 bytes xCAT-web/themes/mac_os_x/BR.png | Bin 5068 -> 0 bytes xCAT-web/themes/mac_os_x/BR_Main.png | Bin 5068 -> 0 bytes xCAT-web/themes/mac_os_x/B_Main.png | Bin 268 -> 0 bytes xCAT-web/themes/mac_os_x/L.png | Bin 133 -> 0 bytes xCAT-web/themes/mac_os_x/L_Main.png | Bin 133 -> 0 bytes xCAT-web/themes/mac_os_x/R.png | Bin 133 -> 0 bytes xCAT-web/themes/mac_os_x/R_Main.png | Bin 133 -> 0 bytes xCAT-web/themes/mac_os_x/T.png | Bin 218 -> 0 bytes xCAT-web/themes/mac_os_x/TL.png | Bin 360 -> 0 bytes xCAT-web/themes/mac_os_x/TL_Main.png | Bin 444 -> 0 bytes xCAT-web/themes/mac_os_x/TR.png | Bin 3818 -> 0 bytes xCAT-web/themes/mac_os_x/TR_Main.png | Bin 3818 -> 0 bytes xCAT-web/themes/mac_os_x/T_Main.png | Bin 218 -> 0 bytes xCAT-web/themes/mac_os_x/close.gif | Bin 1012 -> 0 bytes xCAT-web/themes/mac_os_x/maximize.gif | Bin 1024 -> 0 bytes xCAT-web/themes/mac_os_x/minimize.gif | Bin 1023 -> 0 bytes xCAT-web/themes/mac_os_x_dialog.css | 160 --- xCAT-web/themes/mac_os_x_dialog/B.png | Bin 2861 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/BL.png | Bin 3046 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/BR.png | Bin 3073 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/L.png | Bin 133 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/R.png | Bin 133 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/T.png | Bin 218 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/TL.png | Bin 360 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/TR.png | Bin 3818 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/bg.gif | Bin 65 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/close.gif | Bin 1012 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/maximize.gif | Bin 1024 -> 0 bytes xCAT-web/themes/mac_os_x_dialog/minimize.gif | Bin 1023 -> 0 bytes xCAT-web/themes/nuncio.css | 164 --- xCAT-web/themes/nuncio/bottom_left.png | Bin 616 -> 0 bytes xCAT-web/themes/nuncio/bottom_mid.png | Bin 3617 -> 0 bytes xCAT-web/themes/nuncio/bottom_right.png | Bin 660 -> 0 bytes xCAT-web/themes/nuncio/center_left.png | Bin 6606 -> 0 bytes xCAT-web/themes/nuncio/center_right.png | Bin 6509 -> 0 bytes xCAT-web/themes/nuncio/close.png | Bin 772 -> 0 bytes xCAT-web/themes/nuncio/minimize.png | Bin 693 -> 0 bytes xCAT-web/themes/nuncio/overlay.png | Bin 40803 -> 0 bytes xCAT-web/themes/nuncio/top_left.png | Bin 971 -> 0 bytes xCAT-web/themes/nuncio/top_mid.png | Bin 5944 -> 0 bytes xCAT-web/themes/nuncio/top_right.png | Bin 1245 -> 0 bytes xCAT-web/themes/spread.css | 108 -- xCAT-web/themes/spread/.gif | Bin 2866 -> 0 bytes xCAT-web/themes/spread/bottom-left-c.gif | Bin 60 -> 0 bytes xCAT-web/themes/spread/bottom-middle.gif | Bin 50 -> 0 bytes xCAT-web/themes/spread/bottom-right-c.gif | Bin 61 -> 0 bytes xCAT-web/themes/spread/button-close-focus.gif | Bin 699 -> 0 bytes xCAT-web/themes/spread/button-max-focus.gif | Bin 765 -> 0 bytes xCAT-web/themes/spread/button-min-focus.gif | Bin 472 -> 0 bytes xCAT-web/themes/spread/frame-left.gif | Bin 64 -> 0 bytes xCAT-web/themes/spread/frame-right.gif | Bin 64 -> 0 bytes xCAT-web/themes/spread/left-top.gif | Bin 273 -> 0 bytes xCAT-web/themes/spread/right-top.gif | Bin 265 -> 0 bytes xCAT-web/themes/spread/top-middle.gif | Bin 152 -> 0 bytes xCAT-web/xCAT-web.spec | 92 ++ xCAT-web/xcat.web.spec | 69 -- 157 files changed, 108 insertions(+), 2779 deletions(-) delete mode 100644 xCAT-web/css/xcat.css delete mode 100644 xCAT-web/css/xcattop.css delete mode 100644 xCAT-web/themes/alert.css delete mode 100644 xCAT-web/themes/alert/bottom.gif delete mode 100644 xCAT-web/themes/alert/bottom_left.gif delete mode 100644 xCAT-web/themes/alert/bottom_right.gif delete mode 100644 xCAT-web/themes/alert/left.gif delete mode 100644 xCAT-web/themes/alert/overlay.png delete mode 100644 xCAT-web/themes/alert/progress.gif delete mode 100644 xCAT-web/themes/alert/right.gif delete mode 100644 xCAT-web/themes/alert/top.gif delete mode 100644 xCAT-web/themes/alert/top_left.gif delete mode 100644 xCAT-web/themes/alert/top_right.gif delete mode 100644 xCAT-web/themes/alert_lite.css delete mode 100644 xCAT-web/themes/alphacube.css delete mode 100644 xCAT-web/themes/alphacube/bottom-left-c.gif delete mode 100644 xCAT-web/themes/alphacube/bottom-middle.gif delete mode 100644 xCAT-web/themes/alphacube/bottom-right-c.gif delete mode 100644 xCAT-web/themes/alphacube/button-close-focus.gif delete mode 100644 xCAT-web/themes/alphacube/button-max-focus.gif delete mode 100644 xCAT-web/themes/alphacube/button-min-focus.gif delete mode 100644 xCAT-web/themes/alphacube/frame-left.gif delete mode 100644 xCAT-web/themes/alphacube/frame-right.gif delete mode 100644 xCAT-web/themes/alphacube/left-top.gif delete mode 100644 xCAT-web/themes/alphacube/right-top.gif delete mode 100644 xCAT-web/themes/alphacube/top-middle.gif delete mode 100644 xCAT-web/themes/behavior.htc delete mode 100644 xCAT-web/themes/darkX.css delete mode 100644 xCAT-web/themes/darkX/button-close-focused.png delete mode 100644 xCAT-web/themes/darkX/button-maximize-focused.png delete mode 100644 xCAT-web/themes/darkX/button-minimize-focused.png delete mode 100644 xCAT-web/themes/darkX/frame-bottom-left-focused.png delete mode 100644 xCAT-web/themes/darkX/frame-bottom-mid-focused.png delete mode 100644 xCAT-web/themes/darkX/frame-bottom-right-focused.png delete mode 100644 xCAT-web/themes/darkX/frame-left-focused.png delete mode 100644 xCAT-web/themes/darkX/frame-right-focused.png delete mode 100644 xCAT-web/themes/darkX/titlebar-left-focused.png delete mode 100644 xCAT-web/themes/darkX/titlebar-mid-focused.png delete mode 100644 xCAT-web/themes/darkX/titlebar-right-focused.png delete mode 100644 xCAT-web/themes/debug.css delete mode 100644 xCAT-web/themes/iefix/blank.gif delete mode 100644 xCAT-web/themes/iefix/iepngfix.css delete mode 100644 xCAT-web/themes/iefix/iepngfix.htc delete mode 100644 xCAT-web/themes/lighting.css delete mode 100644 xCAT-web/themes/lighting/background_buttons.gif delete mode 100644 xCAT-web/themes/lighting/bottom-left-blue.png delete mode 100644 xCAT-web/themes/lighting/bottom-left-darkblue.png delete mode 100644 xCAT-web/themes/lighting/bottom-left-green.png delete mode 100644 xCAT-web/themes/lighting/bottom-left-grey.png delete mode 100644 xCAT-web/themes/lighting/bottom-middle-blue.png delete mode 100644 xCAT-web/themes/lighting/bottom-middle-darkblue.png delete mode 100644 xCAT-web/themes/lighting/bottom-middle-green.png delete mode 100644 xCAT-web/themes/lighting/bottom-middle-grey.png delete mode 100644 xCAT-web/themes/lighting/bottom-right-blue.png delete mode 100644 xCAT-web/themes/lighting/bottom-right-darkblue.png delete mode 100644 xCAT-web/themes/lighting/bottom-right-green.png delete mode 100644 xCAT-web/themes/lighting/bottom-right-grey.png delete mode 100644 xCAT-web/themes/lighting/button-close-blue.png delete mode 100644 xCAT-web/themes/lighting/button-close-darkblue.png delete mode 100644 xCAT-web/themes/lighting/button-close-green.png delete mode 100644 xCAT-web/themes/lighting/button-close-grey.png delete mode 100644 xCAT-web/themes/lighting/button-maximize-blue.png delete mode 100644 xCAT-web/themes/lighting/button-maximize-darkblue.png delete mode 100644 xCAT-web/themes/lighting/button-maximize-green.png delete mode 100644 xCAT-web/themes/lighting/button-maximize-grey.png delete mode 100644 xCAT-web/themes/lighting/button-minimize-blue.png delete mode 100644 xCAT-web/themes/lighting/button-minimize-darkblue.png delete mode 100644 xCAT-web/themes/lighting/button-minimize-green.png delete mode 100644 xCAT-web/themes/lighting/button-minimize-grey.png delete mode 100644 xCAT-web/themes/lighting/left-blue.png delete mode 100644 xCAT-web/themes/lighting/left-darkblue.png delete mode 100644 xCAT-web/themes/lighting/left-green.png delete mode 100644 xCAT-web/themes/lighting/left-grey.png delete mode 100644 xCAT-web/themes/lighting/pngbehavior.htc delete mode 100644 xCAT-web/themes/lighting/right-blue.png delete mode 100644 xCAT-web/themes/lighting/right-darkblue.png delete mode 100644 xCAT-web/themes/lighting/right-green.png delete mode 100644 xCAT-web/themes/lighting/right-grey.png delete mode 100644 xCAT-web/themes/lighting/spinner.gif delete mode 100644 xCAT-web/themes/lighting/top-left-blue.png delete mode 100644 xCAT-web/themes/lighting/top-left-darkblue.png delete mode 100644 xCAT-web/themes/lighting/top-left-green.png delete mode 100644 xCAT-web/themes/lighting/top-left-grey.png delete mode 100644 xCAT-web/themes/lighting/top-middle-blue.png delete mode 100644 xCAT-web/themes/lighting/top-middle-darkblue.png delete mode 100644 xCAT-web/themes/lighting/top-middle-green.png delete mode 100644 xCAT-web/themes/lighting/top-middle-grey.png delete mode 100644 xCAT-web/themes/lighting/top-right-blue.png delete mode 100644 xCAT-web/themes/lighting/top-right-darkblue.png delete mode 100644 xCAT-web/themes/lighting/top-right-green.png delete mode 100644 xCAT-web/themes/lighting/top-right-grey.png delete mode 100644 xCAT-web/themes/mac_os_x.css delete mode 100644 xCAT-web/themes/mac_os_x/B.png delete mode 100644 xCAT-web/themes/mac_os_x/BL.png delete mode 100644 xCAT-web/themes/mac_os_x/BL_Main.png delete mode 100644 xCAT-web/themes/mac_os_x/BR.png delete mode 100644 xCAT-web/themes/mac_os_x/BR_Main.png delete mode 100644 xCAT-web/themes/mac_os_x/B_Main.png delete mode 100644 xCAT-web/themes/mac_os_x/L.png delete mode 100644 xCAT-web/themes/mac_os_x/L_Main.png delete mode 100644 xCAT-web/themes/mac_os_x/R.png delete mode 100644 xCAT-web/themes/mac_os_x/R_Main.png delete mode 100644 xCAT-web/themes/mac_os_x/T.png delete mode 100644 xCAT-web/themes/mac_os_x/TL.png delete mode 100644 xCAT-web/themes/mac_os_x/TL_Main.png delete mode 100644 xCAT-web/themes/mac_os_x/TR.png delete mode 100644 xCAT-web/themes/mac_os_x/TR_Main.png delete mode 100644 xCAT-web/themes/mac_os_x/T_Main.png delete mode 100644 xCAT-web/themes/mac_os_x/close.gif delete mode 100644 xCAT-web/themes/mac_os_x/maximize.gif delete mode 100644 xCAT-web/themes/mac_os_x/minimize.gif delete mode 100644 xCAT-web/themes/mac_os_x_dialog.css delete mode 100644 xCAT-web/themes/mac_os_x_dialog/B.png delete mode 100644 xCAT-web/themes/mac_os_x_dialog/BL.png delete mode 100644 xCAT-web/themes/mac_os_x_dialog/BR.png delete mode 100644 xCAT-web/themes/mac_os_x_dialog/L.png delete mode 100644 xCAT-web/themes/mac_os_x_dialog/R.png delete mode 100644 xCAT-web/themes/mac_os_x_dialog/T.png delete mode 100644 xCAT-web/themes/mac_os_x_dialog/TL.png delete mode 100644 xCAT-web/themes/mac_os_x_dialog/TR.png delete mode 100644 xCAT-web/themes/mac_os_x_dialog/bg.gif delete mode 100644 xCAT-web/themes/mac_os_x_dialog/close.gif delete mode 100644 xCAT-web/themes/mac_os_x_dialog/maximize.gif delete mode 100644 xCAT-web/themes/mac_os_x_dialog/minimize.gif delete mode 100644 xCAT-web/themes/nuncio.css delete mode 100644 xCAT-web/themes/nuncio/bottom_left.png delete mode 100644 xCAT-web/themes/nuncio/bottom_mid.png delete mode 100644 xCAT-web/themes/nuncio/bottom_right.png delete mode 100644 xCAT-web/themes/nuncio/center_left.png delete mode 100644 xCAT-web/themes/nuncio/center_right.png delete mode 100644 xCAT-web/themes/nuncio/close.png delete mode 100644 xCAT-web/themes/nuncio/minimize.png delete mode 100644 xCAT-web/themes/nuncio/overlay.png delete mode 100644 xCAT-web/themes/nuncio/top_left.png delete mode 100644 xCAT-web/themes/nuncio/top_mid.png delete mode 100644 xCAT-web/themes/nuncio/top_right.png delete mode 100644 xCAT-web/themes/spread.css delete mode 100644 xCAT-web/themes/spread/.gif delete mode 100644 xCAT-web/themes/spread/bottom-left-c.gif delete mode 100644 xCAT-web/themes/spread/bottom-middle.gif delete mode 100644 xCAT-web/themes/spread/bottom-right-c.gif delete mode 100644 xCAT-web/themes/spread/button-close-focus.gif delete mode 100644 xCAT-web/themes/spread/button-max-focus.gif delete mode 100644 xCAT-web/themes/spread/button-min-focus.gif delete mode 100644 xCAT-web/themes/spread/frame-left.gif delete mode 100644 xCAT-web/themes/spread/frame-right.gif delete mode 100644 xCAT-web/themes/spread/left-top.gif delete mode 100644 xCAT-web/themes/spread/right-top.gif delete mode 100644 xCAT-web/themes/spread/top-middle.gif create mode 100644 xCAT-web/xCAT-web.spec delete mode 100644 xCAT-web/xcat.web.spec diff --git a/xCAT-web/cmds/grpattr b/xCAT-web/cmds/grpattr index fc1899679..3eb0c593c 100644 --- a/xCAT-web/cmds/grpattr +++ b/xCAT-web/cmds/grpattr @@ -13,7 +13,7 @@ if ($::opt_h) { usage(0); } #$::VERBOSE = $::opt_v; # Get the status of each node and save in a hash -my @ns = runcmd("/opt/xcat/bin/nodestat '/[A-Za-z].*'"); +my @ns = runcmd("nodestat '/.*'"); my %nodestat; foreach my $line (@ns) { my ($node, $stat) = split(/[:\s]+/, $line); @@ -24,7 +24,7 @@ if ($::opt_v) { foreach my $n (keys %nodestat) { print "$n: $nodestat{$n}\n"; } # Get the list of nodes/groups and aggregate the status of the group using the status of each node #TODO: this must be changed for xcat 2.0 -my @nodelist = runcmd("egrep '^[A-Za-z]' /opt/xcat/etc/nodelist.tab"); +my @nodelist = runcmd("egrep '^[A-Za-z]' $ENV{XCATROOT}/etc/nodelist.tab"); verbose("Found ", scalar(@nodelist), " items in nodelist.tab\n"); my %groups; foreach my $line (@nodelist) { diff --git a/xCAT-web/css/xcat.css b/xCAT-web/css/xcat.css deleted file mode 100644 index 046b466cf..000000000 --- a/xCAT-web/css/xcat.css +++ /dev/null @@ -1,155 +0,0 @@ -#content .block { - width: 400px; - height: 350px; - position: absolute; - overflow: hidden; - left: 287px; - top: 183px; -} - - -#content .block h3 { - margin: 0; - padding: 5px; - font-size: 14px; - color: #fff; - background-color: #2153AA; -} - - - -#content .block .block-toggle { - background-image: url('http://wopr.dfw.ibm.com/xcat/images/close2.gif'); - display: block; - float: right; - width: 14px; - height: 14px; - background-repeat: no-repeat; - background-position: center; - cursor: pointer; -} - - -#content .block .block-close { - background-image: url('http://wopr.dfw.ibm.com/xcat/images/close2.gif'); - display: block; - float: right; - width: 14px; - height: 14px; - background-repeat: no-repeat; - background-position: center; - cursor: pointer; -} - -#content .handle { - cursor: move; - -} - -#content .block .block-toggle span { - display: none; -} - - -#content .blockContent { - width: 400px; - height: 330px; - border: 0px; - padding: 0px; - background: #ffffee; - position: relative; - border: 1px dotted #2153AA; -} - -#content .blockColumn1{ - width: 200px; - padding: 0 0 0 0; - height: 330px; - position: relative; - float: left; -} - - -#content .blockColumn2{ - width: 200px; - height: 330px; - padding: 0 0 0 0; - position: relative; - float: left; - left: 201px; -} - - -#content .blockColumnHeader { - background: #aaa; - width: 200px; - margin: 0 0 0 0; - height: 20px; - font-weight: bold; - font-size: 16px; - color: #666; - padding-left: 5px; - text-align: center; - position: absolute; - bottom: 300px; -} - - -#content .floatPaneColumnContent1 { - overflow-y: auto; - width: 200px; - height: 290px; - position: absolute; - bottom: 10px; - -} - -#content .floatPaneColumnContent2 { - width: 200px; - height: 290px; - position: absolute; - bottom: 10px; -} - -/* Command Window */ -#content .cmd { - width: 400px; - height: 350px; - background: #bbb; - position: relative; - overflow: hidden; - left: 30%; - top: 40px; -} - - -#content .cmdLine { - text-align: center; - font-size: 14px; - font-weight: bold; - padding: 0 0 0 0; -} - -#content .cmdContainer { - overflow-y: auto; - padding: 0 0 0 0; - width: 400px; - height: 300px; -} - -#content .ListLine0 { - background: #e0f8f8; - padding-left: 10px; - width: 390px; -} -#content .ListLine1 { - background: #b0f8f8; - padding-left: 10px; - width: 390px; -} - -.pageScroll { - width: 400px; - height: 330px; - overflow: scroll; -} diff --git a/xCAT-web/css/xcattop.css b/xCAT-web/css/xcattop.css deleted file mode 100644 index 07c703316..000000000 --- a/xCAT-web/css/xcattop.css +++ /dev/null @@ -1,132 +0,0 @@ -.grid { - background: #fff; - border: 1px solid #eee; - /* width: boxWidth ?>px; */ - text-align: center; - height: 400px; - padding: 2px 2px 2px 2px; - margin: 2px 40px 2px 2px; - -} - -.offLineNode { - background: #aaa; - color: #444; - width: 80px; - height: 20px; - margin: 2px; - font-family: arial; - font-size: 10px; - text-align: center; - overflow: hidden; - float: left; -} - -.pingableNode { - background: #66CC99; - color: #444; - width: 80px; - height: 20px; - margin: 2px; - font-family: arial; - font-size: 10px; - text-align: center; - overflow: hidden; - float: left; -} - -.legendBox { - padding: 2px 2px 2px 2px; - margin-left: 10px; - margin-top: 5px; - margin-bottom: 10px; - border: 2px solid #eee; - position: relative; - width: 800px; - text-align: center; - float: left; - -} -.mHead { - - font-family: arial; - -} -.subBox { - border: 1px solid #eee; - margin-left: 20px; - margin-right: 20px; - width: 100px; - height: 20px; -} - -.legendDescription { - font-size: 10px; - font-family: arial; - color: #999; -} -.unknown { - background: #aaa; - height: 20px; - width: 40px; -} -.pingable { - background: #66CC99; - height: 20px; - width: 40px; -} - -.online { - background: #6699CC; - height: 20px; - width: 40px; -} - -/* grid stuff */ -#box { - position: relative; - top: 50px; - left: 20px; -} -#boxNav { - position: relative; - left: 0px; - top: 100px; - - -} - -#boxNavPrev { - position: absolute; - top: 75px; - left: 5px; - z-index: 100; -} - -#boxNavNext { - position: absolute; - top: 75px; - right: 5px; - z-index: 100; -} - -#boxMotionContainer { - margin: 0pt 30px; - padding: 0px; - overflow: hidden; - position: relative; -} - -#boxMovingGallery { - position: relative; -} - -.boxNav { - padding: 0 0 0 0; - margin: 0 0 0 0; - position: absolute; - text-align: center; - top: 0px; - left: 0px; -} - diff --git a/xCAT-web/lib/functions.php b/xCAT-web/lib/functions.php index 98f64a008..7fcd2c3cf 100644 --- a/xCAT-web/lib/functions.php +++ b/xCAT-web/lib/functions.php @@ -38,19 +38,6 @@ echo << \n"; - -//echo "\n"; -//echo "\n"; -//echo "\n"; - -//echo "\n"; -//echo "\n"; - -//echo "\n"; -//echo "\n"; - if ($stylesheets) { foreach ($stylesheets as $s) { @@ -218,7 +205,7 @@ function runcmd ($cmd, $mode, &$output, $options=NULL){ //Set error output to the same source as standard output (on Linux) if (strstr($cmd,'2>&1') == FALSE && !$options["NoRedirectStdErr"]) { $cmd .= ' 2>&1'; } - if (!isSupported('ClientServer')) { $cmd = "/bin/sudo $cmd"; } + if (!isSupported('ClientServer')) { $cmd = "/usr/bin/sudo $cmd"; } //todo: add support for xcat 2 $ret_stat = ""; diff --git a/xCAT-web/lib/phpinfo.php b/xCAT-web/lib/phpinfo.php index 00aa6aca0..16410ee93 100644 --- a/xCAT-web/lib/phpinfo.php +++ b/xCAT-web/lib/phpinfo.php @@ -1,4 +1,13 @@ \n"; +runcmd('echo $PATH', 1, $junk); +runcmd('whoami', 1, $junk); +echo "

\n"; + +/* $output = array(); runcmd("listattr", 2, $output); foreach ($output as $line) { echo "

line=$line

"; } */ + phpinfo() ?> \ No newline at end of file diff --git a/xCAT-web/machines/groups.php b/xCAT-web/machines/groups.php index 939d78a53..b4a818f6e 100644 --- a/xCAT-web/machines/groups.php +++ b/xCAT-web/machines/groups.php @@ -55,8 +55,6 @@ insertButtons( echo '
'; -/* $output = array(); runcmd("listattr", 2, $output); foreach ($output as $line) { echo "

line=$line

"; } */ - GroupNodeTable::insertGroupTableHeader(); // Get the names and status of the groups diff --git a/xCAT-web/manage/dsh.php b/xCAT-web/manage/dsh.php index 72a890edd..51171a1c3 100644 --- a/xCAT-web/manage/dsh.php +++ b/xCAT-web/manage/dsh.php @@ -53,7 +53,7 @@ if (!isset($_REQUEST['noderange'])) { ?> Command:  - + History: