Various updates for final Dublin talk.

- Rename f16x32.img -> disk.img
- colorls
- Split virt-alignment-scan to its own slide.
- Fix virt-inspector bubble.
- Move some slides around.

diff --git a/2012-dublin/.gitignore b/2012-dublin/.gitignore
index 5b9029d..94ac7b0 100644 (file)
--- a/2012-dublin/.gitignore
+++ b/2012-dublin/.gitignore
@@ -1,3 +1,4 @@
+*.d/disk.img
 *.d/f16x32.img
 *.d/f16x32.img.xz
 bindings

diff --git a/2012-dublin/0050-demo.term b/2012-dublin/0050-demo.term
index 866592a..6c8f222 100755 (executable)
--- a/2012-dublin/0050-demo.term
+++ b/2012-dublin/0050-demo.term
@@ -3,10 +3,9 @@
 source functions
 
 # History.
-remember 'ls -l -h'
 remember 'ls -l -h -s'
-remember 'file f16x32.img'
-remember 'guestfish -a f16x32.img -i --rw'
+remember 'file disk.img'
+remember 'guestfish -a disk.img -i --rw'
 
 echo "Example: Examine a disk image"
 

diff --git a/2012-dublin/0100-create.html b/2012-dublin/0100-create.html
index 5012b7e..92143be 100644 (file)
--- a/2012-dublin/0100-create.html
+++ b/2012-dublin/0100-create.html
@@ -14,7 +14,7 @@ Shutdown</p>
 <pre class="code">
 <b>import guestfs</b>
 
-input = "f16x32.img"
+input = "disk.img"
 
 <b>g = guestfs.GuestFS</b> ()
 

diff --git a/2012-dublin/0700-resizing.html b/2012-dublin/0700-resizing.html
index 5c847ee..8b9eebf 100644 (file)
--- a/2012-dublin/0700-resizing.html
+++ b/2012-dublin/0700-resizing.html
@@ -5,9 +5,9 @@
 <div>
 <h1>Resizing</h1>
 
-<ul>
-<li> <p class="bubble">virt-resize</p>
-<li> <p class="bubble" style="width: 12em;">virt-alignment-scan</p>
-</ul>
+<p class="bubble">virt-resize</p>
+<pre>
+virt-resize input.img output.img --expand sda2
+</pre>
 
 </div>

diff --git a/2012-dublin/0750-alignment.d/.dir b/2012-dublin/0750-alignment.d/.dir
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/2012-dublin/0750-alignment.term b/2012-dublin/0750-alignment.term
new file mode 100755 (executable)
index 0000000..1bd5263
--- /dev/null
+++ b/2012-dublin/0750-alignment.term
@@ -0,0 +1,11 @@
+#!/bin/bash -
+
+source functions
+
+# History.
+remember 'virt-alignment-scan -a disk.img'
+
+echo "Example: Alignment scanning"
+
+cd 0750-alignment.d
+terminal

diff --git a/2012-dublin/0800-sysprep.html b/2012-dublin/0800-sysprep.html
new file mode 100644 (file)
index 0000000..4d2e286
--- /dev/null
+++ b/2012-dublin/0800-sysprep.html
@@ -0,0 +1,40 @@
+<meta charset="utf-8"/>
+<link rel="stylesheet" href="style.css" type="text/css"/>
+<script src="code.js" type="text/javascript"></script>
+
+<div>
+<h1>Sysprep</h1>
+
+<p class="bubble" style="width: 10em;">virt-sysprep</p>
+<pre style="font-size: 16pt;">
+$ <b>virt-sysprep --list-operations</b>
+<b>bash-history</b> Remove the bash history in the guest
+<b>blkid-tab</b> Remove blkid tab in the guest
+<b>ca-certificates</b> Remove CA certificates in the guest
+<b>cron-spool</b> Remove user at-jobs and cron-jobs
+<b>dhcp-client-state</b> Remove DHCP client leases
+<b>dhcp-server-state</b> Remove DHCP server leases
+<b>dovecot-data</b> Remove Dovecot (mail server) data
+<b>flag-reconfiguration</b> Flag the system for reconfiguration
+<b>hostname</b> Change the hostname of the guest
+<b>kerberos-data</b> Remove Kerberos data in the guest
+<b>logfiles</b> Remove many log files from the guest
+<b>mail-spool</b> Remove email from the local mail spool directory
+<b>net-hwaddr</b> Remove HWADDR (hard-coded MAC address) configuration
+<b>package-manager-cache</b> Remove package manager cache
+<b>pam-data</b> Remove the PAM data in the guest
+<b>random-seed</b> Generate random seed for guest
+<b>rhn-systemid</b> Remove the RHN system ID
+<b>samba-db-log</b> Remove the database and log files of Samba
+<b>script</b> Run arbitrary scripts against the guest
+<b>smolt-uuid</b> Remove the Smolt hardware UUID
+<b>ssh-hostkeys</b> Remove the SSH host keys in the guest
+<b>ssh-userdir</b> Remove ".ssh" directories in the guest
+<b>sssd-db-log</b> Remove the database and log files of sssd
+<b>udev-persistent-net</b> Remove udev persistent net rules
+<b>user-account</b> Remove the user accounts in the guest
+<b>utmp</b> Remove the utmp file
+<b>yum-uuid</b> Remove the yum UUID
+</pre>
+
+</div>

diff --git a/2012-dublin/0900-sparse.term b/2012-dublin/0900-sparse.term
index 803c3d3..ee91aa2 100755 (executable)
--- a/2012-dublin/0900-sparse.term
+++ b/2012-dublin/0900-sparse.term
@@ -3,7 +3,6 @@
 source functions
 
 # History.
-remember 'ls -l -h'
 remember 'ls -l -h -s'
 remember 'man virt-sparsify'
 

diff --git a/2012-dublin/0800-svirt.html b/2012-dublin/0950-svirt.html
similarity index 100%
rename from 2012-dublin/0800-svirt.html
rename to 2012-dublin/0950-svirt.html

diff --git a/2012-dublin/1000-auditing.html b/2012-dublin/1000-auditing.html
index 3577f4c..425100d 100644 (file)
--- a/2012-dublin/1000-auditing.html
+++ b/2012-dublin/1000-auditing.html
@@ -6,7 +6,7 @@
 <h1>Licensing, Auditing, CVEs</h1>
 
 <ul>
-<li> <p class="bubble">virt-inspector</p>
+<li> <p class="bubble" style="width:10em;">virt-inspector</p>
 <li> <p class="bubble">virt-ls</p>
 <li> <a href="http://www.open-scap.org">www.open-scap.org</a>
 </ul>

diff --git a/2012-dublin/1100-summary.html b/2012-dublin/1100-summary.html
index 9cc54c3..382a6f5 100644 (file)
--- a/2012-dublin/1100-summary.html
+++ b/2012-dublin/1100-summary.html
@@ -13,14 +13,15 @@
 <li> mount-local
 <li> virt-resize
 <li> virt-alignment-scan
-<li> sVirt
+<li> virt-sysprep
 <li> virt-sparsify
+<li> sVirt
 <li> virt-inspector
 <li> virt-ls
 <li> SCAP, <a href="http://www.open-scap.org">Open SCAP</a>
 </ul>
 
-<p>
+<p style="position: absolute; top: 400px; left: 50%; width: 45%;">
 <a href="http://git.annexia.org/">git.annexia.org</a> &rarr; libguestfs-talks
 <small>(in Tech Talk format)</small>
 </p>

diff --git a/2012-dublin/bashrc b/2012-dublin/bashrc
index e8fcde3..4c6a3c6 100644 (file)
--- a/2012-dublin/bashrc
+++ b/2012-dublin/bashrc
@@ -1,5 +1,8 @@
 # -*- shell-script -*-
 
+# Colour ls.
+if [ -f /etc/profile.d/colorls.sh ]; then . /etc/profile.d/colorls.sh; fi
+
 # Fancy prompt colours (see
 # https://wiki.archlinux.org/index.php/Color_Bash_Prompt)
 promptcol='\e[0;32m'      ;# colour for the prompt

diff --git a/2012-dublin/run b/2012-dublin/run
index 93cbfb0..ed31b35 100755 (executable)
--- a/2012-dublin/run
+++ b/2012-dublin/run
@@ -9,8 +9,8 @@ export GNOME_KEYRING_PID=
 find -name '*~' -delete
 
 # Get everything into the cache.
-guestfish -a /dev/null run > /dev/null 2>&1
-guestfish --ro -a 0050-demo.d/f16x32.img run > /dev/null 2>&1
+guestfish -a /dev/null run > /dev/null
+guestfish --ro -a 0050-demo.d/disk.img -i exit > /dev/null
 
 # Run techtalk.
 techtalk-pse