Move the demo up front and further slide updates.

diff --git a/2012-dublin/.gitignore b/2012-dublin/.gitignore
index f36f5e2..5b9029d 100644 (file)
--- a/2012-dublin/.gitignore
+++ b/2012-dublin/.gitignore
@@ -1,5 +1,4 @@
-0600-demo.d/f16x32.img
-0900-sparse.d/f16x32.img
-0900-sparse.d/f16x32.img.xz
+*.d/f16x32.img
+*.d/f16x32.img.xz
 bindings
 history

diff --git a/2012-dublin/0600-demo.d/.dir b/2012-dublin/0050-demo.d/.dir
similarity index 100%
rename from 2012-dublin/0600-demo.d/.dir
rename to 2012-dublin/0050-demo.d/.dir

diff --git a/2012-dublin/0600-demo.term b/2012-dublin/0050-demo.term
similarity index 82%
rename from 2012-dublin/0600-demo.term
rename to 2012-dublin/0050-demo.term
index 67da7c5..866592a 100755 (executable)
--- a/2012-dublin/0600-demo.term
+++ b/2012-dublin/0050-demo.term
@@ -4,10 +4,11 @@ source functions
 
 # History.
 remember 'ls -l -h'
+remember 'ls -l -h -s'
 remember 'file f16x32.img'
 remember 'guestfish -a f16x32.img -i --rw'
 
 echo "Example: Examine a disk image"
 
-cd 0600-demo.d
+cd 0050-demo.d
 terminal

diff --git a/2012-dublin/0900-sparse.term b/2012-dublin/0900-sparse.term
index dea1e86..803c3d3 100755 (executable)
--- a/2012-dublin/0900-sparse.term
+++ b/2012-dublin/0900-sparse.term
@@ -4,6 +4,8 @@ source functions
 
 # History.
 remember 'ls -l -h'
+remember 'ls -l -h -s'
+remember 'man virt-sparsify'
 
 echo "Example: Sparsifying a disk image"
 

diff --git a/2012-dublin/1100-summary.html b/2012-dublin/1100-summary.html
index 60ba3cf..50d27cf 100644 (file)
--- a/2012-dublin/1100-summary.html
+++ b/2012-dublin/1100-summary.html
@@ -21,5 +21,7 @@
 
 <p>
 <a href="http://git.annexia.org/">git.annexia.org</a> &rarr; libguestfs-talks
+<small>(in Tech Talk format)</small>
+</p>
 
 </div>

diff --git a/2012-dublin/README b/2012-dublin/README
index ba6143b..f37342c 100644 (file)
--- a/2012-dublin/README
+++ b/2012-dublin/README
@@ -4,5 +4,10 @@ It gives an overview of libguestfs for OpenStack / Python programmers,
 discusses some of the places that libguestfs might be used within
 OpenStack.
 
-The whole talk is designed to take around 10 minutes, with lots of
-time at the end for open discussion.
\ No newline at end of file
+The whole talk is designed to take around 15 minutes, with lots of
+time at the end for open discussion.
+
+To run the talk you'll need Tech Talk PSE >= 1.1.0.  If you don't have
+Tech Talk then just open up the HTML slides in a web browser.
+
+To start the talk, use `./run'.

diff --git a/2012-dublin/notes.txt b/2012-dublin/notes.txt
index d937b52..a018092 100644 (file)
--- a/2012-dublin/notes.txt
+++ b/2012-dublin/notes.txt
@@ -9,6 +9,8 @@ In this talk I'm going to show you a concrete example of using the
 library from Python.  Then I'm going to talk about some of the latest
 features of libguestfs and how they might be useful in OpenStack.
 
+[ ---- 0.5: Demo ---- ]
+
 [ ---- 1: Creating the handle, adding drives, launching. ---- ]
 
 *** Link to guestfs-python
@@ -24,12 +26,8 @@ features of libguestfs and how they might be useful in OpenStack.
 OpenStack uses libguestfs for file injection currently.  With
 RHEL 6.4 + mount-local support, we can do that much better.
 
-[ ---- 6: Demo ---- ]
-
 [ ---- 7: OpenStack: Resizing, partition auditing ---- ]
 
-
-
 [ ---- 8: OpenStack: sVirt ---- ]
 
 Starting with RHEL 7, libguestfs will use sVirt to confine

diff --git a/2012-dublin/run b/2012-dublin/run
index c3e4d40..93cbfb0 100755 (executable)
--- a/2012-dublin/run
+++ b/2012-dublin/run
@@ -10,7 +10,7 @@ find -name '*~' -delete
 
 # Get everything into the cache.
 guestfish -a /dev/null run > /dev/null 2>&1
-guestfish --ro -a 0600-demo.d/f16x32.img run > /dev/null 2>&1
+guestfish --ro -a 0050-demo.d/f16x32.img run > /dev/null 2>&1
 
 # Run techtalk.
 techtalk-pse