pool/hyper-v
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 229699 from Virtualization

Browse Source 
- Handle the case when the target file exists correctly in hv_fcopy_daemon
- vssdaemon: Ignore VFAT mounts during the Freeze operation

OBS-URL: https://build.opensuse.org/request/show/229699
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hyper-v?expand=0&rev=21
This commit is contained in:
Stephan Kulow 2014-04-14 04:43:20 +00:00 committed by Git OBS Bridge
commit 5abe1e1d8e
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hyper-v.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 10 19:19:04 CEST 2014 - ohering@suse.de
- Handle the case when the target file exists correctly in hv_fcopy_daemon
- vssdaemon: Ignore VFAT mounts during the Freeze operation
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Mar 2 18:11:31 CET 2014 - ohering@suse.de Sun Mar 2 18:11:31 CET 2014 - ohering@suse.de

1
hyper-v.include.linux.hyperv.h
View File

@ -300,6 +300,7 @@ enum hv_kvp_exchg_pool {
#define HV_ERROR_DEVICE_NOT_CONNECTED 0x8007048F #define HV_ERROR_DEVICE_NOT_CONNECTED 0x8007048F
#define HV_INVALIDARG 0x80070057 #define HV_INVALIDARG 0x80070057
#define HV_GUID_NOTFOUND 0x80041002 #define HV_GUID_NOTFOUND 0x80041002
#define HV_ERROR_ALREADY_EXISTS 0x80070050
#define ADDR_FAMILY_NONE 0x00 #define ADDR_FAMILY_NONE 0x00
#define ADDR_FAMILY_IPV4 0x01 #define ADDR_FAMILY_IPV4 0x01

4
hyper-v.tools.hv.hv_fcopy_daemon.c
View File

@ -82,8 +82,10 @@ static int hv_start_fcopy(struct hv_start_fcopy *smsg)
if (!access(target_fname, F_OK)) { if (!access(target_fname, F_OK)) {
syslog(LOG_INFO, "File: %s exists", target_fname); syslog(LOG_INFO, "File: %s exists", target_fname);
if (!smsg->copy_flags & OVER_WRITE) if (!(smsg->copy_flags & OVER_WRITE)) {
error = HV_ERROR_ALREADY_EXISTS;
goto done; goto done;
}
} }
target_fd = open(target_fname, O_RDWR | O_CREAT | O_CLOEXEC, 0744); target_fd = open(target_fname, O_RDWR | O_CREAT | O_CLOEXEC, 0744);

2
hyper-v.tools.hv.hv_vss_daemon.c
View File

@ -88,6 +88,8 @@ static int vss_operate(int operation)
continue; continue;
if (strcmp(ent->mnt_type, "iso9660") == 0) if (strcmp(ent->mnt_type, "iso9660") == 0)
continue; continue;
if (strcmp(ent->mnt_type, "vfat") == 0)
continue;
if (strcmp(ent->mnt_dir, "/") == 0) { if (strcmp(ent->mnt_dir, "/") == 0) {
root_seen = 1; root_seen = 1;
continue; continue;