diff --git a/README b/README index f3aa9f2..dd9dea0 100644 --- a/README +++ b/README @@ -27,6 +27,10 @@ of Qubes-specific rpms to install you want to use (e.g. qubes-gui-vm, etc). # ./qubeize_image +3a) You should remove yum cached files, and override unused block with +zeroes, via +# ./cleanup_image qubeized_images/name-root.img + 4) Make sure the symlinks in vm_kernels_XXX/ point to correct kernel and initramfs files you want to use for the template: diff --git a/clean_images/packages-netvm.list b/clean_images/packages-netvm.list index 9f5b33e..6298679 100644 --- a/clean_images/packages-netvm.list +++ b/clean_images/packages-netvm.list @@ -7,3 +7,4 @@ kdebse xterm bridge-utils stalonetray +NetworkManager-gnome diff --git a/cleanup_image b/cleanup_image new file mode 100755 index 0000000..ec17beb --- /dev/null +++ b/cleanup_image @@ -0,0 +1,26 @@ +#!/bin/sh + +IMG=$1 + +if ! [ $# -eq 1 ]; then + echo "usage $0 " + exit 1 +fi + + +if ! [ -f $IMG ]; then + echo $IMG does not exist + exit 1 +fi +ls -als $IMG +mount -o loop,offset=$((63*512)) $IMG mnt || exit 1 +INSTALLDIR=`pwd`/mnt/ +yum clean packages --installroot=$INSTALLDIR +dd if=/dev/zero of=mnt/fillme bs=1M +sync +rm mnt/fillme +umount mnt +cp --sparse=always $IMG $IMG.new +mv $IMG.new $IMG +ls -als $IMG + diff --git a/netvm/apps.templates/show_tray.desktop b/netvm/apps.templates/show_tray.desktop index e5a81ac..a3b25d9 100644 --- a/netvm/apps.templates/show_tray.desktop +++ b/netvm/apps.templates/show_tray.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=(qvm-run -q --tray -a --user=root netvm "stalonetray --background white --geometry 100x40" && qvm-run -q netvm --user=root "/usr/bin/nm-applet &") +Exec=(qvm-run -q --tray -a --user=root %VMNAME% "stalonetray --background white" && qvm-run -q %VMNAME% --user=root "/usr/bin/nm-applet &") Icon=%VMDIR%/icon.png Name=%VMNAME%: Show Tray Categories=System diff --git a/vm_conf_files/netvm.conf b/vm_conf_files/netvm.conf index cac110d..adc5d45 100644 --- a/vm_conf_files/netvm.conf +++ b/vm_conf_files/netvm.conf @@ -4,7 +4,7 @@ kernel="/var/lib/qubes/servicevms/%NETVMNAME%/kernels/vmlinuz" ramdisk="/var/lib/qubes/servicevms/%NETVMNAME%/kernels/initramfs" -extra="ro nomodeset xencons=hvc rd_NO_PLYMOUTH 3 pci=nomsi" +extra="ro nomodeset xencons=hvc swiotlb=force rd_NO_PLYMOUTH 3 pci=nomsi" root="/dev/mapper/dmroot" memory = 200