search for: wipe_device_before_mkfs

My wipefs has no --force option, as a result mke2fs command in guestfish fails. Looks like 72dd398679cd0bb803daf306d12558369615ba70 needs an adjustment to make use of do_wipefs? Also str_wipefs is not used in that file. Olaf

...ish fails. > > Looks like 72dd398679cd0bb803daf306d12558369615ba70 needs an adjustment > to make use of do_wipefs? > Also str_wipefs is not used in that file. Also daemon/zero.c has a wipefs_has_force_option function. It seems like it would be better if this function was also used in wipe_device_before_mkfs (in the same file). But yes, it's definitely a bug if wipefs is causing mke2fs to fail. How about the attached patch (only compile-tested)? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Fedora Windows cross-compiler. Compile Windows programs, test,...

This patch reworks how we start up LVM and lvmetad. It fixes the problem we had converting a guest which had a peculiar LVM configuration: https://bugzilla.redhat.com/show_bug.cgi?id=1581810#c14 However please note I have NOT yet tested it fully. Rich.

...e__((cleanup(cleanup_aug_close))) #define CLEANUP_FREE_STRINGSBUF __attribute__((cleanup(cleanup_free_stringsbuf))) #else -#define CLEANUP_AUG_CLOSE #define CLEANUP_FREE_STRINGSBUF #endif @@ -253,20 +250,6 @@ extern int lv_canonical (const char *device, char **ret); /* zero.c */ extern void wipe_device_before_mkfs (const char *device); -/* augeas.c */ -extern void aug_read_version (void); - -/* The version of augeas, saved as: - * (MAJOR << 16) | (MINOR << 8) | PATCH - */ -extern int augeas_version; -static inline int -augeas_is_version (int major, int minor, int patch) -{ - aug_read_version (...

...e__((cleanup(cleanup_aug_close))) #define CLEANUP_FREE_STRINGSBUF __attribute__((cleanup(cleanup_free_stringsbuf))) #else -#define CLEANUP_AUG_CLOSE #define CLEANUP_FREE_STRINGSBUF #endif @@ -254,20 +251,6 @@ extern int lv_canonical (const char *device, char **ret); /* zero.c */ extern void wipe_device_before_mkfs (const char *device); -/* augeas.c */ -extern void aug_read_version (void); - -/* The version of augeas, saved as: - * (MAJOR << 16) | (MINOR << 8) | PATCH - */ -extern int augeas_version; -static inline int -augeas_is_version (int major, int minor, int patch) -{ - aug_read_version (...

...return out; +} + /* Takes optional arguments, consult optargs_bitmask. */ int do_btrfs_filesystem_resize (const char *filesystem, int64_t size) diff --git a/daemon/daemon.h b/daemon/daemon.h index c101c3b..cf123bf 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -232,6 +232,9 @@ extern void wipe_device_before_mkfs (const char *device); extern void aug_read_version (void); extern void aug_finalize (void); +/*-- in btrfs.c --*/ +extern char *btrfs_get_label (const char *device); + /* The version of augeas, saved as: * (MAJOR << 16) | (MINOR << 8) | PATCH */ -- 1.9.3

...r); return -1; @@ -376,7 +368,7 @@ do_e2fsck (const char *device, return -1; } - ADD_ARG (argv, i, str_e2fsck); + ADD_ARG (argv, i, "e2fsck"); ADD_ARG (argv, i, "-f"); if (correct) @@ -425,7 +417,7 @@ do_mke2journal (int blocksize, const char *device) wipe_device_before_mkfs (device); r = command (NULL, &err, - str_mke2fs, "-F", "-O", "journal_dev", "-b", blocksize_s, + "mke2fs", "-F", "-O", "journal_dev", "-b", blocksize_s, dev...

...r); return -1; @@ -376,7 +371,7 @@ do_e2fsck (const char *device, return -1; } - ADD_ARG (argv, i, str_e2fsck); + ADD_ARG (argv, i, "e2fsck"); ADD_ARG (argv, i, "-f"); if (correct) @@ -425,7 +420,7 @@ do_mke2journal (int blocksize, const char *device) wipe_device_before_mkfs (device); r = command (NULL, &err, - str_mke2fs, "-F", "-O", "journal_dev", "-b", blocksize_s, + "mke2fs", "-F", "-O", "journal_dev", "-b", blocksize_s, dev...

Hi, this series improves the way LVM is used in the appliance: in particular, now lvmetad can eventually run at all, and with the correct configuration. Also improve the listing strategies. Changes in v2: - dropped patch #5, will be sent separately - move lvmetad statup in own function (patch #2) Thanks, Pino Toscano (4): daemon: lvm-filter: set also global_filter daemon: lvm-filter:

.../daemon/daemon.h @@ -249,10 +249,6 @@ extern char *get_blkid_tag (const char *device, const char *tag); /* lvm.c */ extern int lv_canonical (const char *device, char **ret); -/* lvm-filter.c */ -extern void clean_lvm_config (void); -extern void start_lvmetad (void); - /* zero.c */ extern void wipe_device_before_mkfs (const char *device); diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index 68d3de2ec..ae428e573 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -233,14 +233,6 @@ main (int argc, char *argv[]) _umask (0); #endif - /* Make a private copy of /etc/lvm so we can change the config...

v3: - Don't remove the LVM transform.

v2 of previous patch, which fixes some missing bits. For now I'm going to go with Pino's RHEL 7.1 patch, since it is at least smaller than this. So I'm sending this to the list just to have it archived for later. Rich.

Hi, currently /etc/shadow is edited manually when needed (i.e. when setting the password for an user), and it is not changed when removing users. Import the upstream shadow.aug (currently in their development serie, but not part of any released version yet), and use it only when the augeas version is less than a potential 1.2.1 (covering also the case when the new version is just 1.3.0). Pino

This reimplements the augeas APIs using ocaml-augeas (dropping all the C code). The behaviour seems unchanged, although I may have not tested all the various corner cases. Changes from v2: - dropped patch #1, as it was applied already (was a real bugfix) - rebased on master Pino Toscano (3): Revert "Revert "daemon: implement OptString for OCaml APIs"" daemon: move augeas

This reimplements the augeas APIs using ocaml-augeas (dropping all the C code). The behaviour seems unchanged, although I may have not tested all the various corner cases. Pino Toscano (4): daemon: fix/enhance error reporting of Augeas exceptions Revert "Revert "daemon: implement OptString for OCaml APIs"" daemon: move augeas APIs to OCaml daemon: drop usage of C

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’

...) { - if (aug_load (aug) == -1) { - AUGEAS_ERROR ("aug_load"); - return -1; - } - } - } - return 0; } diff --git a/daemon/daemon.h b/daemon/daemon.h index 0ccbc9e..95227d6 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -232,17 +232,6 @@ extern void wipe_device_before_mkfs (const char *device); extern void aug_read_version (void); extern void aug_finalize (void); -/* The version of augeas, saved as: - * (MAJOR << 16) | (MINOR << 8) | PATCH - */ -extern int augeas_version; -static inline int -augeas_is_version (int major, int minor, int patch) -{ - au...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Various changes/fixes to use smaller stack frames. Rich.

Augeas 1.7.0 was released a couple of days ago. By encouraging everyone to upgrade to this we can drop several calls to aug_transform and also our custom copies of two lenses, and a lot of related code. Rich.