iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1930 from bhourigan/issue1929 

Prepending -i to sudo so PATH is inherited from profile.d scripts
This commit is contained in:
Mitchell Hashimoto 2015-05-28 09:36:58 -07:00
parent 68bde0ba56 a4cfd921f4
commit 8cac7e8d51
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/amazon/instance/builder.go
View File

@ -73,7 +73,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
} }
if b.config.BundleUploadCommand == "" { if b.config.BundleUploadCommand == "" {
b.config.BundleUploadCommand = "sudo -n ec2-upload-bundle " + b.config.BundleUploadCommand = "sudo -i -n ec2-upload-bundle " +
"-b {{.BucketName}} " + "-b {{.BucketName}} " +
"-m {{.ManifestPath}} " + "-m {{.ManifestPath}} " +
"-a {{.AccessKey}} " + "-a {{.AccessKey}} " +
@ -85,7 +85,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
} }
if b.config.BundleVolCommand == "" { if b.config.BundleVolCommand == "" {
b.config.BundleVolCommand = "sudo -n ec2-bundle-vol " + b.config.BundleVolCommand = "sudo -i -n ec2-bundle-vol " +
"-k {{.KeyPath}} " + "-k {{.KeyPath}} " +
"-u {{.AccountId}} " + "-u {{.AccountId}} " +
"-c {{.CertPath}} " + "-c {{.CertPath}} " +

4
website/source/docs/builders/amazon-instance.html.markdown
View File

@ -270,7 +270,7 @@ is responsible for executing `ec2-bundle-vol` in order to store and image
of the root filesystem to use to create the AMI. of the root filesystem to use to create the AMI.
```text ```text
sudo -n ec2-bundle-vol \ sudo -i -n ec2-bundle-vol \
-k {{.KeyPath}} \ -k {{.KeyPath}} \
-u {{.AccountId}} \ -u {{.AccountId}} \
-c {{.CertPath}} \ -c {{.CertPath}} \
@ -297,7 +297,7 @@ across multiple lines for convenience of reading. The bundle upload command
is responsible for taking the bundled volume and uploading it to S3. is responsible for taking the bundled volume and uploading it to S3.
```text ```text
sudo -n ec2-upload-bundle \ sudo -i -n ec2-upload-bundle \
-b {{.BucketName}} \ -b {{.BucketName}} \
-m {{.ManifestPath}} \ -m {{.ManifestPath}} \
-a {{.AccessKey}} \ -a {{.AccessKey}} \