From 5424404813a3f9ca65d1d9e7a4b2efbaebef71cf Mon Sep 17 00:00:00 2001 From: William Manley Date: Wed, 31 Aug 2016 17:07:17 +0100 Subject: [PATCH] ostree-prepare-root: Error if realpath fails I've seen it fail with musl which needs `/proc` to be mounted for it to work. The error messages we're rather confusing before. At least this now points to the right location. Closes: #485 Approved by: cgwalters --- src/switchroot/ostree-prepare-root.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c index d866f88e..ea7333b5 100644 --- a/src/switchroot/ostree-prepare-root.c +++ b/src/switchroot/ostree-prepare-root.c @@ -174,17 +174,19 @@ pivot_root(const char * new_root, const char * put_old) int main(int argc, char *argv[]) { - const char *root_mountpoint = NULL; + const char *root_mountpoint = NULL, *root_arg = NULL; char *deploy_path = NULL; char srcpath[PATH_MAX]; struct stat stbuf; if (argc < 2) - root_mountpoint = "/"; + root_arg = "/"; else - root_mountpoint = argv[1]; + root_arg = argv[1]; - root_mountpoint = realpath (root_mountpoint, NULL); + root_mountpoint = realpath (root_arg, NULL); + if (root_mountpoint == NULL) + err (EXIT_FAILURE, "realpath(\"%s\")", root_arg); deploy_path = resolve_deploy_path (root_mountpoint); /* Work-around for a kernel bug: for some reason the kernel