Browse Source

Merge pull request #18 from TheBlueMatt/master

Fix gverify in Ruby 1.9 and use writeback cache in kvm
pull/20/head
Dev Random 10 years ago
parent
commit
16993e2c41
  1. 6
      bin/gverify
  2. 2
      libexec/start-target

6
bin/gverify

@ -91,7 +91,7 @@ Dir.foreach(release_path) do |signer_dir| @@ -91,7 +91,7 @@ Dir.foreach(release_path) do |signer_dir|
system("gpg --keyserver pgp.mit.edu --recv-keys `gpg --quiet --batch --verify \"#{File.join(signer_path, 'signature.pgp')}\" \"#{result_path}\" 2>&1 | head -n1 | grep \"key ID\" | awk '{ print $15 }'` > /dev/null 2>&1")
out = `gpg --quiet --batch --verify \"#{sig_path}\" \"#{result_path}\" 2>&1`
if $? != 0
out.each do |line|
out.each_line do |line|
if line =~ /^gpg: Signature made/
info(line)
else
@ -101,7 +101,7 @@ Dir.foreach(release_path) do |signer_dir| @@ -101,7 +101,7 @@ Dir.foreach(release_path) do |signer_dir|
puts "#{signer_dir}: BAD SIGNATURE"
did_fail = true
elsif current_manifest and (result['out_manifest'] != current_manifest or result['release'] != release or result['name'] != package_name)
out.each do |line|
out.each_line do |line|
if line =~ /^gpg: Signature made/
info(line)
elsif line =~ /^gpg: Good signature/
@ -115,7 +115,7 @@ Dir.foreach(release_path) do |signer_dir| @@ -115,7 +115,7 @@ Dir.foreach(release_path) do |signer_dir|
puts "#{signer_dir}: MISMATCH"
did_fail = true
else
out.each do |line|
out.each_line do |line|
if line =~ /^gpg: Signature made/
info(line)
elsif line =~ /^gpg: Good signature/

2
libexec/start-target

@ -6,7 +6,7 @@ ARCH=qemu$1 @@ -6,7 +6,7 @@ ARCH=qemu$1
SUFFIX=$2
if [ -z "$USE_LXC" ]; then
kvm -cpu $ARCH -m ${VMEM:-2000} -smp ${NPROCS:-2} -drive file=target-$SUFFIX.qcow2 -net nic,model=virtio -net user,hostfwd=tcp:127.0.0.1:$VM_SSH_PORT-:22 -vnc 127.0.0.1:16 > var/target.log 2>&1 &
kvm -cpu $ARCH -m ${VMEM:-2000} -smp ${NPROCS:-2} -drive file=target-$SUFFIX.qcow2,cache=writeback -net nic,model=virtio -net user,hostfwd=tcp:127.0.0.1:$VM_SSH_PORT-:22 -vnc 127.0.0.1:16 > var/target.log 2>&1 &
echo $! > var/target.pid
wait
rm var/target.pid

Loading…
Cancel
Save