builder: debian: Remove bogus proxy from apt configuration.

Thanks: Daniel Miranda
libguestfs · Nov 11, 2013 · 4b2e9c9 · 4b2e9c9
1 parent 50aca44
commit 4b2e9c9
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 47 deletions.
diff --git a/builder/website/debian-6.xz.sig b/builder/website/debian-6.xz.sig
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
-iQIcBAABAgAGBQJSWY5TAAoJEJFzj3Pht2igCvMQAMVm82+6OLoQjWZ5MA14KFfF
-I7/uJ5PRGDPoI+IjvSaVN3v7ZZxFSRbTdV51GaBjryxRGCVqpVF5b2sAgaFCzhSZ
-DMuVNHUSH6Tjo/IER0B1/GCvTQYu0O/xgZHY5V3JeXDhXb+99PMFUKT5OD9RQD9E
-ln41vI5wmFBxJuJKWBnQc8XI22FNFJN/yK4ZPbtd7fNSihWEmH95DNBsYlaAmYP1
-ZYH4FeOIm0wXMiqF1GnLDduwFmQgNepGwaBAGJ3TYLhwRzgCfQxX3VW7/uHr+V9M
-7P1SoBIzXztLvw2fS3ZY5/R7LIfTjEWDUkol7lTr+cqiqy6/hAPiOTDEVGP3DBzJ
-OhjspK5gvscrXMGKj9P9O5sKJvbrxGFmAzwIhpwMc3WnimwOCGzCsKGMe6Ve6eqr
-TKxpehsEacgNiBDpb7BSHNCJ6JcNwJKPzXTBRn85a3dr56K5olGbywZKRbzp8h1U
-vVDBc1h7MP0xWTkIsriNHhNThAgGhsQc0ONCIGEX6ISXvSC97GHjB8kFP1ajpHJl
-M0umRIHEneTIP0R+fIrbEAZyjr1SQW9o+vk2q2QK8GMhvGAHlEF3ubIisu1/OILU
-C3GfuqqVU6dLQSzzuiD0Edl/kc+UJGaYHShhiRR/E9z9TnW1KnTcHG9dvY2CscfB
-T+vKXH6tyXSsguuD1HiG
-=ulbl
+iQIcBAABAgAGBQJSgNPNAAoJEJFzj3Pht2igb1MP/2sQeJEznpBguE5bbs+ulGyW
+Aa6jHgM+sG90OF0J9YlDZcYWYKiuVt+kdPOCw9WPg/e5AglKOu6FiMdFA/R9uP9i
+ga49So8xYQwaGS6GitHT6dI/kDNLSvTny0nNvAtut62mEJ5D5m9xxtXgYrttUByk
+DGQNUJizj8KehUbu9G+sVDM4ojyEbQlSWqi+SRK8uSFwINXXMwwimjZsq/BddcC6
+5DplyxS4o9EkbJP/QJKjkfyuhyBzMdIbVstPNFefqPn/xRX7h8VZOyVxr5dw0gYd
+PUU5aXeNJFiYR+LvJ2dLxjbcMEmFT+zhUOcxFWwZnjSYaRDdz47AeGfMLzEoFN4K
+/fYmtlusjLn9TDNsQ85ffXTETQU8CrhAfUvFmSPU1XuyY/G0UfK6LQehhg5tmHVL
+sfOBTKm/lOj+DG4CS0uAjY7JhLEn9K88kKgXhRGIcKt8UjgsPLvTq9sI87OlbcEe
+e4++ALWkXpfXF3Nf7mFXNwhQQSiiG9NIATsbfxSS9C7b0Y3HGWOy6pp4TyN8SIEi
+RNyWq93iOOtg91kuoRdScEn0crNninok7BmNt2MJry3Cujet+wBpBXYxuVdvRTPO
+6kBdl48bxvRb6hcwLqVjeWw8FM6sBGaA8mnTzshHu8nk6hl+tNwfk0loFwyO2M18
+bx0DKFFg024W/hfFqKkt
+=9ZnB
 -----END PGP SIGNATURE-----
diff --git a/builder/website/debian-7.xz.sig b/builder/website/debian-7.xz.sig
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
-iQIcBAABAgAGBQJSTbVGAAoJEJFzj3Pht2igBfsP/2EdkKhGLoFW8SxHv8rbxYtS
-VlbC5OaLhSosCerrZnna1qeKuR4i1CoDT08WfYRD5JQ4WnsaeckRWANcl9VKU1rL
-Efc1RCis815b4YbsA/acmc9pT7XxduF0GiV/NYWsFnZj+K/NI7UrgX0aolC21ZvZ
-uVnJ1Be5GICa0CXgNfwkFHb2gCBIaPhasxGaFuAspzWyQ8fVsfiDTxuO2jtJJJc/
-l00oZ0JMW0f30ux9K9PXF0rdIEX7h13RxZVLcw55Nfl389gQK5yVmyCLvcmsSZ6a
-K9O1ffPenRD5E1kpAy1xwDUz+7uUyqa5hXyxjB7qaCwIUGvF3FBIuePmK0XXPkh0
-NF73sb3DXKTJgT1t2LmKg4QprX/8b97ZfrMIpu5KRF7WnxqdGeaNK87lnZQFMxRW
-kgCXzdJ9qfilOMcAkj6omHw6Fj7NXwS8+t6fNZwCsLx6uHKRx2lllG6yxbkoT/VS
-Gs2CSHVOZ94ByaiIUTzOzonwcjy0e7eqLzqIJETcuCedLNKoNW2mpwA23dae8U9q
-x2r9l/C6z27Ofn23wJrbWM/hwrofH249N+nxALqwb3joPxtdsMFVE+GW8GF0dBl8
-KJAIponJ2FWssiL2YsDk8EfvgsQKQVWuPOMCmczl+CVpPr+sslpO0RabGOIvjyOO
-4B5d0Kq92X8Rlx7KAln8
-=DdNg
+iQIcBAABAgAGBQJSgN0FAAoJEJFzj3Pht2igfCAP/RUpnWQd1XjLKyyZjJSLMyPb
+oFF5JmQbFLF906L3wj/kuqyVf+VEdPXBSYTCw/5qvcAoNW/4DxtooSztK0P6j8TX
+Ez1g/Hamp0brIdBaFaerTMFSMtrHsIfBjSRCZJy2WCmlJH/piefPdRS06GXqLcDO
+WwLN5RZ2R5bWsSkS7DU4V/QODX35jFKV5xMwmX622jitDDWyStLESmyzF8E9MwKh
+QbRSguMilpszac9+GcaN05UTv4htarcsy5EkHBxZzjrS5srxlBQl5ygt0ZIj9GBh
+UUvfrIXnCZz7WhsBrbB72VhyXFnZj6gsPJsxRdvDg0nH9ORbmsnUo+Q3AJm6h8Vg
+UlOPMn05eToeDHF7U5Ki1w5G39TovUTLDJ43jTLHEy/im4zIIRSJgKaD8a4xLhib
+6wLWV9LHYQXHesoIqpfb5ife4KEFi5OVlioZ4REK0auKVVOA0y0eQnjDGJ0szBpp
+2xx+c+v2q5rn5X3S79lugAC0TpNxbM3X7rtli+kwa5l9Y7f5Z0XZJ7iuywoPs/VN
+5WxfG6vc0yfCMs8gpLL1TDVWZW6baoALTUkWj3ePn5od4KL/V9RXTnWhjaDQ+XbX
+/DEHwg7E+ICMPiZSqkeqfSAmbc+8Njdf77sEFCZF+ZV046BlHy+aFvxAY6rmrQTZ
++d6Z2oiZ3UZ5R8iOqiDB
+=HZIe
 -----END PGP SIGNATURE-----
diff --git a/builder/website/debian.sh b/builder/website/debian.sh
@@ -68,4 +68,10 @@ virt-install \
     --nographics \
     --noreboot
 
+# Remove apt proxy configuration (thanks: Daniel Miranda).
+guestfish -a $output -i <<EOF
+  rm /etc/apt/apt.conf
+  touch /etc/apt/apt.conf
+EOF
+
 source $(dirname "$0")/compress.sh $output
diff --git a/builder/website/index b/builder/website/index
@@ -25,11 +25,12 @@ notes=CentOS 6.4
 name=Debian 6 (Squeeze)
 osinfo=debian6
 file=debian-6.xz
+revision=2
 sig=debian-6.xz.sig
-checksum=1baff51aae7cb89d96c5a95bcd18f3f9ce04945366802107a4ed3b5bd3f9c1fa77af8aa9716cea2826211ef03855a3f02dfa2097daeae66d4ec20a348c820354
+checksum=bff9c28da0375fde65fa238d7a2ea644cbfad0ea3246783a2f44a98f2374850987679c3f1032a632d3c6238de8d9e43291d07a82efc1e824945000e206b9f6cc
 format=raw
 size=4294967296
-compressed_size=141531780
+compressed_size=139615908
 expand=/dev/sda1
 notes=Debian 6 (Squeeze).
 
@@ -56,11 +57,12 @@ notes=Debian 6 (Squeeze).
 name=Debian 7 (Wheezy)
 osinfo=debian7
 file=debian-7.xz
+revision=2
 sig=debian-7.xz.sig
-checksum=1c36eb94401acc567a1c542e4eafde2ba15dab6b615eb5a5bf4e18895c30d825e2e57c6d3a62f998dfc232f3747d5c92d2c5a497ac5d62d73426da5bf80652a5
+checksum=c980a7d878c086b14619b3b9f644ab131c1f88b87729062f2832de12a938ba9e5a511c49402a9d02b740a30876f51889d20e7d0ed4997755f542650b8485f013
 format=raw
 size=4294967296
-compressed_size=149230076
+compressed_size=150734028
 expand=/dev/sda1
 notes=Debian 7 (Wheezy).
 

diff --git a/builder/website/index.asc b/builder/website/index.asc
@@ -28,11 +28,12 @@ notes=CentOS 6.4
 name=Debian 6 (Squeeze)
 osinfo=debian6
 file=debian-6.xz
+revision=2
 sig=debian-6.xz.sig
-checksum=1baff51aae7cb89d96c5a95bcd18f3f9ce04945366802107a4ed3b5bd3f9c1fa77af8aa9716cea2826211ef03855a3f02dfa2097daeae66d4ec20a348c820354
+checksum=bff9c28da0375fde65fa238d7a2ea644cbfad0ea3246783a2f44a98f2374850987679c3f1032a632d3c6238de8d9e43291d07a82efc1e824945000e206b9f6cc
 format=raw
 size=4294967296
-compressed_size=141531780
+compressed_size=139615908
 expand=/dev/sda1
 notes=Debian 6 (Squeeze).
 
@@ -59,11 +60,12 @@ notes=Debian 6 (Squeeze).
 name=Debian 7 (Wheezy)
 osinfo=debian7
 file=debian-7.xz
+revision=2
 sig=debian-7.xz.sig
-checksum=1c36eb94401acc567a1c542e4eafde2ba15dab6b615eb5a5bf4e18895c30d825e2e57c6d3a62f998dfc232f3747d5c92d2c5a497ac5d62d73426da5bf80652a5
+checksum=c980a7d878c086b14619b3b9f644ab131c1f88b87729062f2832de12a938ba9e5a511c49402a9d02b740a30876f51889d20e7d0ed4997755f542650b8485f013
 format=raw
 size=4294967296
-compressed_size=149230076
+compressed_size=150734028
 expand=/dev/sda1
 notes=Debian 7 (Wheezy).
 
@@ -230,17 +232,17 @@ notes=Ubuntu 13.10 (Saucy).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
-iQIcBAEBAgAGBQJSercAAAoJEJFzj3Pht2iga84P/jrGGlxOdZzvxt6EJt4LEf7i
-KdyW+/OdktT+zxTwioOjjyiL8Y0vVwOvX+G4M6bD6RgD0RU9p3NE3xwyFUepUu9N
-0J0xGsPchGecr5gKCntgUdgLbqqJC3401yBo80Z8cMwk3rZS++9uRGGQ/Yq4hjCb
-i7lLIEfXmW5tVN2p9BHkNk2k7nE1ChgRxEOkVCqR3nfnz+gV6HksSAfU1HiExtwL
-nYuj5NmZ9jShMCUmvf+S5EEmZ5Oaxo49KsNwhiJAgyNuTogfXcWzh9o0d7irAE+k
-gMEI6BI2nq/A1ie8B/D1Oe3aXUcll/zfeUJ7BxjqbSwWnltedXvs8RCeq1dGLgb9
-iiO3XBWJlHiBMQtDokbDgi1J53vFwUF8o/dH21XUWmlFAHAAFtr51xHZrgXSK7IR
-Y1ItK5sE0A0WcjOee6AwR0XMNwHnB7pstuzXiFVdS0Xt7gk1nUjtUgFkO9YPXdLY
-eNxUboeCQfO+Z6dG/tmfoLxG8JXYn7uiDK27hHwPnlMIXQjpEJnbWY7gfDpiU/Tq
-ndsJr0Bx+WpFWE8WbeVzvStkrFEv8s8ARYCdVRj2iz5z61lO/DVAW6S84DOMuVYs
-E3YV/S9zMxbTuy72eT1g3mhPJ9vvXjaydWRTvsFLF7fOHl/PhZbBV57QitZGamQH
-uJ7EIyCY1v9s2ov3XWDM
-=Y4xk
+iQIcBAEBAgAGBQJSgNjAAAoJEJFzj3Pht2igfcsQALG+Q+Fd9c/f7TkHF1NhNRcg
+zJiDV4x7vtOISy3UMbUn7pSw7p4b3mB3wRhbTD0gDKESZL5dq7D6C5SrHUUorQ2c
+RxzwXvLT8CJ6W8Akucixb5sKMi4TJw83XSbPA6/j99EHSZ7RPCFXJlFC67Soqejz
+h6l8NyiACBOv6KedR3b41sTTUj3oH44D7t1mSq+9A7brfhEocHhnvptjwDMRZvBE
+nENPRKHWslWT7P5UrMkYNxrb76xaYZjvwKZ5NyPbFQsVsCH48jnhQKqFW/2LSCGu
+yhsa2WnIuiWaFS6IkInn/7ZCvFSei48MAAHkl1m5cpElTx1B+K9uCbS1+ShBDGz7
+VhBNVHYJsTTuWaDgsxC/klAZaIKDJkCkScQcopst8Zicv+Fz8MAdiQigq5Sfu/EN
+dlw7Slz1JE4J3MMd8X/tAgUhOALLNf4FoP5UJOsKhDj/S8Xh4k3UmXL2T5t9wJxT
+WMjTGGKI4m2mbUza5k7yPQ5SF/aBIACIdeCOdraT3j3QHRduufeX7P9ZuouY8TQH
+i1lqwqsfAVYGZQk/wLAqElQeFR85bJDAiy5nWPymDWXTS+2v1qGfulz4Uc/tnUiy
+sPjTx2gKuS53RcL3wgm2NyQFRpxIHRZh8oaGhy66CUnWGtVyCF2dtqSI8sHIBUGw
+7So96ikMFgr6p4ZW1Y65
+=U0v8
 -----END PGP SIGNATURE-----