summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--daemon/configure.ac2
-rw-r--r--daemon/ext2.c34
-rw-r--r--daemon/mkfs.c2
-rwxr-xr-xsrc/generator.ml20
4 files changed, 29 insertions, 29 deletions
diff --git a/daemon/configure.ac b/daemon/configure.ac
index f2f96c2a..8506ef7f 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -50,7 +50,7 @@ gl_INIT
AC_ARG_ENABLE([gcc-warnings],
[AS_HELP_STRING([--enable-gcc-warnings],
- [turn on lots of GCC warnings (for developers)])],
+ [turn on lots of GCC warnings (for developers)])],
[case $enableval in
yes|no) ;;
*) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;;
diff --git a/daemon/ext2.c b/daemon/ext2.c
index 2603ed06..956c7193 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -277,8 +277,8 @@ do_mke2journal (int blocksize, const char *device)
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
r = command (NULL, &err,
- "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
- device, NULL);
+ "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+ device, NULL);
if (r == -1) {
reply_with_error ("mke2journal: %s", err);
free (err);
@@ -299,9 +299,9 @@ do_mke2journal_L (int blocksize, const char *label, const char *device)
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
r = command (NULL, &err,
- "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
- "-L", label,
- device, NULL);
+ "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+ "-L", label,
+ device, NULL);
if (r == -1) {
reply_with_error ("mke2journal_L: %s", err);
free (err);
@@ -322,9 +322,9 @@ do_mke2journal_U (int blocksize, const char *uuid, const char *device)
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
r = command (NULL, &err,
- "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
- "-U", uuid,
- device, NULL);
+ "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+ "-U", uuid,
+ device, NULL);
if (r == -1) {
reply_with_error ("mke2journal_U: %s", err);
free (err);
@@ -337,7 +337,7 @@ do_mke2journal_U (int blocksize, const char *uuid, const char *device)
int
do_mke2fs_J (const char *fstype, int blocksize, const char *device,
- const char *journal)
+ const char *journal)
{
char *err;
int r;
@@ -350,8 +350,8 @@ do_mke2fs_J (const char *fstype, int blocksize, const char *device,
snprintf (jdev, len+32, "device=%s", journal);
r = command (NULL, &err,
- "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
- device, NULL);
+ "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
+ device, NULL);
if (r == -1) {
reply_with_error ("mke2fs_J: %s", err);
free (err);
@@ -364,7 +364,7 @@ do_mke2fs_J (const char *fstype, int blocksize, const char *device,
int
do_mke2fs_JL (const char *fstype, int blocksize, const char *device,
- const char *label)
+ const char *label)
{
char *err;
int r;
@@ -377,8 +377,8 @@ do_mke2fs_JL (const char *fstype, int blocksize, const char *device,
snprintf (jdev, len+32, "device=LABEL=%s", label);
r = command (NULL, &err,
- "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
- device, NULL);
+ "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
+ device, NULL);
if (r == -1) {
reply_with_error ("mke2fs_JL: %s", err);
free (err);
@@ -391,7 +391,7 @@ do_mke2fs_JL (const char *fstype, int blocksize, const char *device,
int
do_mke2fs_JU (const char *fstype, int blocksize, const char *device,
- const char *uuid)
+ const char *uuid)
{
char *err;
int r;
@@ -404,8 +404,8 @@ do_mke2fs_JU (const char *fstype, int blocksize, const char *device,
snprintf (jdev, len+32, "device=UUID=%s", uuid);
r = command (NULL, &err,
- "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
- device, NULL);
+ "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
+ device, NULL);
if (r == -1) {
reply_with_error ("mke2fs_JU: %s", err);
free (err);
diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 73fd860e..faeeaeb6 100644
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -56,7 +56,7 @@ do_mkfs_b (const char *fstype, int blocksize, const char *device)
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
r = command (NULL, &err,
- "/sbin/mkfs", "-t", fstype, "-b", blocksize_s, device, NULL);
+ "/sbin/mkfs", "-t", fstype, "-b", blocksize_s, device, NULL);
if (r == -1) {
reply_with_error ("mkfs_b: %s", err);
free (err);
diff --git a/src/generator.ml b/src/generator.ml
index fef03a81..691cf606 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -2094,10 +2094,10 @@ C<device>.");
(let uuid = uuidgen () in
[InitBasicFS, Always, TestOutput (
[["set_e2uuid"; "/dev/sda1"; uuid];
- ["get_e2uuid"; "/dev/sda1"]], uuid);
+ ["get_e2uuid"; "/dev/sda1"]], uuid);
InitBasicFS, Always, TestOutput (
[["set_e2uuid"; "/dev/sda1"; "clear"];
- ["get_e2uuid"; "/dev/sda1"]], "");
+ ["get_e2uuid"; "/dev/sda1"]], "");
(* We can't predict what UUIDs will be, so just check the commands run. *)
InitBasicFS, Always, TestRun (
[["set_e2uuid"; "/dev/sda1"; "random"]]);
@@ -2823,7 +2823,7 @@ a limitation of the kernel or swap tools.");
(let uuid = uuidgen () in
[InitEmpty, Always, TestRun (
[["sfdiskM"; "/dev/sda"; ","];
- ["mkswap_U"; uuid; "/dev/sda1"]])]),
+ ["mkswap_U"; uuid; "/dev/sda1"]])]),
"create a swap partition with an explicit UUID",
"\
Create a swap partition on C<device> with UUID C<uuid>.");
@@ -3335,8 +3335,8 @@ labeled swap partition.");
(let uuid = uuidgen () in
[InitEmpty, Always, TestRun (
[["mkswap_U"; uuid; "/dev/sdb"];
- ["swapon_uuid"; uuid];
- ["swapoff_uuid"; uuid]])]),
+ ["swapon_uuid"; uuid];
+ ["swapoff_uuid"; uuid]])]),
"enable swap on swap partition by UUID",
"\
This command enables swap to a swap partition with the given UUID.
@@ -3521,11 +3521,11 @@ This creates an ext2 external journal on C<device> with label C<label>.");
(let uuid = uuidgen () in
[InitEmpty, Always, TestOutput (
[["sfdiskM"; "/dev/sda"; ",100 ,"];
- ["mke2journal_U"; "4096"; uuid; "/dev/sda1"];
- ["mke2fs_JU"; "ext2"; "4096"; "/dev/sda2"; uuid];
- ["mount"; "/dev/sda2"; "/"];
- ["write_file"; "/new"; "new file contents"; "0"];
- ["cat"; "/new"]], "new file contents")]),
+ ["mke2journal_U"; "4096"; uuid; "/dev/sda1"];
+ ["mke2fs_JU"; "ext2"; "4096"; "/dev/sda2"; uuid];
+ ["mount"; "/dev/sda2"; "/"];
+ ["write_file"; "/new"; "new file contents"; "0"];
+ ["cat"; "/new"]], "new file contents")]),
"make ext2/3/4 external journal with UUID",
"\
This creates an ext2 external journal on C<device> with UUID C<uuid>.");
generated by cgit (git 2.34.1) at 2025-05-23 19:48:32 +0000