From mboxrd@z Thu Jan  1 00:00:00 1970
From: kupcevic@sourceware.org <kupcevic@sourceware.org>
Date: 21 Dec 2006 21:23:18 -0000
Subject: [Cluster-devel] conga/ricci/modules/storage ExtendedFS.cpp
Message-ID: <20061221212318.648.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-12-21 21:23:17

Modified files:
	ricci/modules/storage: ExtendedFS.cpp 

Log message:
	modstorage: Use resize2fs instead ext2online where appropriate

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/ExtendedFS.cpp.diff?cvsroot=cluster&r1=1.7&r2=1.8

--- conga/ricci/modules/storage/ExtendedFS.cpp	2006/10/06 03:10:13	1.7
+++ conga/ricci/modules/storage/ExtendedFS.cpp	2006/12/21 21:23:17	1.8
@@ -148,15 +148,19 @@
 		   unsigned long long new_size, 
 		   const Props& new_props)
 {
+  String extend_cmd("/usr/sbin/ext2online");
+  if (access(extend_cmd.c_str(), X_OK))
+    extend_cmd = "/sbin/resize2fs";
+  
   vector<String> args;
   args.push_back(path);
   
   String out, err;
   int status;
-  if (utils::execute("/usr/sbin/ext2online", args, out, err, status))
-    throw command_not_found_error_msg("ext2online");
+  if (utils::execute(extend_cmd, args, out, err, status))
+    throw command_not_found_error_msg(extend_cmd);
   if (status)
-    throw String("ext2online failed");
+    throw String(extend_cmd + " failed");
 }
 
 bool