QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'xenlinux_as_domU' of git://qubes-os.org/rafal/template-builder

Browse Source
This commit is contained in:
Joanna Rutkowska 2010-07-27 14:04:33 +02:00
commit c57666a6a5
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm_conf_files/appvm-template.conf
View File

@ -4,7 +4,7 @@
kernel="%TEMPLATEDIR%/kernels/vmlinuz" kernel="%TEMPLATEDIR%/kernels/vmlinuz"
ramdisk="%TEMPLATEDIR%/kernels/initramfs" ramdisk="%TEMPLATEDIR%/kernels/initramfs"
extra="ro nomodeset rd_NO_PLYMOUTH 3" extra="ro nomodeset xencons=hvc rd_NO_PLYMOUTH 3"
root="/dev/mapper/dmroot" root="/dev/mapper/dmroot"
memory = 400 memory = 400

2
vm_conf_files/netvm.conf
View File

@ -4,7 +4,7 @@
kernel="/var/lib/qubes/servicevms/%NETVMNAME%/kernels/vmlinuz" kernel="/var/lib/qubes/servicevms/%NETVMNAME%/kernels/vmlinuz"
ramdisk="/var/lib/qubes/servicevms/%NETVMNAME%/kernels/initramfs" ramdisk="/var/lib/qubes/servicevms/%NETVMNAME%/kernels/initramfs"
extra="ro nomodeset rd_NO_PLYMOUTH 3 pci=nomsi" extra="ro nomodeset xencons=hvc rd_NO_PLYMOUTH 3 pci=nomsi"
root="/dev/mapper/dmroot" root="/dev/mapper/dmroot"
memory = 200 memory = 200

2
vm_conf_files/templatevm.conf
View File

@ -4,7 +4,7 @@
kernel="/var/lib/qubes/vm-templates/%TEMPLATENAME%/kernels/vmlinuz" kernel="/var/lib/qubes/vm-templates/%TEMPLATENAME%/kernels/vmlinuz"
ramdisk="/var/lib/qubes/vm-templates/%TEMPLATENAME%/kernels/initramfs" ramdisk="/var/lib/qubes/vm-templates/%TEMPLATENAME%/kernels/initramfs"
extra="ro nomodeset rd_NO_PLYMOUTH 3" extra="ro nomodeset xencons=hvc rd_NO_PLYMOUTH 3"
root="/dev/mapper/dmroot" root="/dev/mapper/dmroot"
memory = 400 memory = 400

2
vm_initramfs_patches/qubes_cow_setup.sh
View File

@ -9,7 +9,7 @@ if [ -e /dev/mapper/dmroot ] ; then
die "Qubes: FATAL error: /dev/mapper/dmroot already exists?!" die "Qubes: FATAL error: /dev/mapper/dmroot already exists?!"
fi fi
modprobe xen-blkfront || echo "Qubes: Cannot load Xen Block Frontend..." modprobe xenblk || modprobe xen-blkfront || echo "Qubes: Cannot load Xen Block Frontend..."
echo "Waiting for /dev/xvda* devices..." echo "Waiting for /dev/xvda* devices..."
while ! [ -e /dev/xvda ]; do sleep 0.1; done while ! [ -e /dev/xvda ]; do sleep 0.1; done