mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-13 21:25:30 +03:00
virtualisation/virtualbox: virtualbox.vmFileName -> image.fileName
This commit is contained in:
parent
b0b3a75676
commit
6cc7449e30
1 changed files with 18 additions and 8 deletions
|
@ -11,6 +11,7 @@ in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./disk-size-option.nix
|
./disk-size-option.nix
|
||||||
|
../image/file-options.nix
|
||||||
(lib.mkRenamedOptionModuleWith {
|
(lib.mkRenamedOptionModuleWith {
|
||||||
sinceRelease = 2411;
|
sinceRelease = 2411;
|
||||||
from = [
|
from = [
|
||||||
|
@ -22,6 +23,18 @@ in
|
||||||
"diskSize"
|
"diskSize"
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
(lib.mkRenamedOptionModuleWith {
|
||||||
|
sinceRelease = 2505;
|
||||||
|
from = [
|
||||||
|
"virtualisation"
|
||||||
|
"virtualbox"
|
||||||
|
"vmFileName"
|
||||||
|
];
|
||||||
|
to = [
|
||||||
|
"image"
|
||||||
|
"fileName"
|
||||||
|
];
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
@ -54,13 +67,6 @@ in
|
||||||
The name of the VirtualBox appliance.
|
The name of the VirtualBox appliance.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
vmFileName = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "nixos-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.ova";
|
|
||||||
description = ''
|
|
||||||
The file name of the VirtualBox appliance.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
params = lib.mkOption {
|
params = lib.mkOption {
|
||||||
type =
|
type =
|
||||||
with lib.types;
|
with lib.types;
|
||||||
|
@ -207,8 +213,12 @@ in
|
||||||
(lib.mkIf (pkgs.stdenv.hostPlatform.system == "i686-linux") { pae = "on"; })
|
(lib.mkIf (pkgs.stdenv.hostPlatform.system == "i686-linux") { pae = "on"; })
|
||||||
];
|
];
|
||||||
|
|
||||||
|
system.nixos.tags = [ "virtualbox" ];
|
||||||
|
image.extension = "ova";
|
||||||
|
system.build.image = lib.mkDefault config.system.build.virtualBoxOVA;
|
||||||
system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix {
|
system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix {
|
||||||
name = cfg.vmDerivationName;
|
name = cfg.vmDerivationName;
|
||||||
|
baseName = config.image.baseName;
|
||||||
|
|
||||||
inherit pkgs lib config;
|
inherit pkgs lib config;
|
||||||
partitionTableType = "legacy";
|
partitionTableType = "legacy";
|
||||||
|
@ -253,7 +263,7 @@ in
|
||||||
|
|
||||||
echo "exporting VirtualBox VM..."
|
echo "exporting VirtualBox VM..."
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
fn="$out/${cfg.vmFileName}"
|
fn="$out/${config.image.fileName}"
|
||||||
VBoxManage export "$vmName" --output "$fn" --options manifest ${lib.escapeShellArgs cfg.exportParams}
|
VBoxManage export "$vmName" --output "$fn" --options manifest ${lib.escapeShellArgs cfg.exportParams}
|
||||||
${cfg.postExportCommands}
|
${cfg.postExportCommands}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue