From 135506aa2a85a0b3e21b9da77db918db6123994f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 16 Nov 2018 16:53:21 +0000 Subject: [PATCH] Abstract title and print blank lines to skip Bluejeans video window. --- 2019-fosdem/1000-loopback-mounting.term | 5 +++-- 2019-fosdem/2000-xz-compressed.term | 5 +++-- 2019-fosdem/2100-xz-writable.term | 5 +++-- 2019-fosdem/2200-partitioning.term | 5 +++-- 2019-fosdem/3000-vmware.term | 5 +++-- 2019-fosdem/4000-giant.term | 5 +++-- 2019-fosdem/5000-single-fs-next | 5 +++-- 2019-fosdem/5500-raid-next | 5 +++-- 2019-fosdem/bashrc | 5 +++++ 9 files changed, 29 insertions(+), 16 deletions(-) diff --git a/2019-fosdem/1000-loopback-mounting.term b/2019-fosdem/1000-loopback-mounting.term index 9302414..f7d993e 100755 --- a/2019-fosdem/1000-loopback-mounting.term +++ b/2019-fosdem/1000-loopback-mounting.term @@ -2,6 +2,9 @@ source functions +# Title. +export title="Loopback mounting" + # History. remember 'sudo losetup --list' remember 'ls -lh fedora-29.img' @@ -10,8 +13,6 @@ remember 'sudo kpartx -av /dev/loop0' remember 'sudo mount /dev/mapper/loop0p4 /tmp/mnt' remember 'ls -l /tmp/mnt' -echo "Loopback mounting" - ./restore pushd 1000-loopback-mounting.d >/dev/null terminal diff --git a/2019-fosdem/2000-xz-compressed.term b/2019-fosdem/2000-xz-compressed.term index f73a32e..c57fc13 100755 --- a/2019-fosdem/2000-xz-compressed.term +++ b/2019-fosdem/2000-xz-compressed.term @@ -2,6 +2,9 @@ source functions +# Title. +export title="XZ compressed image" + # History. remember 'ls -lh Fedora-Cloud-Base-29-1.2.x86_64.raw.xz' remember 'nbdkit xz Fedora-Cloud-Base-29-1.2.x86_64.raw.xz' @@ -10,8 +13,6 @@ remember 'sudo nbd-client -b 512 localhost /dev/nbd0' remember 'sudo mount /dev/nbd0p1 /tmp/mnt' remember 'ls -l /tmp/mnt' -echo "XZ compressed image" - ./restore pushd 2000-xz-compressed.d >/dev/null terminal diff --git a/2019-fosdem/2100-xz-writable.term b/2019-fosdem/2100-xz-writable.term index 41816bb..0148154 100755 --- a/2019-fosdem/2100-xz-writable.term +++ b/2019-fosdem/2100-xz-writable.term @@ -2,6 +2,9 @@ source functions +# Title. +export title="XZ with a writable filter" + # History. remember 'ls -lh Fedora-Cloud-Base-29-1.2.x86_64.raw.xz' remember 'nbdkit --filter=cow xz Fedora-Cloud-Base-29-1.2.x86_64.raw.xz' @@ -11,8 +14,6 @@ remember 'sudo mount /dev/nbd0p1 /tmp/mnt' remember 'ls -l /tmp/mnt' remember 'sudo touch /tmp/mnt/hello-fosdem' -echo "XZ with a writable filter" - ./restore pushd 2000-xz-compressed.d >/dev/null terminal diff --git a/2019-fosdem/2200-partitioning.term b/2019-fosdem/2200-partitioning.term index 139c403..261a9b4 100755 --- a/2019-fosdem/2200-partitioning.term +++ b/2019-fosdem/2200-partitioning.term @@ -2,6 +2,9 @@ source functions +# Title. +export title="Create partitions" + # History. remember 'ls' remember 'nbdkit partitioning boot.img mbr-id=0x82 swap.img mbr-id=0x83 root.img' @@ -13,8 +16,6 @@ remember 'ls -l /tmp/mnt' remember 'cat /tmp/mnt/etc/fedora-release' remember 'touch /tmp/mnt/hello-fosdem' -echo "Create partitions" - ./restore pushd 2200-partitioning.d >/dev/null terminal diff --git a/2019-fosdem/3000-vmware.term b/2019-fosdem/3000-vmware.term index 5524760..42f6a05 100755 --- a/2019-fosdem/3000-vmware.term +++ b/2019-fosdem/3000-vmware.term @@ -2,6 +2,9 @@ source functions +# Title. +export title="VMware (VDDK)" + # History. remember 'ls' remember 'LD_LIBRARY_PATH=~/tmp/vddk/vmware-vix-disklib-distrib/lib64 nbdkit vddk file=$PWD/mystery.vmdk' @@ -11,8 +14,6 @@ remember 'ls -l /dev/nbd0*' remember 'sudo mount /dev/nbd0p2 /tmp/mnt' remember 'ls -l /tmp/mnt' -echo "VMware (VDDK)" - ./restore pushd 3000-vmware.d >/dev/null terminal diff --git a/2019-fosdem/4000-giant.term b/2019-fosdem/4000-giant.term index b55eafb..d255317 100755 --- a/2019-fosdem/4000-giant.term +++ b/2019-fosdem/4000-giant.term @@ -2,6 +2,9 @@ source functions +# Title. +export title="Giant disks" + # History. remember 'nbdkit memory size=$(( 2**63 - 1 ))' remember 'sudo nbd-client -b 512 localhost /dev/nbd0' @@ -11,7 +14,5 @@ remember 'sudo mkfs.btrfs -K /dev/nbd0p1' remember 'sudo mount /dev/nbd0p1 /tmp/mnt' remember 'df -h /tmp/mnt' -echo "Giant disks" - ./restore terminal diff --git a/2019-fosdem/5000-single-fs-next b/2019-fosdem/5000-single-fs-next index 972fcbb..947939c 100755 --- a/2019-fosdem/5000-single-fs-next +++ b/2019-fosdem/5000-single-fs-next @@ -2,6 +2,9 @@ source functions +# Title. +export title="Visualising a single filesystem" + # History. remember 'nbdkit --filter=log --filter=delay memory size=64M logfile=/tmp/log rdelay=50ms wdelay=50ms' remember './nbdview.tcl /tmp/log 67108864 &' @@ -11,8 +14,6 @@ remember 'sudo mkfs -t ext4 /dev/nbd0p1' remember 'sudo mount /dev/nbd0p1 /tmp/mnt' remember 'sudo chown rjones /tmp/mnt/' -echo "Visualising a single filesystem" - ./restore pushd nbdview >/dev/null terminal diff --git a/2019-fosdem/5500-raid-next b/2019-fosdem/5500-raid-next index e3d02e1..043f52a 100755 --- a/2019-fosdem/5500-raid-next +++ b/2019-fosdem/5500-raid-next @@ -2,6 +2,9 @@ source functions +# Title. +export title="Visualising RAID" + # History. remember 'i=1; rm -f sock$i; nbdkit -U sock$i --filter=error --filter=log --filter=delay memory size=64M logfile=log$i error-rate=100% error-file=error$i rdelay=50ms wdelay=50ms' remember './nbdraid.tcl 5 67108864 log%s error%s &' @@ -12,8 +15,6 @@ remember 'sudo mkfs -t ext4 /dev/md0p1' remember 'sudo mount /dev/md0p1 /tmp/mnt' remember 'sudo chown rjones /tmp/mnt/' -echo "Visualising RAID" - ./restore pushd nbdview >/dev/null rm -f sock? error? log? diff --git a/2019-fosdem/bashrc b/2019-fosdem/bashrc index 4c6a3c6..eefde76 100644 --- a/2019-fosdem/bashrc +++ b/2019-fosdem/bashrc @@ -15,3 +15,8 @@ trap 'echo -ne "$outputcol"' DEBUG # Load key bindings (if any). bind -f $talkdir/bindings + +# Skip a few lines because BlueJeans video covers top left of the +# display. (Remove for FOSDEM). +for i in `seq 1 10`; do echo; done +echo $title -- 1.8.3.1