packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
William Manley 2016-08-31 17:07:17 +01:00 committed by Atomic Bot
parent 598e3240ff
commit 5424404813
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/switchroot/ostree-prepare-root.c
View File

@ -174,17 +174,19 @@ pivot_root(const char * new_root, const char * put_old)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
const char *root_mountpoint = NULL; const char *root_mountpoint = NULL, *root_arg = NULL;
char *deploy_path = NULL; char *deploy_path = NULL;
char srcpath[PATH_MAX]; char srcpath[PATH_MAX];
struct stat stbuf; struct stat stbuf;
if (argc < 2) if (argc < 2)
root_mountpoint = "/"; root_arg = "/";
else 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); deploy_path = resolve_deploy_path (root_mountpoint);
/* Work-around for a kernel bug: for some reason the kernel /* Work-around for a kernel bug: for some reason the kernel