diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-08-07 16:41:38 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-08-07 16:43:24 +0200 |
| commit | 8c213b0416b1a9411725f3c138d6c8b60032fd2b (patch) | |
| tree | dfa74718e2d48fb53b40e0133a14cb8aff6a9415 | |
| parent | ebf7e9028f2facf1a87c56dd261bda82ab9bcc59 (diff) | |
| download | fstools-8c213b0416b1a9411725f3c138d6c8b60032fd2b.tar.gz | |
libfstools: Rename move_mount() function to ovl_move_mount() for glibc 2.36
glibc in version 2.36 defines an own function named move_mount() in some
header. The definition from glibc collides with our definition, just
rename the function in fstools.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | libfstools/overlay.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libfstools/overlay.c b/libfstools/overlay.c index 6790337..7a7a95f 100644 --- a/libfstools/overlay.c +++ b/libfstools/overlay.c @@ -159,9 +159,9 @@ overlay_mount(struct volume *v, char *fs) } /** - * move_mount - move mount point to the new root + * ovl_move_mount - move mount point to the new root */ -static int move_mount(const char *device, const char *mount_point) +static int ovl_move_mount(const char *device, const char *mount_point) { static const char *prefix = "/tmp/root/"; @@ -228,7 +228,7 @@ switch2jffs(struct volume *v) * doesn't support mounts. Mounting to upper dir don't make overlay * /propagate/ files to the target dir. */ - foreach_mount(move_mount); + foreach_mount(ovl_move_mount); return ret; } |