Do not include xen config files in template package
There are autogenerated at VM start by Qubes core scripts.
This commit is contained in:
Marek Marczykowski
parent
952daea76c
commit
7987c16828
@ -42,13 +42,6 @@ touch $RPM_BUILD_ROOT/%{dest_dir}/private.img # we will create the real file in
|
|||||||
|
|
||||||
cp clean_images/clean-volatile.img.tar $RPM_BUILD_ROOT/%{dest_dir}/clean-volatile.img.tar
|
cp clean_images/clean-volatile.img.tar $RPM_BUILD_ROOT/%{dest_dir}/clean-volatile.img.tar
|
||||||
|
|
||||||
cp vm_conf_files/appvm-template.conf $RPM_BUILD_ROOT/%{dest_dir}/appvm-template.conf
|
|
||||||
cp vm_conf_files/standalone-template.conf $RPM_BUILD_ROOT/%{dest_dir}/standalone-template.conf
|
|
||||||
cp vm_conf_files/netvm-template.conf $RPM_BUILD_ROOT/%{dest_dir}/netvm-template.conf
|
|
||||||
cp vm_conf_files/templatevm.conf $RPM_BUILD_ROOT/%{dest_dir}/templatevm.conf
|
|
||||||
sed -e s/%TEMPLATENAME%/%{template_name}/g < vm_conf_files/templatevm.conf >\
|
|
||||||
$RPM_BUILD_ROOT/%{dest_dir}/%{template_name}.conf
|
|
||||||
|
|
||||||
cp vm_conf_files/dispvm-prerun.sh $RPM_BUILD_ROOT/%{dest_dir}/
|
cp vm_conf_files/dispvm-prerun.sh $RPM_BUILD_ROOT/%{dest_dir}/
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{dest_dir}/kernels
|
mkdir -p $RPM_BUILD_ROOT/%{dest_dir}/kernels
|
||||||
@ -110,9 +103,6 @@ if [ "$1" = 1 ] ; then
|
|||||||
qvm-add-template --rpm %{template_name}
|
qvm-add-template --rpm %{template_name}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "--> Recreating VM conf files..."
|
|
||||||
/usr/lib/qubes/reset_vm_configs.py %{template_name}
|
|
||||||
|
|
||||||
qvm-template-commit %{template_name}
|
qvm-template-commit %{template_name}
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
@ -145,11 +135,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{dest_dir}/clean-volatile.img.tar
|
%{dest_dir}/clean-volatile.img.tar
|
||||||
%ghost %{dest_dir}/volatile.img
|
%ghost %{dest_dir}/volatile.img
|
||||||
%ghost %{dest_dir}/private.img
|
%ghost %{dest_dir}/private.img
|
||||||
%{dest_dir}/appvm-template.conf
|
|
||||||
%{dest_dir}/netvm-template.conf
|
|
||||||
%{dest_dir}/standalone-template.conf
|
|
||||||
%{dest_dir}/templatevm.conf
|
|
||||||
%{dest_dir}/%{template_name}.conf
|
|
||||||
%{dest_dir}/dispvm-prerun.sh
|
%{dest_dir}/dispvm-prerun.sh
|
||||||
%dir %{dest_dir}/kernels
|
%dir %{dest_dir}/kernels
|
||||||
%{dest_dir}/kernels/vmlinuz
|
%{dest_dir}/kernels/vmlinuz
|
||||||
|
|||||||
@ -1,22 +0,0 @@
|
|||||||
#
|
|
||||||
# This is a Xen VM config file for AppVMs
|
|
||||||
#
|
|
||||||
|
|
||||||
kernel="%TEMPLATEDIR%/kernels/vmlinuz"
|
|
||||||
ramdisk="%TEMPLATEDIR%/kernels/initramfs"
|
|
||||||
extra="ro nomodeset xencons=hvc rd_NO_PLYMOUTH 3"
|
|
||||||
root="/dev/mapper/dmroot"
|
|
||||||
|
|
||||||
memory = %MEM%
|
|
||||||
name = "%VMNAME%"
|
|
||||||
|
|
||||||
disk = [ 'snapshot:%TEMPLATEDIR%/root.img:%TEMPLATEDIR%/root-cow.img,xvda,r',
|
|
||||||
'file:%VMDIR%/private.img,xvdb,w',
|
|
||||||
'file:%VMDIR%/volatile.img,xvdc,w',
|
|
||||||
]
|
|
||||||
|
|
||||||
vcpus = %VCPUS%
|
|
||||||
|
|
||||||
on_poweroff = 'destroy'
|
|
||||||
on_reboot = 'destroy'
|
|
||||||
on_crash = 'destroy'
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
#
|
|
||||||
# This is a Xen VM config file for AppVMs
|
|
||||||
#
|
|
||||||
|
|
||||||
kernel="%TEMPLATEDIR%/kernels/vmlinuz"
|
|
||||||
ramdisk="%TEMPLATEDIR%/kernels/initramfs"
|
|
||||||
extra="ro nomodeset xencons=hvc swiotlb=force pci=nomsi rd_NO_PLYMOUTH 3"
|
|
||||||
root="/dev/mapper/dmroot"
|
|
||||||
|
|
||||||
memory = %MEM%
|
|
||||||
name = "%VMNAME%"
|
|
||||||
|
|
||||||
pci = [ %PCIDEVS% ]
|
|
||||||
|
|
||||||
disk = [ 'snapshot:%TEMPLATEDIR%/root.img:%TEMPLATEDIR%/root-cow.img,xvda,r',
|
|
||||||
'file:%VMDIR%/private.img,xvdb,w',
|
|
||||||
'file:%VMDIR%/volatile.img,xvdc,w',
|
|
||||||
]
|
|
||||||
|
|
||||||
vcpus = %VCPUS%
|
|
||||||
|
|
||||||
on_poweroff = 'destroy'
|
|
||||||
on_reboot = 'destroy'
|
|
||||||
on_crash = 'destroy'
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
#
|
|
||||||
# This is a Xen VM config file for AppVMs
|
|
||||||
#
|
|
||||||
|
|
||||||
kernel="%VMDIR%/kernels/vmlinuz"
|
|
||||||
ramdisk="%VMDIR%/kernels/initramfs"
|
|
||||||
extra="ro nomodeset xencons=hvc rd_NO_PLYMOUTH 3"
|
|
||||||
root="/dev/mapper/dmroot"
|
|
||||||
|
|
||||||
memory = %MEM%
|
|
||||||
name = "%VMNAME%"
|
|
||||||
|
|
||||||
disk = [ 'file:%VMDIR%/root.img,xvda,w',
|
|
||||||
'file:%VMDIR%/private.img,xvdb,w',
|
|
||||||
'file:%VMDIR%/volatile.img,xvdc,w'
|
|
||||||
]
|
|
||||||
|
|
||||||
vcpus = %VCPUS%
|
|
||||||
|
|
||||||
on_poweroff = 'destroy'
|
|
||||||
on_reboot = 'destroy'
|
|
||||||
on_crash = 'destroy'
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
#
|
|
||||||
# This is a Xen VM config file for the Template VM
|
|
||||||
#
|
|
||||||
|
|
||||||
kernel="/var/lib/qubes/vm-templates/%TEMPLATENAME%/kernels/vmlinuz"
|
|
||||||
ramdisk="/var/lib/qubes/vm-templates/%TEMPLATENAME%/kernels/initramfs"
|
|
||||||
extra="ro nomodeset xencons=hvc rd_NO_PLYMOUTH 3"
|
|
||||||
root="/dev/mapper/dmroot"
|
|
||||||
|
|
||||||
memory = 400
|
|
||||||
name = "%TEMPLATENAME%"
|
|
||||||
|
|
||||||
disk = [ 'origin:/var/lib/qubes/vm-templates/%TEMPLATENAME%/root.img:/var/lib/qubes/vm-templates/%TEMPLATENAME%/root-cow.img,xvda,w',
|
|
||||||
'file:/var/lib/qubes/vm-templates/%TEMPLATENAME%/private.img,xvdb,w',
|
|
||||||
'file:/var/lib/qubes/vm-templates/%TEMPLATENAME%/volatile.img,xvdc,w',
|
|
||||||
]
|
|
||||||
|
|
||||||
vcpus = 1
|
|
||||||
|
|
||||||
on_poweroff = 'destroy'
|
|
||||||
on_reboot = 'destroy'
|
|
||||||
on_crash = 'destroy'
|
|
||||||
Loading…
Reference in New Issue
Block a user