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>
openzfsonwindows · Dec 13, 2023 · 00d3696 · 00d3696
1 parent f597e69
commit 00d3696
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/contrib/windows/Inno.Setup/ZFSInstall-debug.iss b/contrib/windows/Inno.Setup/ZFSInstall-debug.iss
@@ -107,6 +107,7 @@ Source: "{#Root}\out\build\x64-Debug\cmd\os\windows\zfsinstaller\*.pdb"; DestDir
 Source: "{#Root}\out\build\x64-Debug\cmd\os\windows\kstat\*.pdb"; DestDir: "{app}\symbols"; Flags: ignoreversion
 Source: "{#SourcePath}\HowToDebug.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#Root}\contrib\windows\parsedump\*.*"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#Root}\scripts\zfs_prepare_disk"; DestDir: "{app}"; Flags: ignoreversion
 
 
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files

diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
@@ -911,7 +911,7 @@ static int
 libzfs_run_process_impl(const char *path, char *argv[], char *env[], int flags,
     char **lines[], int *lines_cnt)
 {
-	return (-1);
+	return (0);
 }
 
 #else