34 lines
2 KiB
Diff
34 lines
2 KiB
Diff
|
diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb
|
||
|
|
*** ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb 2009-12-02 22:28:44.000000000 +0100
|
||
|
|
--- ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb 2010-01-22 16:16:13.000000000 +0100
|
||
|
|
***************
|
||
|
|
*** 80,86 ****
|
||
|
|
# piped via several processes. The tee is used to allow a
|
||
|
|
# digest of the file to be calculated without having to re-read
|
||
|
|
# it from disk.
|
||
|
|
! tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse
|
||
|
|
tar.add(File::basename( image_file ), File::dirname( image_file ))
|
||
|
|
openssl = EC2::Platform::Current::Constants::Utility::OPENSSL
|
||
|
|
pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug)
|
||
|
|
--- 80,86 ----
|
||
|
|
# piped via several processes. The tee is used to allow a
|
||
|
|
# digest of the file to be calculated without having to re-read
|
||
|
|
# it from disk.
|
||
|
|
! tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable
|
||
|
|
tar.add(File::basename( image_file ), File::dirname( image_file ))
|
||
|
|
openssl = EC2::Platform::Current::Constants::Utility::OPENSSL
|
||
|
|
pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug)
|
||
|
|
diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb
|
||
|
|
*** ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb 2009-12-02 22:28:44.000000000 +0100
|
||
|
|
--- ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb 2010-01-22 16:16:11.000000000 +0100
|
||
|
|
***************
|
||
|
|
*** 31,36 ****
|
||
|
|
--- 31,37 ----
|
||
|
|
def update; @options << '-u'; self; end
|
||
|
|
def sparse; @options << '-S'; self; end
|
||
|
|
def dereference; @options << '-h'; self; end
|
||
|
|
+ def writable; @options << '--mode=0755'; self; end
|
||
|
|
|
||
|
|
def archive(filename)
|
||
|
|
filename = '-' if filename.nil?
|