···

       
2
       
 
       


     

       
3
       
 
       
with lib;

     

       
4
       
 
       
let

     

       
5
       
-
       
  diskSize = 30720;

     

       
6
       
 
       
in

     

       
7
       
 
       
{

     

       
8
       
 
       
  system.build.azureImage = import ../../lib/make-disk-image.nix {

     

       
9
       
 
       
    name = "azure-image";

     

       
10
       
 
       
    postVM = ''

     

       
11
       
-
       
      ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd

     

       
12
       
 
       
    '';

     

       
13
       
 
       
    configFile = ./azure-config-user.nix;

     

       
14
       
 
       
    format = "raw";

     

···

       
2
       
 
       


     

       
3
       
 
       
with lib;

     

       
4
       
 
       
let

     

       
5
       
+
       
  diskSize = 2048;

     

       
6
       
 
       
in

     

       
7
       
 
       
{

     

       
8
       
 
       
  system.build.azureImage = import ../../lib/make-disk-image.nix {

     

       
9
       
 
       
    name = "azure-image";

     

       
10
       
 
       
    postVM = ''

     

       
11
       
+
       
      ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd

     

       
12
       
 
       
    '';

     

       
13
       
 
       
    configFile = ./azure-config-user.nix;

     

       
14
       
 
       
    format = "raw";

     

···

       
1
       
-
       
diff --git a/Makefile b/Makefile

     

       
2
       
-
       
index d6b9dc1..ce7c493 100644

     

       
3
       
-
       
--- a/Makefile

     

       
4
       
-
       
+++ b/Makefile

     

       
5
       
-
       
@@ -384,8 +384,7 @@ install-confdir:

     

       
6
       
-
       
 install-sysconfig: install-datadir install-confdir

     

       
7
       
-
       
 	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"

     

       
8
       
-
       
 

     

       
9
       
-
       
-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \

     

       
10
       
-
       
-install-datadir install-localstatedir

     

       
11
       
-
       
+install: all $(if $(BUILD_DOCS),install-doc) install-datadir

     

       
12
       
-
       
 ifneq ($(TOOLS),)

     

       
13
       
-
       
 	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))

     

       
14
       
-
       
 endif

     

···

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
14
       
 
       


     

       
15
       
 
       
  qemu = pkgs.qemu_kvm;

     

       
16
       
 
       


     

       
17
       
-
       
  qemu-220 = lib.overrideDerivation pkgs.qemu_kvm (attrs: rec {

     

       
18
       
-
       
    version = "2.2.0";

     

       
19
       
-
       
    src = fetchurl {

     

       
20
       
-
       
      url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";

     

       
21
       
-
       
      sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n";

     

       
22
       
-
       
    };

     

       
23
       
-
       
    patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ];

     

       
24
       
-
       
  });

     

       
25
       
-
       


     

       
26
       
-
       


     

       
27
       
 
       
  modulesClosure = makeModulesClosure {

     

       
28
       
 
       
    inherit kernel rootModules;

     

       
29
       
 
       
    firmware = kernel;

     

···

       
14
       
 
       


     

       
15
       
 
       
  qemu = pkgs.qemu_kvm;

     

       
16
       
 
       


     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
17
       
 
       
  modulesClosure = makeModulesClosure {

     

       
18
       
 
       
    inherit kernel rootModules;

     

       
19
       
 
       
    firmware = kernel;