From 3f0e8e1a08a7dbfd408affeece24f626bf4a54b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=9F=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=BE=D0=B1=D0=BD?= =?utf8?q?=D1=8B=D0=B9=20=D0=93=D0=BE=D0=BC=D0=B5=D1=80?= Date: Wed, 17 Aug 2016 14:51:31 +0300 Subject: [PATCH] libfstools: "lowerdir" variable name in fopivot Hi all! In fopivot in libfstools variable name "lowerdir" is confusing and doesn't make any sense. There is a patch renaming that var to "mount_options". --- libfstools/mount.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libfstools/mount.c b/libfstools/mount.c index 81176ce..371082b 100644 --- a/libfstools/mount.c +++ b/libfstools/mount.c @@ -82,7 +82,7 @@ pivot(char *new, char *old) int fopivot(char *rw_root, char *ro_root) { - char overlay[64], lowerdir[64]; + char overlay[64], mount_options[64]; if (find_filesystem("overlay")) { ULOG_ERR("BUG: no suitable fs found\n"); @@ -96,8 +96,8 @@ fopivot(char *rw_root, char *ro_root) * If it fails, it means that we are probably using a v23 and * later versions that require a workdir */ - snprintf(lowerdir, sizeof(lowerdir), "lowerdir=/,upperdir=%s", rw_root); - if (mount(overlay, "/mnt", "overlayfs", MS_NOATIME, lowerdir)) { + snprintf(mount_options, sizeof(mount_options), "lowerdir=/,upperdir=%s", rw_root); + if (mount(overlay, "/mnt", "overlayfs", MS_NOATIME, mount_options)) { char upperdir[64], workdir[64], upgrade[64], upgrade_dest[64]; struct stat st; @@ -105,7 +105,7 @@ fopivot(char *rw_root, char *ro_root) snprintf(workdir, sizeof(workdir), "%s/work", rw_root); snprintf(upgrade, sizeof(upgrade), "%s/sysupgrade.tgz", rw_root); snprintf(upgrade_dest, sizeof(upgrade_dest), "%s/sysupgrade.tgz", upperdir); - snprintf(lowerdir, sizeof(lowerdir), "lowerdir=/,upperdir=%s,workdir=%s", + snprintf(mount_options, sizeof(mount_options), "lowerdir=/,upperdir=%s,workdir=%s", upperdir, workdir); /* @@ -122,10 +122,10 @@ fopivot(char *rw_root, char *ro_root) rename(upgrade, upgrade_dest); /* Mainlined overlayfs has been renamed to "overlay", try that first */ - if (mount(overlay, "/mnt", "overlay", MS_NOATIME, lowerdir)) { - if (mount(overlay, "/mnt", "overlayfs", MS_NOATIME, lowerdir)) { + if (mount(overlay, "/mnt", "overlay", MS_NOATIME, mount_options)) { + if (mount(overlay, "/mnt", "overlayfs", MS_NOATIME, mount_options)) { ULOG_ERR("mount failed: %s, options %s\n", - strerror(errno), lowerdir); + strerror(errno), mount_options); return -1; } } -- 2.25.1