From fcc5bc0fe1f28446b6653591fb23cbfb17f3028e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Oct 2012 09:08:34 +0100 Subject: [PATCH] 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. --- 2012-dublin/.gitignore | 1 + 2012-dublin/0050-demo.term | 5 ++- 2012-dublin/0100-create.html | 2 +- 2012-dublin/0700-resizing.html | 8 ++--- 2012-dublin/0750-alignment.d/.dir | 0 2012-dublin/0750-alignment.term | 11 +++++++ 2012-dublin/0800-sysprep.html | 40 ++++++++++++++++++++++++ 2012-dublin/0900-sparse.term | 1 - 2012-dublin/{0800-svirt.html => 0950-svirt.html} | 0 2012-dublin/1000-auditing.html | 2 +- 2012-dublin/1100-summary.html | 5 +-- 2012-dublin/bashrc | 3 ++ 2012-dublin/run | 4 +-- 13 files changed, 68 insertions(+), 14 deletions(-) create mode 100644 2012-dublin/0750-alignment.d/.dir create mode 100755 2012-dublin/0750-alignment.term create mode 100644 2012-dublin/0800-sysprep.html rename 2012-dublin/{0800-svirt.html => 0950-svirt.html} (100%) diff --git a/2012-dublin/.gitignore b/2012-dublin/.gitignore index 5b9029d..94ac7b0 100644 --- 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 --- 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 --- a/2012-dublin/0100-create.html +++ b/2012-dublin/0100-create.html @@ -14,7 +14,7 @@ Shutdown

 import guestfs
 
-input = "f16x32.img"
+input = "disk.img"
 
 g = guestfs.GuestFS ()
 
diff --git a/2012-dublin/0700-resizing.html b/2012-dublin/0700-resizing.html
index 5c847ee..8b9eebf 100644
--- a/2012-dublin/0700-resizing.html
+++ b/2012-dublin/0700-resizing.html
@@ -5,9 +5,9 @@
 

 
Resizing

 
-
    
-
  •  
    virt-resize
    
-
  •  
    virt-alignment-scan
    
-

+
virt-resize

+
+virt-resize input.img output.img --expand sda2
+

 
 

diff --git a/2012-dublin/0750-alignment.d/.dir b/2012-dublin/0750-alignment.d/.dir
new file mode 100644
index 0000000..e69de29
diff --git a/2012-dublin/0750-alignment.term b/2012-dublin/0750-alignment.term
new file mode 100755
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
index 0000000..4d2e286
--- /dev/null
+++ b/2012-dublin/0800-sysprep.html
@@ -0,0 +1,40 @@
+
+
+
+
+

+
Sysprep

+
+
virt-sysprep

+
+$ virt-sysprep --list-operations
+bash-history Remove the bash history in the guest
+blkid-tab Remove blkid tab in the guest
+ca-certificates Remove CA certificates in the guest
+cron-spool Remove user at-jobs and cron-jobs
+dhcp-client-state Remove DHCP client leases
+dhcp-server-state Remove DHCP server leases
+dovecot-data Remove Dovecot (mail server) data
+flag-reconfiguration Flag the system for reconfiguration
+hostname Change the hostname of the guest
+kerberos-data Remove Kerberos data in the guest
+logfiles Remove many log files from the guest
+mail-spool Remove email from the local mail spool directory
+net-hwaddr Remove HWADDR (hard-coded MAC address) configuration
+package-manager-cache Remove package manager cache
+pam-data Remove the PAM data in the guest
+random-seed Generate random seed for guest
+rhn-systemid Remove the RHN system ID
+samba-db-log Remove the database and log files of Samba
+script Run arbitrary scripts against the guest
+smolt-uuid Remove the Smolt hardware UUID
+ssh-hostkeys Remove the SSH host keys in the guest
+ssh-userdir Remove ".ssh" directories in the guest
+sssd-db-log Remove the database and log files of sssd
+udev-persistent-net Remove udev persistent net rules
+user-account Remove the user accounts in the guest
+utmp Remove the utmp file
+yum-uuid Remove the yum UUID
+

+
+

diff --git a/2012-dublin/0900-sparse.term b/2012-dublin/0900-sparse.term
index 803c3d3..ee91aa2 100755
--- 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
--- a/2012-dublin/1000-auditing.html
+++ b/2012-dublin/1000-auditing.html
@@ -6,7 +6,7 @@
 
Licensing, Auditing, CVEs

 
 
diff --git a/2012-dublin/1100-summary.html b/2012-dublin/1100-summary.html
index 9cc54c3..382a6f5 100644
--- a/2012-dublin/1100-summary.html
+++ b/2012-dublin/1100-summary.html
@@ -13,14 +13,15 @@
 
  •  mount-local
 
  •  virt-resize
 
  •  virt-alignment-scan
-
  •  sVirt
+
  •  virt-sysprep
 
  •  virt-sparsify
+
  •  sVirt
 
  •  virt-inspector
 
  •  virt-ls
 
  •  SCAP, Open SCAP
 
 
-
    
+
    
 git.annexia.org → libguestfs-talks
 (in Tech Talk format)
 
    
diff --git a/2012-dublin/bashrc b/2012-dublin/bashrc
index e8fcde3..4c6a3c6 100644
--- 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
--- 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
-- 
1.8.3.1