Skip to content

Commit 92ff78e

Browse files
committed
Windows: ship zfs_prepare_disk script
Even though it will not work until we have a working implementation of libzfs_run_process_impl() Signed-off-by: Jorgen Lundman <lundman@lundman.net>
1 parent 5d5cacf commit 92ff78e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

contrib/windows/Inno.Setup/ZFSInstall-debug.iss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ Source: "{#Root}\out\build\x64-Debug\cmd\os\windows\zfsinstaller\*.pdb"; DestDir
107107
Source: "{#Root}\out\build\x64-Debug\cmd\os\windows\kstat\*.pdb"; DestDir: "{app}\symbols"; Flags: ignoreversion
108108
Source: "{#SourcePath}\HowToDebug.txt"; DestDir: "{app}"; Flags: ignoreversion
109109
Source: "{#Root}\contrib\windows\parsedump\*.*"; DestDir: "{app}"; Flags: ignoreversion
110+
Source: "{#Root}\scripts\zfs_prepare_disk"; DestDir: "{app}"; Flags: ignoreversion
110111

111112

112113
; NOTE: Don't use "Flags: ignoreversion" on any shared system files

lib/libzfs/libzfs_util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ static int
911911
libzfs_run_process_impl(const char *path, char *argv[], char *env[], int flags,
912912
char **lines[], int *lines_cnt)
913913
{
914-
return (-1);
914+
return (0);
915915
}
916916

917917
#else

0 commit comments

Comments
 (0)