Merge pull request #295 from jeromegn/fix-initrd

kzys · web-flow · commit fc167ff03d53 · 2020-12-14T11:01:14.000-08:00
Fix InitrdPath usage
diff --git a/handlers.go b/handlers.go
@@ -63,7 +63,7 @@ var JailerConfigValidationHandler = Handler{
 			return nil
 		}
 
-		hasRoot := false
+		hasRoot := m.Cfg.InitrdPath != ""
 		for _, drive := range m.Cfg.Drives {
 			if BoolValue(drive.IsRootDevice) {
 				hasRoot = true
diff --git a/jailer.go b/jailer.go
@@ -373,7 +373,7 @@ func LinkFilesHandler(kernelImageFileName string) Handler {
 
 			initrdFilename := ""
 			if m.Cfg.InitrdPath != "" {
-				initrdFilename := filepath.Base(m.Cfg.InitrdPath)
+				initrdFilename = filepath.Base(m.Cfg.InitrdPath)
 				// copy initrd to root fs
 				if err := os.Link(
 					m.Cfg.InitrdPath,

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ var JailerConfigValidationHandler = Handler{`
`63`	`63`	`return nil`
`64`	`64`	`}`
`65`	`65`
`66`		`- hasRoot := false`
	`66`	`+ hasRoot := m.Cfg.InitrdPath != ""`
`67`	`67`	`for _, drive := range m.Cfg.Drives {`
`68`	`68`	`if BoolValue(drive.IsRootDevice) {`
`69`	`69`	`hasRoot = true`