From 079ad0e5c62de65ec562484131732e3c06c08295 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 3 Feb 2012 10:02:43 +0000
Subject: [PATCH] Updates to FOSDEM 2012 talk.

- prepopulate: Use qemu-img to create the output disk.
- Change sizes for 1024x768 screen output.
- Add run script.
- Update notes.
- Misc updates.
---
 2012-fosdem/.gitignore           |  1 +
 2012-fosdem/200-overview.html    |  8 ++++----
 2012-fosdem/300-guestfish.term   |  3 ++-
 2012-fosdem/500-auditing.term    |  2 +-
 2012-fosdem/500.d/audit.py       |  5 +++--
 2012-fosdem/600-prepopulate.term |  3 +--
 2012-fosdem/600.d/prepopulate.py |  8 +++-----
 2012-fosdem/notes.txt            |  7 +------
 2012-fosdem/run                  | 14 ++++++++++++++
 2012-fosdem/style.css            | 11 +++++++----
 10 files changed, 37 insertions(+), 25 deletions(-)
 create mode 100755 2012-fosdem/run

diff --git a/2012-fosdem/.gitignore b/2012-fosdem/.gitignore
index 226f62f..bf59c5d 100644
--- a/2012-fosdem/.gitignore
+++ b/2012-fosdem/.gitignore
@@ -4,4 +4,5 @@ history
 400.d/disk.img
 500.d/rhel6.img
 500.d/win7.img
+600.d/disk.img
 600.d/libguestfs-1.16.2.tar.gz
diff --git a/2012-fosdem/200-overview.html b/2012-fosdem/200-overview.html
index 596e2eb..0943f8c 100644
--- a/2012-fosdem/200-overview.html
+++ b/2012-fosdem/200-overview.html
@@ -4,13 +4,13 @@
 
 <h1>Library, API, tools</h1>
 
-<img style="position: absolute; top: 4em; left: 12em;" src="disk.png"/>
-<img style="position: absolute; top: 4em; left: 16em;" src="flash.png"/>
-<img style="position: absolute; top: 4em; left: 20em;" src="file.png"/>
+<img style="position: absolute; top: 4em; left: 12.5em;" src="disk.png"/>
+<img style="position: absolute; top: 4em; left: 16.5em;" src="flash.png"/>
+<img style="position: absolute; top: 4em; left: 20.5em;" src="file.png"/>
 
 <img style="position: absolute; top: 4.75em; left: 12em;" src="arrows1.svg"/>
 
-<p class="bubble" style="position: absolute; top: 7em; left: 12em; width: 10em;">libguestfs.so</p>
+<p class="bubble" style="position: absolute; top: 7.5em; left: 13em; width: 10em;">libguestfs.so</p>
 
 <img style="position: absolute; top: 9em; left: 12em;" src="arrows2.svg"/>
 
diff --git a/2012-fosdem/300-guestfish.term b/2012-fosdem/300-guestfish.term
index 438550d..b98775b 100755
--- a/2012-fosdem/300-guestfish.term
+++ b/2012-fosdem/300-guestfish.term
@@ -2,9 +2,10 @@
 
 source functions
 
+# History.
 remember 'ls -l -h'
 remember 'file disk.img'
-remember 'guestfish --ro -i -a disk.img'
+remember 'guestfish -a disk.img -i --rw'
 
 echo "Example: Modify a disk image"
 
diff --git a/2012-fosdem/500-auditing.term b/2012-fosdem/500-auditing.term
index 94c0df1..3996078 100755
--- a/2012-fosdem/500-auditing.term
+++ b/2012-fosdem/500-auditing.term
@@ -5,7 +5,7 @@ source functions
 echo "Example: Auditing"
 
 remember 'ls -l -h'
-remember 'emacs -nw audit.py'
+remember 'emacs -nw +27 audit.py'
 remember './audit.py win7.img'
 remember './audit.py rhel6.img'
 
diff --git a/2012-fosdem/500.d/audit.py b/2012-fosdem/500.d/audit.py
index 8cdaec5..4be22f7 100755
--- a/2012-fosdem/500.d/audit.py
+++ b/2012-fosdem/500.d/audit.py
@@ -38,7 +38,8 @@ for root in roots:
 
     apps = g.inspect_list_applications (root)
     for app in apps:
-        if re.search ('firefox', app['app_name'], re.IGNORECASE):
-            print ("%s: Firefox version %s" % (disk, app['app_version']))
+        if re.search ('firefox', app['app_name'], re.I):
+            print ("%s: Firefox version %s" %
+                   (disk, app['app_version']))
 
     g.umount_all ()
diff --git a/2012-fosdem/600-prepopulate.term b/2012-fosdem/600-prepopulate.term
index 392d8dc..a479e21 100755
--- a/2012-fosdem/600-prepopulate.term
+++ b/2012-fosdem/600-prepopulate.term
@@ -4,6 +4,7 @@ source functions
 
 echo "Example: Prepopulate a disk image"
 
+remember 'ls -l -h'
 remember 'emacs -nw prepopulate.py'
 remember './prepopulate.py'
 remember 'ls -l -h'
@@ -12,6 +13,4 @@ remember 'guestfish -a disk.img -m /dev/sda1 --ro'
 
 cd 600.d
 
-rm -f disk.img
-
 terminal
diff --git a/2012-fosdem/600.d/prepopulate.py b/2012-fosdem/600.d/prepopulate.py
index 9e528e8..510beab 100755
--- a/2012-fosdem/600.d/prepopulate.py
+++ b/2012-fosdem/600.d/prepopulate.py
@@ -6,12 +6,10 @@ import guestfs
 input = "libguestfs-1.16.2.tar.gz"
 output = "disk.img"
 
-g = guestfs.GuestFS ()
-
-f = open (output, "w")
-f.truncate (512 * 1024 * 1024)
-f.close ()
+os.system ("qemu-img create -f raw %s 512M >/dev/null 2>&1" %
+           output)
 
+g = guestfs.GuestFS ()
 g.add_drive_opts (output, format = "raw", readonly = 0)
 
 g.launch ()
diff --git a/2012-fosdem/notes.txt b/2012-fosdem/notes.txt
index 21a3c59..e54bdce 100644
--- a/2012-fosdem/notes.txt
+++ b/2012-fosdem/notes.txt
@@ -1,11 +1,6 @@
 [20 minutes + 5 for questions]
 
-!!!!! DISPLAY RESOLUTION !!!!!
-
-[BEFORE:
-  guestfish -a /dev/null run
-  ~/d/techtalk-pse/techtalk-pse
-]
+./run
 
 [Audience is:
   - cloud developers
diff --git a/2012-fosdem/run b/2012-fosdem/run
new file mode 100755
index 0000000..b8e34a2
--- /dev/null
+++ b/2012-fosdem/run
@@ -0,0 +1,14 @@
+#!/bin/bash -
+# Run the talk.
+
+# Clean up everything.
+
+guestfish -a /dev/null run > /dev/null 2>&1 &
+
+find -name '*~' -delete
+
+rm -f 600.d/disk.img
+
+# Using a local copy of techtalk.
+
+$HOME/d/techtalk-pse/techtalk-pse
diff --git a/2012-fosdem/style.css b/2012-fosdem/style.css
index 165fd3b..eff357b 100644
--- a/2012-fosdem/style.css
+++ b/2012-fosdem/style.css
@@ -3,17 +3,20 @@
 body {
     background: url(redhat.jpg) no-repeat;
     background-position: 98% 0;
-    font-size: 24pt;
+    /*font-size: 24pt;*/ /* For max */
+    font-size: 20pt; /* For 1024x768 */
     font-family: liberation, helvetica;
 }
 
 body td { /* why?? */
-    font-size: 28pt;
+    /*font-size: 28pt;*/
+    font-size: 20pt;
 }
 
 h1 {
     color: rgb(204,0,0);
-    font-size: 48px;
+    /*font-size: 48px;*/
+    font-size: 40px;
     top: 8;
     left: 0;
     border-bottom: 2px solid rgb(204,0,0);
@@ -73,12 +76,12 @@ p.bubble {
 p.bubbleinverse {
     font-weight: bold;
     color: rgb(204,0,0);
-    width: 6em;
     text-align: center;
     background-color: white;
 }
 
 table.tools td {
+    font-size: 18pt;
     padding-bottom: 0.5em;
     padding-right: 0.5em;
 }
\ No newline at end of file
-- 
1.8.3.1