clearlinux/hyperstart
2
0
Fork 0
mirror of https://github.com/clearlinux/hyperstart.git synced 2026-09-03 20:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #83 from bergwolf/xfs

Browse Source 
xfs needs nouuid mount option
This commit is contained in:
Gao feng
2016-04-25 21:09:35 -05:00
parent 99319c29a6 0c3b80fdbd
commit ad196e2fe3
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/container.c
+10 -2
View File
@@ -58,6 +58,7 @@ static int container_setup_volume(struct hyper_container *container)
for (i = 0; i < container->vols_num; i++) {
char volume[512];
char mountpoint[512];
char *options = NULL;
vol = &container->vols[i];
if (vol->scsiaddr)
@@ -76,7 +77,10 @@ static int container_setup_volume(struct hyper_container *container)
return -1;
}
if (mount(dev, path, vol->fstype, 0, NULL) < 0) {
if (!strncmp(vol->fstype, "xfs", strlen("xfs")))
options = "nouuid";
if (mount(dev, path, vol->fstype, 0, options) < 0) {
perror("mount volume device faled");
return -1;
}
@@ -516,6 +520,7 @@ static int hyper_container_init(void *data)
if (container->fstype) {
char dev[128];
char *options = NULL;
if (container->scsiaddr)
hyper_find_sd(container->scsiaddr, &container->image);
@@ -523,7 +528,10 @@ static int hyper_container_init(void *data)
sprintf(dev, "/dev/%s", container->image);
fprintf(stdout, "device %s\n", dev);
if (mount(dev, root, container->fstype, 0, NULL) < 0) {
if (!strncmp(container->fstype, "xfs", strlen("xfs")))
options = "nouuid";
if (mount(dev, root, container->fstype, 0, options) < 0) {
perror("mount device failed");
goto fail;
}