proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 09:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1184 from brauner/2016-09-13/zfs_fixes

Browse Source 
lxczfs: small fixes
This commit is contained in:
Stéphane Graber 2016-09-13 12:23:44 -04:00 committed by GitHub
commit f8650a7a2b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/bdev/lxczfs.c
View File

@ -26,6 +26,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include <sys/mount.h> #include <sys/mount.h>
#include "bdev.h" #include "bdev.h"
@ -170,6 +171,9 @@ int zfs_clone(const char *opath, const char *npath, const char *oname,
if ((pid = fork()) < 0) if ((pid = fork()) < 0)
return -1; return -1;
if (!pid) { if (!pid) {
int dev0 = open("/dev/null", O_WRONLY);
if (dev0 >= 0)
dup2(dev0, STDERR_FILENO);
execlp("zfs", "zfs", "destroy", path1, (char *)NULL); execlp("zfs", "zfs", "destroy", path1, (char *)NULL);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -252,7 +256,7 @@ int zfs_destroy(struct bdev *orig)
return -1; return -1;
*p = '\0'; *p = '\0';
execlp("zfs", "zfs", "destroy", output, (char *)NULL); execlp("zfs", "zfs", "destroy", "-r", output, (char *)NULL);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }