From c03967798fdd4dfa0e8556cf75279dd528ec213e Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@mimuw.edu.pl>
Date: Fri, 18 Mar 2011 22:30:23 -0400
Subject: [PATCH] Create template with plain root.img without partitions (#118)

Additionaly provide clean-volatile.img
---
 clean_images/clean-starter.img.tar      | Bin 389120 -> 0 bytes
 clean_images/clean-volatile.img.tar     | Bin 0 -> 10240 bytes
 cleanup_image                           |   2 +-
 fedorize_image                          |  11 ++++++-----
 qubeize_image                           |   2 +-
 templates.spec                          |   7 +++++++
 vm_conf_files/appvm-template.conf       |   3 +--
 vm_conf_files/netvm-template.conf       |   3 +--
 vm_conf_files/standalone-template.conf  |   1 +
 vm_conf_files/templatevm.conf           |   1 +
 vm_initramfs_patches/qubes_cow_setup.sh |  12 +++---------
 11 files changed, 22 insertions(+), 20 deletions(-)
 delete mode 100644 clean_images/clean-starter.img.tar
 create mode 100644 clean_images/clean-volatile.img.tar

diff --git a/clean_images/clean-starter.img.tar b/clean_images/clean-starter.img.tar
deleted file mode 100644
index 8f61c178ccaf9a63e9aa8a7bee1c9307d57b00c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 389120
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

diff --git a/clean_images/clean-volatile.img.tar b/clean_images/clean-volatile.img.tar
new file mode 100644
index 0000000000000000000000000000000000000000..81622f2945e8fe0e15632de724661f91a3bebffc
GIT binary patch
literal 10240
zcmeIuF-yZx5Ww+MmoCn(PbVGJq>V{8sp4J;B91|V6rw`YI%@=79lE(W=2JNP0sIyY
zf`d-=UTUj^QW3fY{s(#QxVt3p{Z5iNI^Vp!NTOaRiMKjur!x0&G<@F^y9cFROAUR*
zb$2}1aq0~}5W9N5m~ieVnexGY+KalzNI#9cQ`(c#U;WA8e-o?n9fgqQ3gHyFry}FL
zR1eDatI>}apLEyWI7EIoMl-CH7q}g)q<RUnDp|gsNzGo!h~yjD&HM3#)HMItU9i<z
zahThY;c%%KdTTy^Ucc_G4elP7?_ai?v)-hK00LDN2#;Fru-)1}s8{s{oErfI5I_I{
m1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009Jk1ik=Fg+DF;

literal 0
HcmV?d00001

diff --git a/cleanup_image b/cleanup_image
index ec17beb..b40f0b6 100755
--- a/cleanup_image
+++ b/cleanup_image
@@ -13,7 +13,7 @@ if ! [ -f $IMG ]; then
 	exit 1
 fi	
 ls -als $IMG
-mount -o loop,offset=$((63*512)) $IMG mnt || exit 1
+mount -o loop $IMG mnt || exit 1
 INSTALLDIR=`pwd`/mnt/
 yum clean packages --installroot=$INSTALLDIR 
 dd if=/dev/zero of=mnt/fillme bs=1M
diff --git a/fedorize_image b/fedorize_image
index fd3d830..f8c723f 100755
--- a/fedorize_image
+++ b/fedorize_image
@@ -11,17 +11,18 @@ fi
 
 if [ -f $IMG ]; then
         echo "-> Image file already exists, assuming *update*..."
-        mount -o loop,offset=$((63*512)) $IMG mnt || exit 1
+        mount -o loop $IMG mnt || exit 1
         INSTALLDIR=`pwd`/mnt/
 else
 
-        echo "-> Initializing empty image with part table and filesystems..."
-        tar kOxf clean_images/clean-starter.img.tar > $IMG
+        echo "-> Initializing empty image..."
+        truncate -s 10G $IMG || exit 1
 
-        touch $IMG || exit 1
+        echo "-> Creating filesystem..."
+        mkfs.ext4 -F $IMG || exit 1
 
         mkdir -p mnt
-        mount -o loop,offset=$((63*512)) $IMG mnt || exit 1
+        mount -o loop $IMG mnt || exit 1
 
         INSTALLDIR=`pwd`/mnt/
 
diff --git a/qubeize_image b/qubeize_image
index a586921..bb38218 100755
--- a/qubeize_image
+++ b/qubeize_image
@@ -33,7 +33,7 @@ cp $CLEANIMG $IMG || exit 1
 echo "--> Mouting $IMG"
 
 mkdir -p mnt
-mount -o loop,offset=$((63*512)) $IMG mnt || exit 1
+mount -o loop $IMG mnt || exit 1
 
 echo "--> Installing RPMs..."
 rpm --force --root=$(pwd)/mnt -ihv rpms_to_install/*
diff --git a/templates.spec b/templates.spec
index ea8c481..48e2412 100644
--- a/templates.spec
+++ b/templates.spec
@@ -40,6 +40,8 @@ for i in qubeized_images/root.img.part.* ; do ln $i $RPM_BUILD_ROOT/%{dest_dir}/
 touch $RPM_BUILD_ROOT/%{dest_dir}/root.img # we will create the real file in %post
 touch $RPM_BUILD_ROOT/%{dest_dir}/private.img # we will create the real file in %post
 
+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/netvm-template.conf $RPM_BUILD_ROOT/%{dest_dir}/netvm-template.conf
 cp vm_conf_files/templatevm.conf $RPM_BUILD_ROOT/%{dest_dir}/templatevm.conf
@@ -78,6 +80,9 @@ mv %{dest_dir}/%{template_name}-root.img %{dest_dir}/root.img
 chown root.qubes %{dest_dir}/root.img
 chmod 0660 %{dest_dir}/root.img
 
+echo "--> Processing the clean-volatile.img..."
+tar --sparse -xf {dest_dir}/clean-volatile.img.tar -C %{dest_dir}
+
 if [ "$1" = 1 ] ; then
     # installing for the first time
     echo "--> Creating private.img..."
@@ -126,6 +131,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dest_dir}
 %ghost %{dest_dir}/root.img
 %{dest_dir}/root.img.part.*
+%ghost %{dest_dir}/clean-volatile.img
+%{dest_dir}/clean-volatile.img.tar
 %ghost %{dest_dir}/private.img
 %{dest_dir}/appvm-template.conf
 %{dest_dir}/netvm-template.conf
diff --git a/vm_conf_files/appvm-template.conf b/vm_conf_files/appvm-template.conf
index efccaa7..4301188 100644
--- a/vm_conf_files/appvm-template.conf
+++ b/vm_conf_files/appvm-template.conf
@@ -12,8 +12,7 @@ name = "%VMNAME%"
 
 disk = [ 'snapshot:%TEMPLATEDIR%/root.img:%TEMPLATEDIR%/root-cow.img,xvda,r', 
 	 'file:%VMDIR%/private.img,xvdb,w',
-	 'file:%VMDIR%/root-cow.img,xvdc,w',
-	 'file:%VMDIR%/swap-cow.img,xvdd,w'
+	 'file:%VMDIR%/volatile.img,xvdc,w',
        ]
 
 vcpus = %VCPUS%
diff --git a/vm_conf_files/netvm-template.conf b/vm_conf_files/netvm-template.conf
index 266c861..56091e0 100644
--- a/vm_conf_files/netvm-template.conf
+++ b/vm_conf_files/netvm-template.conf
@@ -14,8 +14,7 @@ pci = [ %PCIDEVS% ]
 
 disk = [ 'snapshot:%TEMPLATEDIR%/root.img:%TEMPLATEDIR%/root-cow.img,xvda,r', 
 	 'file:%VMDIR%/private.img,xvdb,w',
-	 'file:%VMDIR%/root-cow.img,xvdc,w',
-	 'file:%VMDIR%/swap-cow.img,xvdd,w'
+	 'file:%VMDIR%/volatile.img,xvdc,w',
        ]
 
 vcpus = %VCPUS%
diff --git a/vm_conf_files/standalone-template.conf b/vm_conf_files/standalone-template.conf
index 024f476..ccbcd4d 100644
--- a/vm_conf_files/standalone-template.conf
+++ b/vm_conf_files/standalone-template.conf
@@ -12,6 +12,7 @@ name = "%VMNAME%"
 
 disk = [ 'file:%VMDIR%/root.img,xvda,w', 
 	 'file:%VMDIR%/private.img,xvdb,w'
+	 'file:%VMDIR%/volatile.img,xvdc,w'
        ]
 
 vcpus = %VCPUS%
diff --git a/vm_conf_files/templatevm.conf b/vm_conf_files/templatevm.conf
index 2cc51de..f4ae0e4 100644
--- a/vm_conf_files/templatevm.conf
+++ b/vm_conf_files/templatevm.conf
@@ -12,6 +12,7 @@ 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
diff --git a/vm_initramfs_patches/qubes_cow_setup.sh b/vm_initramfs_patches/qubes_cow_setup.sh
index 0944da9..117d257 100755
--- a/vm_initramfs_patches/qubes_cow_setup.sh
+++ b/vm_initramfs_patches/qubes_cow_setup.sh
@@ -13,25 +13,19 @@ modprobe xenblk || modprobe xen-blkfront || echo "Qubes: Cannot load Xen Block F
 
 echo "Waiting for /dev/xvda* devices..."
 while ! [ -e /dev/xvda ]; do sleep 0.1; done
-while ! [ -e /dev/xvda1 ] ; do sleep 0.1; done
-while ! [ -e /dev/xvda2 ] ; do sleep 0.1; done
 
 if [ `blockdev --getro /dev/xvda` = 1 ] ; then
 	echo "Qubes: Doing COW setup for AppVM..."
 
 	while ! [ -e /dev/xvdc ]; do sleep 0.1; done
-	while ! [ -e /dev/xvdd ]; do sleep 0.1; done
+	while ! [ -e /dev/xvdc2 ]; do sleep 0.1; done
 
-	echo "0 `blockdev --getsz /dev/xvda1` snapshot /dev/xvda1 /dev/xvdc P 16" | \
+	echo "0 `blockdev --getsz /dev/xvda` snapshot /dev/xvda /dev/xvdc2 P 16" | \
     		dmsetup create dmroot || { echo "Qubes: FATAL: cannot create dmroot!"; }
-	echo "0 `blockdev --getsz /dev/xvda2` snapshot /dev/xvda2 /dev/xvdd P 16" | \
-    		dmsetup create dmswap || { echo "Qubes: FATAL: cannot create dmswap!"; }
 	echo Qubes: done.
 else
 	echo "Qubes: Doing R/W setup for TemplateVM..."
-	echo "0 `blockdev --getsz /dev/xvda1` linear /dev/xvda1 0" | \
+	echo "0 `blockdev --getsz /dev/xvda` linear /dev/xvda 0" | \
     		dmsetup create dmroot || { echo "Qubes: FATAL: cannot create dmroot!"; exit 1; }
-	echo "0 `blockdev --getsz /dev/xvda2` linear /dev/xvda2 0" | \
-    		dmsetup create dmswap || { echo "Qubes: FATAL: cannot create dmswap!"; exit 1; }
 	echo Qubes: done.
 fi