trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

LibVirt fixes

Browse Source
This commit is contained in:
Chris Long
2020-02-17 15:04:32 -08:00
parent f3c40e84b5
commit 16003bbd68
4 changed files with 124 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
Packer/windows_10.json
View File

@@ -1,52 +1,8 @@
{
"builders": [
{
"type": "qemu",
"vm_name":"windows_10",
"communicator": "winrm",
"iso_url": "{{user `iso_url`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"headless": true,
"boot_wait": "6m",
"boot_command": "",
"winrm_username": "vagrant",
"winrm_password": "vagrant",
"winrm_timeout": "4h",
"shutdown_timeout": "2h",
"shutdown_command": "a:/sysprep.bat",
"accelerator": "kvm",
"disk_size": "{{user `disk_size`}}",
"output_directory": "{{ user `packer_build_dir`}}",
"qemuargs": [
[ "-m", "2048"],
[ "-smp", "2"],
[ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ],
[ "-drive", "file={{ user `packer_build_dir`}}/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ]
],
"floppy_files": [
"{{user `autounattend_virtio`}}",
"./floppy/WindowsPowershell.lnk",
"./floppy/PinTo10.exe",
"./scripts/fixnetwork.ps1",
"./scripts/rearm-windows.ps1",
"./scripts/disable-screensaver.ps1",
"./scripts/disable-winrm.ps1",
"./scripts/enable-winrm.ps1",
"./scripts/microsoft-updates.bat",
"./scripts/win-updates.ps1",
"./scripts/unattend.xml",
"./scripts/sysprep.bat"
]
},
{
"type": "vmware-iso",
"vm_name":"windows_10",
"vm_name": "windows_10",
"communicator": "winrm",
"iso_url": "{{user `iso_url`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
@@ -88,7 +44,7 @@
},
{
"type": "virtualbox-iso",
"vm_name":"windows_10",
"vm_name": "windows_10",
"communicator": "winrm",
"iso_url": "{{user `iso_url`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
@@ -132,6 +88,57 @@
"2"
]
]
},
{
"type": "qemu",
"vm_name": "windows_10",
"communicator": "winrm",
"iso_url": "{{user `iso_url`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"headless": false,
"boot_wait": "6m",
"boot_command": "",
"winrm_username": "vagrant",
"winrm_password": "vagrant",
"winrm_timeout": "4h",
"shutdown_timeout": "2h",
"shutdown_command": "a:/sysprep.bat",
"accelerator": "kvm",
"disk_size": "{{user `disk_size`}}",
"output_directory": "{{ user `packer_build_dir`}}",
"qemuargs": [
[
"-m",
"2048"
],
[
"-smp",
"2"
],
[
"-drive",
"file={{ user `virtio_win_iso` }},media=cdrom,index=3"
],
[
"-drive",
"file={{ user `packer_build_dir`}}/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"
]
],
"floppy_files": [
"{{user `autounattend_virtio`}}",
"./floppy/WindowsPowershell.lnk",
"./floppy/PinTo10.exe",
"./scripts/fixnetwork.ps1",
"./scripts/rearm-windows.ps1",
"./scripts/disable-screensaver.ps1",
"./scripts/disable-winrm.ps1",
"./scripts/enable-winrm.ps1",
"./scripts/microsoft-updates.bat",
"./scripts/win-updates.ps1",
"./scripts/unattend.xml",
"./scripts/sysprep.bat"
]
}
],
"provisioners": [
@@ -188,6 +195,6 @@
"disk_size": "61440",
"virtio_win_iso": "./virtio-win.iso",
"autounattend_virtio": "./answer_files/10_virtio/Autounattend.xml",
"packer_build_dir": "/media/packer_build_dir/win10"
"packer_build_dir": "./win10"
}
}
}

99
Packer/windows_2016.json
View File

@@ -1,49 +1,7 @@
{
"builders": [
{
"type": "qemu",
"vm_name":"windows_10",
"communicator": "winrm",
"iso_url": "{{user `iso_url`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"headless": true,
"boot_wait": "6m",
"boot_command": "",
"winrm_username": "vagrant",
"winrm_password": "vagrant",
"winrm_timeout": "4h",
"shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
"accelerator": "kvm",
"disk_size": "{{user `disk_size`}}",
"output_directory": "{{ user `packer_build_dir`}}",
"qemuargs": [
[ "-m", "2048"],
[ "-smp", "2"],
[ "-drive", "file={{ user `virtio_win_iso` }},media=cdrom,index=3" ],
[ "-drive", "file={{ user `packer_build_dir`}}/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1" ]
],
"floppy_files": [
"{{user `autounattend_virtio`}}",
"./floppy/WindowsPowershell.lnk",
"./floppy/WindowsPowershell.lnk",
"./floppy/PinTo10.exe",
"./scripts/unattend.xml",
"./scripts/sysprep.bat",
"./scripts/disable-screensaver.ps1",
"./scripts/disable-winrm.ps1",
"./scripts/enable-winrm.ps1",
"./scripts/microsoft-updates.bat",
"./scripts/win-updates.ps1"
]
},
{
"vm_name":"WindowsServer2016",
"vm_name": "WindowsServer2016",
"type": "vmware-iso",
"communicator": "winrm",
"iso_url": "{{user `iso_url`}}",
@@ -82,7 +40,7 @@
}
},
{
"vm_name":"WindowsServer2016",
"vm_name": "WindowsServer2016",
"type": "virtualbox-iso",
"communicator": "winrm",
"iso_url": "{{user `iso_url`}}",
@@ -124,6 +82,55 @@
"2"
]
]
},
{
"type": "qemu",
"vm_name": "windows_10",
"communicator": "winrm",
"iso_url": "{{user `iso_url`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"headless": false,
"boot_wait": "6m",
"boot_command": "",
"winrm_username": "vagrant",
"winrm_password": "vagrant",
"winrm_timeout": "4h",
"shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
"accelerator": "kvm",
"disk_size": "{{user `disk_size`}}",
"output_directory": "{{ user `packer_build_dir`}}",
"qemuargs": [
[
"-m",
"2048"
],
[
"-smp",
"2"
],
[
"-drive",
"file={{ user `virtio_win_iso` }},media=cdrom,index=3"
],
[
"-drive",
"file={{ user `packer_build_dir`}}/{{ .Name }},if=virtio,cache=writeback,discard=ignore,format=qcow2,index=1"
]
],
"floppy_files": [
"{{user `autounattend_virtio`}}",
"./floppy/WindowsPowershell.lnk",
"./floppy/WindowsPowershell.lnk",
"./floppy/PinTo10.exe",
"./scripts/unattend.xml",
"./scripts/sysprep.bat",
"./scripts/disable-screensaver.ps1",
"./scripts/disable-winrm.ps1",
"./scripts/enable-winrm.ps1",
"./scripts/microsoft-updates.bat",
"./scripts/win-updates.ps1"
]
}
],
"provisioners": [
@@ -172,6 +179,6 @@
"autounattend": "./answer_files/2016/Autounattend.xml",
"virtio_win_iso": "./virtio-win.iso",
"autounattend_virtio": "./answer_files/2016_virtio/Autounattend.xml",
"packer_build_dir": "/media/packer_build_dir/win2016"
"packer_build_dir": "./win2016"
}
}
}