update gitian version and patch, fix make vms
parent
9c1b649eb4
commit
1415b9208f
@ -1,21 +1,22 @@
|
||||
diff --git a/bin/make-base-vm b/bin/make-base-vm
|
||||
index d82b3d6..a5935fb 100755
|
||||
index a7c182b..8dc4091 100755
|
||||
--- a/bin/make-base-vm
|
||||
+++ b/bin/make-base-vm
|
||||
@@ -109,16 +109,3 @@ rm -rf $OUT
|
||||
env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm ubuntu --rootsize 10240 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup
|
||||
@@ -227,5 +227,17 @@ else
|
||||
mv $OUT/*.qcow2 $OUT.qcow2
|
||||
rm -rf $OUT
|
||||
-
|
||||
-if [ $LXC = "1" ]; then
|
||||
- #sudo debootstrap --include=$addpkg --arch=$ARCH $SUITE $OUT-root $MIRROR
|
||||
- echo Extracting partition for lxc
|
||||
- qemu-img convert $OUT.qcow2 $OUT.raw
|
||||
- loop=`sudo kpartx -av $OUT.raw|sed -n '/loop.p1/{s/.*loop\(.\)p1.*/\1/;p}'`
|
||||
- sudo cp --sparse=always /dev/mapper/loop${loop}p1 $OUT
|
||||
- sudo chown $USER $OUT
|
||||
- sudo kpartx -d /dev/loop$loop
|
||||
- rm -f $OUT.raw
|
||||
- # bootstrap-fixup is done in libexec/make-clean-vm
|
||||
-fi
|
||||
-
|
||||
# bootstrap-fixup is done on first boot
|
||||
+
|
||||
+ if [ $LXC = "1" ]; then
|
||||
+ #sudo debootstrap --include=$addpkg --arch=$ARCH $SUITE $OUT-root $MIRROR
|
||||
+ echo Extracting partition for lxc
|
||||
+ qemu-img convert $OUT.qcow2 $OUT.raw
|
||||
+ loop=`sudo kpartx -av $OUT.raw|sed -n '/loop.p1/{s/.*loop\(.\)p1.*/\1/;p}'`
|
||||
+ sudo cp --sparse=always /dev/mapper/loop${loop}p1 $OUT
|
||||
+ sudo chown $USER $OUT
|
||||
+ sudo kpartx -d /dev/loop$loop
|
||||
+ rm -f $OUT.raw
|
||||
+ # bootstrap-fixup is done in libexec/make-clean-vm
|
||||
+ fi
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue