From fbe305cf4ea8ad4eb558bb5967fd2d1f42e8c77b Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago Date: Mon, 12 Sep 2016 12:07:35 -0500 Subject: [PATCH] Renamed floppy_contents to floppy_dirs as requested by rickard.von.essen@gmail.com --- common/floppy_config.go | 2 +- common/step_create_floppy.go | 6 +++--- common/step_create_floppy_test.go | 2 +- website/source/docs/builders/parallels-iso.html.md | 2 +- website/source/docs/builders/parallels-pvm.html.md | 2 +- website/source/docs/builders/qemu.html.md | 2 +- website/source/docs/builders/virtualbox-iso.html.md | 2 +- website/source/docs/builders/virtualbox-ovf.html.md | 2 +- website/source/docs/builders/vmware-iso.html.md | 2 +- website/source/docs/builders/vmware-vmx.html.md | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/floppy_config.go b/common/floppy_config.go index 3ba515e44..385026905 100644 --- a/common/floppy_config.go +++ b/common/floppy_config.go @@ -9,7 +9,7 @@ import ( type FloppyConfig struct { FloppyFiles []string `mapstructure:"floppy_files"` - FloppyContents []string `mapstructure:"floppy_contents"` + FloppyContents []string `mapstructure:"floppy_dirs"` } func (c *FloppyConfig) Prepare(ctx *interpolate.Context) []error { diff --git a/common/step_create_floppy.go b/common/step_create_floppy.go index 2564b3ae4..9850d6d28 100644 --- a/common/step_create_floppy.go +++ b/common/step_create_floppy.go @@ -165,7 +165,7 @@ func (s *StepCreateFloppy) Run(state multistep.StateBag) multistep.StepAction { ui.Message("Done copying files from floppy_files") // Collect all paths (expanding wildcards) into pathqueue - ui.Message("Collecting paths from floppy_contents") + ui.Message("Collecting paths from floppy_dirs") var pathqueue []string for _,filename := range s.Contents { if strings.IndexAny(filename, "*?[") >= 0 { @@ -182,7 +182,7 @@ func (s *StepCreateFloppy) Run(state multistep.StateBag) multistep.StepAction { } pathqueue = append(pathqueue, filename) } - ui.Message(fmt.Sprintf("Resulting paths from floppy_contents : %v", pathqueue)) + ui.Message(fmt.Sprintf("Resulting paths from floppy_dirs : %v", pathqueue)) // Go over each path in pathqueue and copy it. for _,src := range pathqueue { @@ -193,7 +193,7 @@ func (s *StepCreateFloppy) Run(state multistep.StateBag) multistep.StepAction { return multistep.ActionHalt } } - ui.Message("Done copying paths from floppy_contents") + ui.Message("Done copying paths from floppy_dirs") // Set the path to the floppy so it can be used later state.Put("floppy_path", s.floppyPath) diff --git a/common/step_create_floppy_test.go b/common/step_create_floppy_test.go index bfa7c52c3..678605bea 100644 --- a/common/step_create_floppy_test.go +++ b/common/step_create_floppy_test.go @@ -294,7 +294,7 @@ func TestStepCreateFloppyContents(t *testing.T) { for _,c := range test.contents { step.Contents = append(step.Contents, filepath.Join(dir,filepath.FromSlash(c))) } - log.Println(fmt.Sprintf("Trying against floppy_contents : %v",step.Contents)) + log.Println(fmt.Sprintf("Trying against floppy_dirs : %v",step.Contents)) // run the step if action := step.Run(state); action != multistep.ActionContinue { diff --git a/website/source/docs/builders/parallels-iso.html.md b/website/source/docs/builders/parallels-iso.html.md index a93a7951d..0cd8ae422 100644 --- a/website/source/docs/builders/parallels-iso.html.md +++ b/website/source/docs/builders/parallels-iso.html.md @@ -115,7 +115,7 @@ builder. and \[\]) are allowed. Directory names are also allowed, which will add all the files found in the directory to the floppy. -- `floppy_contents` (array of strings) - A list of directories to place onto +- `floppy_dirs` (array of strings) - A list of directories to place onto the floppy disk recursively. This is similar to the `floppy_files` option except that the directory structure is preserved. This is useful for when your floppy disk includes drivers or if you just want to organize it's diff --git a/website/source/docs/builders/parallels-pvm.html.md b/website/source/docs/builders/parallels-pvm.html.md index 3eceed805..68971b168 100644 --- a/website/source/docs/builders/parallels-pvm.html.md +++ b/website/source/docs/builders/parallels-pvm.html.md @@ -86,7 +86,7 @@ builder. listed in this configuration will all be put into the root directory of the floppy disk; sub-directories are not supported. -- `floppy_contents` (array of strings) - A list of directories to place onto +- `floppy_dirs` (array of strings) - A list of directories to place onto the floppy disk recursively. This is similar to the `floppy_files` option except that the directory structure is preserved. This is useful for when your floppy disk includes drivers or if you just want to organize it's diff --git a/website/source/docs/builders/qemu.html.md b/website/source/docs/builders/qemu.html.md index e9da535bb..000c4a763 100644 --- a/website/source/docs/builders/qemu.html.md +++ b/website/source/docs/builders/qemu.html.md @@ -164,7 +164,7 @@ Linux server and have not enabled X11 forwarding (`ssh -X`). and \[\]) are allowed. Directory names are also allowed, which will add all the files found in the directory to the floppy. -- `floppy_contents` (array of strings) - A list of directories to place onto +- `floppy_dirs` (array of strings) - A list of directories to place onto the floppy disk recursively. This is similar to the `floppy_files` option except that the directory structure is preserved. This is useful for when your floppy disk includes drivers or if you just want to organize it's diff --git a/website/source/docs/builders/virtualbox-iso.html.md b/website/source/docs/builders/virtualbox-iso.html.md index 96e928c9d..94928f918 100644 --- a/website/source/docs/builders/virtualbox-iso.html.md +++ b/website/source/docs/builders/virtualbox-iso.html.md @@ -150,7 +150,7 @@ builder. and \[\]) are allowed. Directory names are also allowed, which will add all the files found in the directory to the floppy. -- `floppy_contents` (array of strings) - A list of directories to place onto +- `floppy_dirs` (array of strings) - A list of directories to place onto the floppy disk recursively. This is similar to the `floppy_files` option except that the directory structure is preserved. This is useful for when your floppy disk includes drivers or if you just want to organize it's diff --git a/website/source/docs/builders/virtualbox-ovf.html.md b/website/source/docs/builders/virtualbox-ovf.html.md index 11b861c6d..277ba9731 100644 --- a/website/source/docs/builders/virtualbox-ovf.html.md +++ b/website/source/docs/builders/virtualbox-ovf.html.md @@ -132,7 +132,7 @@ builder. and \[\]) are allowed. Directory names are also allowed, which will add all the files found in the directory to the floppy. -- `floppy_contents` (array of strings) - A list of directories to place onto +- `floppy_dirs` (array of strings) - A list of directories to place onto the floppy disk recursively. This is similar to the `floppy_files` option except that the directory structure is preserved. This is useful for when your floppy disk includes drivers or if you just want to organize it's diff --git a/website/source/docs/builders/vmware-iso.html.md b/website/source/docs/builders/vmware-iso.html.md index 8588b2a58..690c0c125 100644 --- a/website/source/docs/builders/vmware-iso.html.md +++ b/website/source/docs/builders/vmware-iso.html.md @@ -125,7 +125,7 @@ builder. and \[\]) are allowed. Directory names are also allowed, which will add all the files found in the directory to the floppy. -- `floppy_contents` (array of strings) - A list of directories to place onto +- `floppy_dirs` (array of strings) - A list of directories to place onto the floppy disk recursively. This is similar to the `floppy_files` option except that the directory structure is preserved. This is useful for when your floppy disk includes drivers or if you just want to organize it's diff --git a/website/source/docs/builders/vmware-vmx.html.md b/website/source/docs/builders/vmware-vmx.html.md index bbfed97b5..05e8e4714 100644 --- a/website/source/docs/builders/vmware-vmx.html.md +++ b/website/source/docs/builders/vmware-vmx.html.md @@ -83,7 +83,7 @@ builder. and \[\]) are allowed. Directory names are also allowed, which will add all the files found in the directory to the floppy. -- `floppy_contents` (array of strings) - A list of directories to place onto +- `floppy_dirs` (array of strings) - A list of directories to place onto the floppy disk recursively. This is similar to the `floppy_files` option except that the directory structure is preserved. This is useful for when your floppy disk includes drivers or if you just want to organize it's