From: Richard W.M. Jones Date: Sat, 1 Feb 2014 16:15:58 +0000 (+0100) Subject: Rewrite 2014 FOSDEM talk using Tech Talk PSE. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=676597f12036d77afa84e9da20a602ed1ebc8d6f;hp=b6e3143fcd15c18ccde480139210c336665a57f1;p=libguestfs-talks.git Rewrite 2014 FOSDEM talk using Tech Talk PSE. I'm sick of OpenOffice. --- diff --git a/2014-fosdem/.gitignore b/2014-fosdem/.gitignore new file mode 100644 index 0000000..5320684 --- /dev/null +++ b/2014-fosdem/.gitignore @@ -0,0 +1,4 @@ +*.d/disk.img +builder.d/nohup.out +bindings +history diff --git a/2014-fosdem/0000-introduction.html b/2014-fosdem/0000-introduction.html new file mode 100644 index 0000000..0c97be4 --- /dev/null +++ b/2014-fosdem/0000-introduction.html @@ -0,0 +1,19 @@ + + + + +
+

+ libguestfs, virt-builder,
+ virt-sparsify and virt-sysprep
+

+

+ Richard W.M. Jones
+ rjones @ redhat.com +

+

+ libguestfs is a C library for modifying
+ virtual machine disk images,
+ plus a large set of tools +

+
diff --git a/2014-fosdem/1000-virt-builder.term b/2014-fosdem/1000-virt-builder.term new file mode 100755 index 0000000..26c3aea --- /dev/null +++ b/2014-fosdem/1000-virt-builder.term @@ -0,0 +1,13 @@ +#!/bin/bash - + +source functions + +# History. +remember 'emacs -nw builder.sh' +remember 'nohup ./builder.sh' +remember 'tail -f nohup.out' + +echo "Running virt-builder" + +cd builder.d +terminal diff --git a/2014-fosdem/2000-virt-builder.html b/2014-fosdem/2000-virt-builder.html new file mode 100644 index 0000000..e5a4294 --- /dev/null +++ b/2014-fosdem/2000-virt-builder.html @@ -0,0 +1,17 @@ + + + + + + + +

★

diff --git a/2014-fosdem/2000-virt-builder.js b/2014-fosdem/2000-virt-builder.js new file mode 100644 index 0000000..ebb17e4 --- /dev/null +++ b/2014-fosdem/2000-virt-builder.js @@ -0,0 +1,12 @@ + +// poor man's file include +document.write('

Build virtual machines in seconds

') +document.write('
')
+document.write('virt-builder centos-6                  \\ 
');
+document.write('  --format qcow2 --size 20G            \\ 
');
+document.write('  --hostname cent6                     \\ 
');
+document.write('  --install @XFCE,cloud-init           \\ 
');
+document.write('  --edit \'/etc/sysconfig/keyboard:     \\ 
');
+document.write('      s/^KEYTABLE=.*/KEYTABLE="uk"/\'   \\ 
');
+document.write('  --firstboot-command \'yum -y update\'  \\ 
');
+document.write('
'); diff --git a/2014-fosdem/2100-virt-builder.html b/2014-fosdem/2100-virt-builder.html new file mode 100644 index 0000000..c0a38eb --- /dev/null +++ b/2014-fosdem/2100-virt-builder.html @@ -0,0 +1,17 @@ + + + + + + + +

★

diff --git a/2014-fosdem/2200-virt-builder.html b/2014-fosdem/2200-virt-builder.html new file mode 100644 index 0000000..c9f053d --- /dev/null +++ b/2014-fosdem/2200-virt-builder.html @@ -0,0 +1,17 @@ + + + + + + + +

★

diff --git a/2014-fosdem/2300-virt-builder.html b/2014-fosdem/2300-virt-builder.html new file mode 100644 index 0000000..89db5b2 --- /dev/null +++ b/2014-fosdem/2300-virt-builder.html @@ -0,0 +1,17 @@ + + + + + + + +

★

diff --git a/2014-fosdem/2400-virt-builder.html b/2014-fosdem/2400-virt-builder.html new file mode 100644 index 0000000..ac533e5 --- /dev/null +++ b/2014-fosdem/2400-virt-builder.html @@ -0,0 +1,17 @@ + + + + + + + +

★

diff --git a/2014-fosdem/2500-virt-builder.html b/2014-fosdem/2500-virt-builder.html new file mode 100644 index 0000000..bd6bfcc --- /dev/null +++ b/2014-fosdem/2500-virt-builder.html @@ -0,0 +1,17 @@ + + + + + + + +

★

diff --git a/2014-fosdem/3000-templates.html b/2014-fosdem/3000-templates.html new file mode 100644 index 0000000..0173bc7 --- /dev/null +++ b/2014-fosdem/3000-templates.html @@ -0,0 +1,18 @@ + + + + +
+$ virt-builder -l
+centos-6            CentOS 6.5
+cirros-0.3.1        CirrOS 0.3.1
+debian-6            Debian 6 (Squeeze)
+debian-7            Debian 7 (Wheezy)
+fedora-18           Fedora® 18
+fedora-19           Fedora® 19
+fedora-20           Fedora® 20
+scientificlinux-6   Scientific Linux 6.4
+ubuntu-10.04        Ubuntu 10.04 (Lucid)
+ubuntu-12.04        Ubuntu 12.04 (Precise)
+ubuntu-13.10        Ubuntu 13.10 (Saucy)
+
diff --git a/2014-fosdem/4000-build-method.html b/2014-fosdem/4000-build-method.html new file mode 100644 index 0000000..ebe9585 --- /dev/null +++ b/2014-fosdem/4000-build-method.html @@ -0,0 +1,16 @@ + + + + +

Build your own templates

+ +

+
+virt-install
+↓
+virt-sysprep
+↓
+virt-sparsify
+↓
+xz
+

diff --git a/2014-fosdem/5000-virt-sparsify.html b/2014-fosdem/5000-virt-sparsify.html new file mode 100644 index 0000000..5eff749 --- /dev/null +++ b/2014-fosdem/5000-virt-sparsify.html @@ -0,0 +1,51 @@ + + + + +

virt-sparsify

+ + + + + +

+/
+/bin
+/boot
+/dev
+/etc
+/home
+/lib +

+ + diff --git a/2014-fosdem/5100-virt-sparsify.html b/2014-fosdem/5100-virt-sparsify.html new file mode 100644 index 0000000..2430617 --- /dev/null +++ b/2014-fosdem/5100-virt-sparsify.html @@ -0,0 +1,49 @@ + + + + +

virt-sparsify

+ + + +

+↓
+virt-sparsify f20.img f20.out
+↓
+

+ + + +

+/
+/bin
+/boot
+/dev
+/etc
+/home
+/lib +

+ + diff --git a/2014-fosdem/6000-build-method.html b/2014-fosdem/6000-build-method.html new file mode 100644 index 0000000..ebe9585 --- /dev/null +++ b/2014-fosdem/6000-build-method.html @@ -0,0 +1,16 @@ + + + + +

Build your own templates

+ +

+
+virt-install
+↓
+virt-sysprep
+↓
+virt-sparsify
+↓
+xz
+

diff --git a/2014-fosdem/7000-results.html b/2014-fosdem/7000-results.html new file mode 100644 index 0000000..9bc8b26 --- /dev/null +++ b/2014-fosdem/7000-results.html @@ -0,0 +1,44 @@ + + + + +

virt-sparsify & xz

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Disk size Used Final
CirrOS 0.3.1 39 18 11 MB
Debian 7 4096 719 142 MB
Fedora 20 6144 826 174 MB
Ubuntu 13.10 4096 1019 187 MB
diff --git a/2014-fosdem/8000-virt-builder-running.term b/2014-fosdem/8000-virt-builder-running.term new file mode 100755 index 0000000..0da4c8d --- /dev/null +++ b/2014-fosdem/8000-virt-builder-running.term @@ -0,0 +1,11 @@ +#!/bin/bash - + +source functions + +# History. +remember 'tail -f nohup.out' + +#echo "How is virt-builder doing?" + +cd builder.d +terminal diff --git a/2014-fosdem/9000-final.html b/2014-fosdem/9000-final.html new file mode 100644 index 0000000..0601672 --- /dev/null +++ b/2014-fosdem/9000-final.html @@ -0,0 +1,44 @@ + + + + +

libguestfs.org

+ +

+ + + + + + +
+ guestfish
+ guestmount
+ virt-alignment-scan
+ virt-builder
+ virt-cat
+ virt-copy-in
+ virt-copy-out
+ virt-df
+ virt-diff
+ virt-edit
+ 		+ virt-filesystems
+ virt-format
+ virt-inspector
+ virt-ls
+ virt-make-fs
+ virt-rescue
+ virt-resize
+ virt-sparsify
+ virt-sysprep
+ 		+ virt-tar-in
+ virt-tar-out
+ virt-win-reg
+ hivexget
+ hivexml
+ hivexregedit
+ hivexsh
+
+

diff --git a/2014-fosdem/9500-shell.term b/2014-fosdem/9500-shell.term new file mode 100755 index 0000000..9c288fc --- /dev/null +++ b/2014-fosdem/9500-shell.term @@ -0,0 +1,13 @@ +#!/bin/bash - + +source functions + +# History. +remember 'killall builder.sh; killall virt-builder' +remember 'virt-builder fedora-20' +remember 'guestfish -a fedora-20.img -i' + +echo "libguestfs" +sleep 1 + +terminal diff --git a/2014-fosdem/bashrc b/2014-fosdem/bashrc new file mode 100644 index 0000000..4c6a3c6 --- /dev/null +++ b/2014-fosdem/bashrc @@ -0,0 +1,17 @@ +# -*- 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 +commandcol='\e[1;31m' ;# colour for the typed command +outputcol='\e[0m' ;# colour for command output + +export PS1="\n\[$promptcol\]\$ \[$commandcol\]" + +trap 'echo -ne "$outputcol"' DEBUG + +# Load key bindings (if any). +bind -f $talkdir/bindings diff --git a/2014-fosdem/builder.sh b/2014-fosdem/builder.d/builder.sh similarity index 84% rename from 2014-fosdem/builder.sh rename to 2014-fosdem/builder.d/builder.sh index a5cde06..5dc768b 100755 --- a/2014-fosdem/builder.sh +++ b/2014-fosdem/builder.d/builder.sh @@ -1,8 +1,5 @@ #!/bin/bash - -VIRT_BUILDER_SOURCE=file://$HOME/d/libguestfs/builder/website/index.asc -export VIRT_BUILDER_SOURCE - guests=( $( virt-builder -l | awk '{print $1}' ) ) diff --git a/2014-fosdem/code.js b/2014-fosdem/code.js new file mode 100644 index 0000000..e69de29 diff --git a/2014-fosdem/functions b/2014-fosdem/functions new file mode 100644 index 0000000..7baaed0 --- /dev/null +++ b/2014-fosdem/functions @@ -0,0 +1,40 @@ +# -*- shell-script -*- +# This creates some standard functions. See also $talkdir/bashrc +# which runs in the same bash context as the terminal. + +# Place any local environment variables and settings in "local". +if [ -f local ]; then source local; fi + +# Environment variables. +export HISTFILE=$talkdir/history +export PATH=$talkdir:$PATH +export EDITOR="emacs -nw" + +# remember +# +# This function does two things: (1) It adds the command and arguments +# to the shell history, so that commands can be recalled using up +# arrow or reverse search. (2) It makes a function key recall the +# command. The first command is assigned to F2, the second to F3 and +# so forth. + +rm -f $HISTFILE +touch $HISTFILE +rm -f $talkdir/bindings +touch bindings + +fnum=2 +keys=(- OP OQ OR OS '[15~' '[17~' '[18~' '[19~' '[20~' '[21~') + +remember () +{ + echo "$@" >> $HISTFILE + echo \"\\e${keys[$fnum]}\":\"\\C-k \\C-u"$@"\" >> $talkdir/bindings + ((fnum++)) +} + +terminal () +{ + chmod -w $HISTFILE + /bin/bash --rcfile $talkdir/bashrc "$@" +} diff --git a/2014-fosdem/redhat.png b/2014-fosdem/redhat.png new file mode 100644 index 0000000..f50076a Binary files /dev/null and b/2014-fosdem/redhat.png differ diff --git a/2014-fosdem/run b/2014-fosdem/run new file mode 100755 index 0000000..e78c842 --- /dev/null +++ b/2014-fosdem/run @@ -0,0 +1,24 @@ +#!/bin/bash - +# Run the talk. + +# Avoid GNOME keyring stupidity +export GNOME_KEYRING_CONTROL= +export GNOME_KEYRING_PID= + +# Set virt-builder environment for no-network. +export VIRT_BUILDER_SOURCE=file:///home/rjones/d/libguestfs/builder/website/index.asc + +# Clean up everything. +find -name '*~' -delete +rm -f builder.d/*.img + +# No proxy. +unset http_proxy +unset https_proxy +unset ftp_proxy + +# Get everything into the cache. +guestfish -a /dev/null run > /dev/null & + +# Run techtalk. +techtalk-pse diff --git a/2014-fosdem/set-prompt b/2014-fosdem/set-prompt deleted file mode 100644 index d1db9b6..0000000 --- a/2014-fosdem/set-prompt +++ /dev/null @@ -1 +0,0 @@ -export PS1='\$ ' diff --git a/2014-fosdem/style.css b/2014-fosdem/style.css new file mode 100644 index 0000000..e32fc48 --- /dev/null +++ b/2014-fosdem/style.css @@ -0,0 +1,67 @@ +/* Red Hat red is rgb(204,0,0). */ + +body { + background: url(redhat.png) no-repeat; + background-position: 98% 0; + font-size: 28pt; /* For max */ + /* font-size: 20pt; */ /* For 1024x768 */ + /* font-family: liberation, helvetica; */ + font-family: helvetica; +} + +body td, body th { /* why?? */ + font-size: 24pt; + padding-bottom: 8px; +} + +h1 { + color: rgb(204,0,0); + /*font-size: 48px;*/ + font-size: 40px; + top: 8; + left: 0; + border-bottom: 2px solid rgb(204,0,0); +} + +b { + color: rgb(204,0,0); +} + +div#titlepage { + margin-top: 100px; + text-align: center; +} + +div#titlepage p.title { + color: rgb(204,0,0); + font-weight: bold; + font-size: 48px; +} + +div#titlepage author { + font-size: 36px; +} + +/* Code */ +pre.code { + margin-left: 1em; + background: #eee; +} + +code { + color: rgb(204,0,0); +} + +/* Bullet points */ +li { + padding-bottom: 16px; +} + +/* Logo */ +img#fish { + position: absolute; + top: 128px; + right: 32px; + width: 200px; + /*height: 256px;*/ +} \ No newline at end of file