From 653fc6a125e789692d8f8cd47ca4b1a124766a61 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 13 Sep 2019 02:37:01 -0400 Subject: [PATCH] prepare-root: remember to remove /sysroot.tmp Without this, rerunning ostree-prepare-root will fail in mkdir() because /sysroot.tmp already exists, which complicates debugging from the dracut emergency shell. Closes: #1919 Approved by: cgwalters --- src/switchroot/ostree-prepare-root.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c index 3d6e7833..33c46ff4 100644 --- a/src/switchroot/ostree-prepare-root.c +++ b/src/switchroot/ostree-prepare-root.c @@ -273,6 +273,9 @@ main(int argc, char *argv[]) if (mount (".", root_mountpoint, NULL, MS_MOVE, NULL) < 0) err (EXIT_FAILURE, "failed to MS_MOVE %s to %s", deploy_path, root_mountpoint); + + if (rmdir ("/sysroot.tmp") < 0) + err (EXIT_FAILURE, "couldn't remove temporary sysroot /sysroot.tmp"); } /* The /sysroot mount needs to be private to avoid having a mount for e.g. /var/cache