#include <stdio.h>
#include <stdlib.h>
+#include <inttypes.h>
#include <string.h>
#include <unistd.h>
p++;
*p = '4';
- if (access (name, X_OK) == 0)
+ if (prog_exists (name))
return 0;
*p = '2';
- if (access (name, X_OK) == 0)
+ if (prog_exists (name))
return 0;
reply_with_error ("cannot find required program %s", name);
char **ret = NULL;
int size = 0, alloc = 0;
- char prog[] = "/sbin/tune2fs";
+ char prog[] = "tune2fs";
if (e2prog (prog) == -1)
return NULL;
int r;
char *err;
- char prog[] = "/sbin/e2label";
+ char prog[] = "e2label";
if (e2prog (prog) == -1)
return -1;
int r, len;
char *out, *err;
- char prog[] = "/sbin/e2label";
+ char prog[] = "e2label";
if (e2prog (prog) == -1)
return NULL;
int r;
char *err;
- char prog[] = "/sbin/tune2fs";
+ char prog[] = "tune2fs";
if (e2prog (prog) == -1)
return -1;
* to use tune2fs -l and then look for a particular string in
* the output.
*/
- char prog[] = "/sbin/tune2fs";
+ char prog[] = "tune2fs";
if (e2prog (prog) == -1)
return NULL;
char *err;
int r;
- char prog[] = "/sbin/resize2fs";
+ char prog[] = "resize2fs";
if (e2prog (prog) == -1)
return -1;
}
int
-do_e2fsck_f (const char *device)
+do_resize2fs_size (const char *device, int64_t size)
{
char *err;
int r;
- char prog[] = "/sbin/e2fsck";
+ char prog[] = "resize2fs";
if (e2prog (prog) == -1)
return -1;
- r = command (NULL, &err, prog, "-p", "-f", device, NULL);
+ /* resize2fs itself may impose additional limits. Since we are
+ * going to use the 'K' suffix however we can only work with whole
+ * kilobytes.
+ */
+ if (size & 1023) {
+ reply_with_error ("%" PRIi64 ": size must be a round number of kilobytes",
+ size);
+ return -1;
+ }
+ size /= 1024;
+
+ char buf[32];
+ snprintf (buf, sizeof buf, "%" PRIi64 "K", size);
+
+ r = command (NULL, &err, prog, device, buf, NULL);
if (r == -1) {
reply_with_error ("%s", err);
free (err);
}
int
+do_e2fsck_f (const char *device)
+{
+ char *err;
+ int r;
+
+ char prog[] = "e2fsck";
+ if (e2prog (prog) == -1)
+ return -1;
+
+ /* 0 = no errors, 1 = errors corrected.
+ *
+ * >= 4 means uncorrected or other errors.
+ *
+ * 2, 3 means errors were corrected and we require a reboot. This is
+ * a difficult corner case.
+ */
+ r = commandr (NULL, &err, prog, "-p", "-f", device, NULL);
+ if (r == -1 || r >= 2) {
+ reply_with_error ("%s", err);
+ free (err);
+ return -1;
+ }
+
+ free (err);
+ return 0;
+}
+
+int
do_mke2journal (int blocksize, const char *device)
{
char *err;
int r;
- char prog[] = "/sbin/mke2fs";
+ char prog[] = "mke2fs";
if (e2prog (prog) == -1)
return -1;
char *err;
int r;
- char prog[] = "/sbin/mke2fs";
+ char prog[] = "mke2fs";
if (e2prog (prog) == -1)
return -1;
char *err;
int r;
- char prog[] = "/sbin/mke2fs";
+ char prog[] = "mke2fs";
if (e2prog (prog) == -1)
return -1;
char *err;
int r;
- char prog[] = "/sbin/mke2fs";
+ char prog[] = "mke2fs";
if (e2prog (prog) == -1)
return -1;
char *err;
int r;
- char prog[] = "/sbin/mke2fs";
+ char prog[] = "mke2fs";
if (e2prog (prog) == -1)
return -1;
char *err;
int r;
- char prog[] = "/sbin/mke2fs";
+ char prog[] = "mke2fs";
if (e2prog (prog) == -1)
return -1;