clearlinux/hyperstart
2
0
Fork 0
mirror of https://github.com/clearlinux/hyperstart.git synced 2026-09-04 04:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs needs nouuid mount option

Browse Source 
Otherwise devicemapper/rbd mount might fail due to device UUID
conflicts on snapshot/clone devices.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
This commit is contained in:
Peng Tao
2016-04-25 22:08:43 +08:00
parent 4f5b747c2b
commit 0c3b80fdbd
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
@@ -57,6 +57,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)
@@ -75,7 +76,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;
}
@@ -467,6 +471,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);
@@ -474,7 +479,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;
}