aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/kernel/kernel.go
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2017-07-17 13:55:55 +0200
committerDmitry Vyukov <dvyukov@google.com>2017-07-17 14:45:41 +0200
commit8382eb648fe51db07a0a20d413f61d4a46ab6131 (patch)
treede73078c4d77938026e9c5887419c6f9ddb7c108 /pkg/kernel/kernel.go
parent7cdb3c70f79c9c898630629402e10b8a1c6cf3ca (diff)
pkg/kernel: actually pass cmdline/sysctl files to the build script
Diffstat (limited to 'pkg/kernel/kernel.go')
-rw-r--r--pkg/kernel/kernel.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/kernel/kernel.go b/pkg/kernel/kernel.go
index 5b97715b4..2b2f99b7d 100644
--- a/pkg/kernel/kernel.go
+++ b/pkg/kernel/kernel.go
@@ -82,7 +82,12 @@ func CreateImage(kernelDir, userspaceDir, cmdlineFile, sysctlFile, image, sshkey
return fmt.Errorf("failed to write script file: %v", err)
}
bzImage := filepath.Join(kernelDir, filepath.FromSlash("arch/x86/boot/bzImage"))
- if _, err := osutil.RunCmd(time.Hour, tempDir, scriptFile, userspaceDir, bzImage); err != nil {
+ env := []string{
+ "SYZ_CMDLINE_FILE=" + osutil.Abs(cmdlineFile),
+ "SYZ_SYSCTL_FILE=" + osutil.Abs(sysctlFile),
+ }
+ _, err = osutil.RunCmdEnv(time.Hour, env, tempDir, scriptFile, userspaceDir, bzImage)
+ if err != nil {
return fmt.Errorf("image build failed: %v", err)
}
if err := osutil.CopyFile(filepath.Join(tempDir, "disk.raw"), image); err != nil {