diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-09-22 15:51:17 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-09-23 18:57:36 +0200 |
| commit | 511a8cfe300662963522cea314e3b2426fc2f3ee (patch) | |
| tree | d496c0cb8d88bb47552dbf3dc450758671715c6b /src/volatile-root/volatile-root.c | |
| parent | mount-util: make sure get_mount_flags() ever follows symlinks (diff) | |
| download | systemd-511a8cfe300662963522cea314e3b2426fc2f3ee.tar.xz systemd-511a8cfe300662963522cea314e3b2426fc2f3ee.zip | |
mount-util: switch most mount_verbose() code over to not follow symlinks
Diffstat (limited to '')
| -rw-r--r-- | src/volatile-root/volatile-root.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c index 6a08464245..35c045630f 100644 --- a/src/volatile-root/volatile-root.c +++ b/src/volatile-root/volatile-root.c @@ -29,7 +29,7 @@ static int make_volatile(const char *path) { if (r < 0) return log_error_errno(r, "Couldn't generate volatile sysroot directory: %m"); - r = mount_verbose(LOG_ERR, "tmpfs", "/run/systemd/volatile-sysroot", "tmpfs", MS_STRICTATIME, "mode=755" TMPFS_LIMITS_ROOTFS); + r = mount_nofollow_verbose(LOG_ERR, "tmpfs", "/run/systemd/volatile-sysroot", "tmpfs", MS_STRICTATIME, "mode=755" TMPFS_LIMITS_ROOTFS); if (r < 0) goto finish_rmdir; @@ -38,7 +38,7 @@ static int make_volatile(const char *path) { goto finish_umount; } - r = mount_verbose(LOG_ERR, old_usr, "/run/systemd/volatile-sysroot/usr", NULL, MS_BIND|MS_REC, NULL); + r = mount_nofollow_verbose(LOG_ERR, old_usr, "/run/systemd/volatile-sysroot/usr", NULL, MS_BIND|MS_REC, NULL); if (r < 0) goto finish_umount; @@ -57,7 +57,7 @@ static int make_volatile(const char *path) { if (mount(NULL, "/", NULL, MS_SLAVE|MS_REC, NULL) < 0) log_warning_errno(errno, "Failed to remount %s MS_SLAVE|MS_REC, ignoring: %m", path); - r = mount_verbose(LOG_ERR, "/run/systemd/volatile-sysroot", path, NULL, MS_MOVE, NULL); + r = mount_nofollow_verbose(LOG_ERR, "/run/systemd/volatile-sysroot", path, NULL, MS_MOVE, NULL); finish_umount: (void) umount_recursive("/run/systemd/volatile-sysroot", 0); @@ -80,7 +80,7 @@ static int make_overlay(const char *path) { if (r < 0) return log_error_errno(r, "Couldn't create overlay sysroot directory: %m"); - r = mount_verbose(LOG_ERR, "tmpfs", "/run/systemd/overlay-sysroot", "tmpfs", MS_STRICTATIME, "mode=755" TMPFS_LIMITS_ROOTFS); + r = mount_nofollow_verbose(LOG_ERR, "tmpfs", "/run/systemd/overlay-sysroot", "tmpfs", MS_STRICTATIME, "mode=755" TMPFS_LIMITS_ROOTFS); if (r < 0) goto finish; @@ -103,7 +103,7 @@ static int make_overlay(const char *path) { } options = strjoina("lowerdir=", escaped_path, ",upperdir=/run/systemd/overlay-sysroot/upper,workdir=/run/systemd/overlay-sysroot/work"); - r = mount_verbose(LOG_ERR, "overlay", path, "overlay", 0, options); + r = mount_nofollow_verbose(LOG_ERR, "overlay", path, "overlay", 0, options); finish: if (tmpfs_mounted) |