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

README

@@ -27,6 +27,10 @@ of Qubes-specific rpms to install you want to use (e.g. qubes-gui-vm, etc).
 
 # ./qubeize_image <img> <template-name>
 
+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:
 

clean_images/packages-netvm.list

@@ -7,3 +7,4 @@ kdebse
 xterm
 bridge-utils
 stalonetray
+NetworkManager-gnome

cleanup_image

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+IMG=$1
+
+if ! [ $# -eq 1 ]; then
+	echo "usage $0 <img_file_name>"
+	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
+

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

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