From: Richard W.M. Jones Date: Fri, 25 Jan 2019 13:04:43 +0000 (+0000) Subject: Rearrange running order for FOSDEM talk. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=cd302727c9696d147dc14e48e9757faea1f288d9;p=libguestfs-talks.git Rearrange running order for FOSDEM talk. --- diff --git a/2019-fosdem/.gitignore b/2019-fosdem/.gitignore index 95cd107..b9bdd59 100644 --- a/2019-fosdem/.gitignore +++ b/2019-fosdem/.gitignore @@ -1,8 +1,8 @@ /bindings /history -/1000-loop-mounting.d/fedora-29.img -/2000-xz-compressed.d/Fedora-Cloud-Base-29-1.2.x86_64.raw.xz -/6500-shell.d/badblocks.sh +/2000-loop-mounting.d/fedora-29.img +/3000-xz-compressed.d/Fedora-Cloud-Base-29-1.2.x86_64.raw.xz +/5100-shell.d/badblocks.sh /nbdview/error? /nbdview/log? /nbdview/sock? \ No newline at end of file diff --git a/2019-fosdem/0000-introduction.html b/2019-fosdem/1000-introduction.html similarity index 100% rename from 2019-fosdem/0000-introduction.html rename to 2019-fosdem/1000-introduction.html diff --git a/2019-fosdem/1000-loop-mounting.d/.stamp b/2019-fosdem/2000-loop-mounting.d/.stamp similarity index 100% rename from 2019-fosdem/1000-loop-mounting.d/.stamp rename to 2019-fosdem/2000-loop-mounting.d/.stamp diff --git a/2019-fosdem/1000-loop-mounting.term b/2019-fosdem/2000-loop-mounting.term similarity index 89% rename from 2019-fosdem/1000-loop-mounting.term rename to 2019-fosdem/2000-loop-mounting.term index f9bcac9..26b0ece 100755 --- a/2019-fosdem/1000-loop-mounting.term +++ b/2019-fosdem/2000-loop-mounting.term @@ -14,6 +14,6 @@ remember 'sudo mount /dev/mapper/loop0p4 /tmp/mnt' remember 'ls -l /tmp/mnt' ./restore -pushd 1000-loop-mounting.d >/dev/null +pushd 2000-loop-mounting.d >/dev/null terminal popd >/dev/null diff --git a/2019-fosdem/2100-xz-writable.term b/2019-fosdem/2100-xz-writable.term deleted file mode 100755 index 0148154..0000000 --- a/2019-fosdem/2100-xz-writable.term +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - - -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' -remember 'ps ax | grep nbdkit' -remember 'sudo nbd-client -b 512 localhost /dev/nbd0' -remember 'sudo mount /dev/nbd0p1 /tmp/mnt' -remember 'ls -l /tmp/mnt' -remember 'sudo touch /tmp/mnt/hello-fosdem' - -./restore -pushd 2000-xz-compressed.d >/dev/null -terminal -popd >/dev/null diff --git a/2019-fosdem/3000-vmware.d/mystery.vmdk b/2019-fosdem/3000-vmware.d/mystery.vmdk deleted file mode 100755 index 8790aba..0000000 Binary files a/2019-fosdem/3000-vmware.d/mystery.vmdk and /dev/null differ diff --git a/2019-fosdem/3000-vmware.term b/2019-fosdem/3000-vmware.term deleted file mode 100755 index 42f6a05..0000000 --- a/2019-fosdem/3000-vmware.term +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - - -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' -remember 'ps ax | grep nbdkit' -remember 'sudo nbd-client -b 512 localhost /dev/nbd0' -remember 'ls -l /dev/nbd0*' -remember 'sudo mount /dev/nbd0p2 /tmp/mnt' -remember 'ls -l /tmp/mnt' - -./restore -pushd 3000-vmware.d >/dev/null -terminal -popd >/dev/null diff --git a/2019-fosdem/2000-xz-compressed.d/.stamp b/2019-fosdem/3000-xz-compressed.d/.stamp similarity index 100% rename from 2019-fosdem/2000-xz-compressed.d/.stamp rename to 2019-fosdem/3000-xz-compressed.d/.stamp diff --git a/2019-fosdem/2000-xz-compressed.term b/2019-fosdem/3000-xz-compressed.term similarity index 91% rename from 2019-fosdem/2000-xz-compressed.term rename to 2019-fosdem/3000-xz-compressed.term index c57fc13..ba43450 100755 --- a/2019-fosdem/2000-xz-compressed.term +++ b/2019-fosdem/3000-xz-compressed.term @@ -14,6 +14,6 @@ remember 'sudo mount /dev/nbd0p1 /tmp/mnt' remember 'ls -l /tmp/mnt' ./restore -pushd 2000-xz-compressed.d >/dev/null +pushd 3000-xz-compressed.d >/dev/null terminal popd >/dev/null diff --git a/2019-fosdem/2150-loop-vs-nbd.html b/2019-fosdem/4000-loop-vs-nbd.html similarity index 82% rename from 2019-fosdem/2150-loop-vs-nbd.html rename to 2019-fosdem/4000-loop-vs-nbd.html index 7ff66d1..abf5bd2 100644 --- a/2019-fosdem/2150-loop-vs-nbd.html +++ b/2019-fosdem/4000-loop-vs-nbd.html @@ -4,4 +4,4 @@

How does nbd compare to loop?

- + diff --git a/2019-fosdem/2150-loop-vs-nbd.svg b/2019-fosdem/4000-loop-vs-nbd.svg similarity index 100% rename from 2019-fosdem/2150-loop-vs-nbd.svg rename to 2019-fosdem/4000-loop-vs-nbd.svg diff --git a/2019-fosdem/2500-about-nbdkit.html b/2019-fosdem/4050-about-nbdkit.html similarity index 100% rename from 2019-fosdem/2500-about-nbdkit.html rename to 2019-fosdem/4050-about-nbdkit.html diff --git a/2019-fosdem/2510-about-nbdkit-today.html b/2019-fosdem/4100-about-nbdkit-today.html similarity index 100% rename from 2019-fosdem/2510-about-nbdkit-today.html rename to 2019-fosdem/4100-about-nbdkit-today.html diff --git a/2019-fosdem/2520-about-nbdkit-langs.html b/2019-fosdem/4200-about-nbdkit-langs.html similarity index 100% rename from 2019-fosdem/2520-about-nbdkit-langs.html rename to 2019-fosdem/4200-about-nbdkit-langs.html diff --git a/2019-fosdem/2530-about-nbdkit-filters.html b/2019-fosdem/4300-about-nbdkit-filters.html similarity index 100% rename from 2019-fosdem/2530-about-nbdkit-filters.html rename to 2019-fosdem/4300-about-nbdkit-filters.html diff --git a/2019-fosdem/2540-about-nbdkit-filters-today.html b/2019-fosdem/4400-about-nbdkit-filters-today.html similarity index 100% rename from 2019-fosdem/2540-about-nbdkit-filters-today.html rename to 2019-fosdem/4400-about-nbdkit-filters-today.html diff --git a/2019-fosdem/2550-about-nbdkit-layers.html b/2019-fosdem/4500-about-nbdkit-layers.html similarity index 100% rename from 2019-fosdem/2550-about-nbdkit-layers.html rename to 2019-fosdem/4500-about-nbdkit-layers.html diff --git a/2019-fosdem/2560-about-nbdkit-layers-command.html b/2019-fosdem/4600-about-nbdkit-layers-command.html similarity index 100% rename from 2019-fosdem/2560-about-nbdkit-layers-command.html rename to 2019-fosdem/4600-about-nbdkit-layers-command.html diff --git a/2019-fosdem/6500-shell-next b/2019-fosdem/5100-shell-next similarity index 91% rename from 2019-fosdem/6500-shell-next rename to 2019-fosdem/5100-shell-next index 00e3d49..0d7b6bd 100755 --- a/2019-fosdem/6500-shell-next +++ b/2019-fosdem/5100-shell-next @@ -12,7 +12,7 @@ remember 'sudo nbd-client -b 512 localhost /dev/nbd0' remember 'sudo badblocks /dev/nbd0' ./restore -pushd 6500-shell.d >/dev/null +pushd 5100-shell.d >/dev/null cp badblocks.sh.template badblocks.sh terminal popd >/dev/null diff --git a/2019-fosdem/6500-shell.d/.stamp b/2019-fosdem/5100-shell.d/.stamp similarity index 100% rename from 2019-fosdem/6500-shell.d/.stamp rename to 2019-fosdem/5100-shell.d/.stamp diff --git a/2019-fosdem/6500-shell.d/badblocks.sh.template b/2019-fosdem/5100-shell.d/badblocks.sh.template similarity index 100% rename from 2019-fosdem/6500-shell.d/badblocks.sh.template rename to 2019-fosdem/5100-shell.d/badblocks.sh.template diff --git a/2019-fosdem/6500-shell.sh b/2019-fosdem/5100-shell.sh similarity index 57% rename from 2019-fosdem/6500-shell.sh rename to 2019-fosdem/5100-shell.sh index 9290481..4c94545 100755 --- a/2019-fosdem/6500-shell.sh +++ b/2019-fosdem/5100-shell.sh @@ -1,4 +1,4 @@ #!/bin/bash - xfce4-terminal --disable-server \ - -x ./6500-shell-next + -x ./5100-shell-next diff --git a/2019-fosdem/6000-plugins.html b/2019-fosdem/6000-plugins.html deleted file mode 100644 index acd95ba..0000000 --- a/2019-fosdem/6000-plugins.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - -

Writing plugins

- - -
- curl - data - ext2 - file - floppy - guestfs - gzip - iso - libvirt - - lua - memory - nbd - null - ocaml - partitioning - pattern - perl - python - - random - ruby - sh - split - streaming - tar - tcl - vddk - xz - zero -
diff --git a/2019-fosdem/6100-plugins-c.html b/2019-fosdem/6100-plugins-c.html deleted file mode 100644 index d2685e5..0000000 --- a/2019-fosdem/6100-plugins-c.html +++ /dev/null @@ -1,155 +0,0 @@ - - - - -

Writing plugins in C?

- - - -
-/* The size of disk in bytes (initialized by
-   size=<SIZE> parameter). */
-static int64_t size = 0;
-
-/* Debug directory operations
-   (-D memory.dir=1). */
-int memory_debug_dir;
-
-static struct sparse_array *sa;
-
-static void
-memory_load (void)
-{
-  sa = alloc_sparse_array (memory_debug_dir);
-  if (sa == NULL) {
-    perror ("malloc");
-    exit (EXIT_FAILURE);
-  }
-}
-
-static void
-memory_unload (void)
-{
-  free_sparse_array (sa);
-}
-
-static int
-memory_config (const char *key,
-               const char *value)
-{
-  if (strcmp (key, "size") == 0) {
-    size = nbdkit_parse_size (value);
-    if (size == -1)
-      return -1;
-  }
-  else {
-    nbdkit_error
-      ("unknown parameter '%s'", key);
-    return -1;
-  }
-
-  return 0;
-}
-
-static int
-memory_config_complete (void)
-{
-  if (size == 0) {
-    nbdkit_error ("you must specify "
-      "size=<SIZE> on the "
-      "command line");
-    return -1;
-  }
-  return 0;
-}
-
-#define memory_config_help \
-  "size=<SIZE>  (required)"
-  " Size of the backing disk"
-
-/* Create the per-connection handle. */
-static void *
-memory_open (int readonly)
-{
-  /* Used only as a handle pointer. */
-  static int mh;
-
-  return &mh;
-}
-
-#define THREAD_MODEL \
-NBDKIT_THREAD_MODEL_SERIALIZE_ALL_REQUESTS
-
-/* Get the disk size. */
-static int64_t
-memory_get_size (void *handle)
-{
-  return (int64_t) size;
-}
-
-/* Read data. */
-static int
-memory_pread (void *handle, void *buf,
-              uint32_t count, uint64_t offset)
-{
-  sparse_array_read (sa, buf, count, offset);
-  return 0;
-}
-
-/* Write data. */
-static int
-memory_pwrite (void *handle,
-               const void *buf,
-               uint32_t count, uint64_t offset)
-{
-  return sparse_array_write (sa,
-    buf, count, offset);
-}
-
-/* Zero. */
-static int
-memory_zero (void *handle,
-             uint32_t count,
-             uint64_t offset, int may_trim)
-{
-  sparse_array_zero (sa, count, offset);
-  return 0;
-}
-
-/* Trim (same as zero). */
-static int
-memory_trim (void *handle,
-             uint32_t count, uint64_t offset)
-{
-  sparse_array_zero (sa, count, offset);
-  return 0;
-}
-
-static struct nbdkit_plugin plugin = {
-  .name              = "memory",
-  .version           = PACKAGE_VERSION,
-  .load              = memory_load,
-  .unload            = memory_unload,
-  .config            = memory_config,
-  .config_complete   = memory_config_complete,
-  .config_help       = memory_config_help,
-  .open              = memory_open,
-  .get_size          = memory_get_size,
-  .pread             = memory_pread,
-  .pwrite            = memory_pwrite,
-  .zero              = memory_zero,
-  .trim              = memory_trim,
-  /* In this plugin, errno is preserved
-   * properly along error return
-   * paths from failed system calls.
-   */
-  .errno_is_preserved = 1,
-};
-
-NBDKIT_REGISTER_PLUGIN(plugin)
-
diff --git a/2019-fosdem/6200-plugin-langs.html b/2019-fosdem/6200-plugin-langs.html deleted file mode 100644 index 97a7799..0000000 --- a/2019-fosdem/6200-plugin-langs.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - -

Writing plugins in other languages

- - - - -
- curl - data - ext2 - file - floppy - guestfs - gzip - iso - libvirt - - lua - memory - nbd - null - ocaml - partitioning - pattern - perl - python - - random - ruby - sh - split - streaming - tar - tcl - vddk - xz - zero -
diff --git a/2019-fosdem/6300-plugins-shell.html b/2019-fosdem/6300-plugins-shell.html deleted file mode 100644 index eb384a7..0000000 --- a/2019-fosdem/6300-plugins-shell.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - -

Writing plugins in shell script

- diff --git a/2019-fosdem/6400-plugins-shell-2.html b/2019-fosdem/6400-plugins-shell-2.html deleted file mode 100644 index 416fa45..0000000 --- a/2019-fosdem/6400-plugins-shell-2.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - -

Writing plugins in shell script

- -

-(Or any language). -We only need to write a few callbacks ... -

- - - -

-Only get_size and pread are -mandatory for shell script plugins. -

diff --git a/2019-fosdem/6450-plugins-shell-what.html b/2019-fosdem/6450-plugins-shell-what.html deleted file mode 100644 index caa0bbd..0000000 --- a/2019-fosdem/6450-plugins-shell-what.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - -

What shell script?

- - - -
-BADBLOCKS(8)                System Manager's Manual               BADBLOCKS(8)
-
-NAME
-       badblocks - search a device for bad blocks
-
-SYNOPSIS
-       badblocks  [  -svwnfBX  ]  [ -b block_size ] [ -c blocks_at_once ] [ -d
-       read_delay_factor ] [ -e max_bad_blocks ] [ -i input_file ] [  -o  out‐
-       put_file  ] [ -p num_passes ] [ -t test_pattern ] device [ last_block ]
-       [ first_block ]
-
-DESCRIPTION
-       badblocks is used to search for bad blocks on a device (usually a  disk
-       partition).   device  is  the  special file corresponding to the device
-       (e.g /dev/hdc1).  last_block is the last block to be checked; if it  is
-       not  specified,  the  last  block  on  the device is used as a default.
-       first_block is an optional parameter specifying the starting block num‐
-       ber  for  the  test, which allows the testing to start in the middle of
-       the disk.  If it is not specified the first block on the disk  is  used
-       as a default.
-
-       Important  note:  If  the output of badblocks is going to be fed to the
-       e2fsck or mke2fs programs, it is important that the block size is prop‐
-       erly  specified,  since  the block numbers which are generated are very
-
diff --git a/2019-fosdem/4000-giant.term b/2019-fosdem/6500-giant-ramdisk.term similarity index 92% rename from 2019-fosdem/4000-giant.term rename to 2019-fosdem/6500-giant-ramdisk.term index d255317..227fad2 100755 --- a/2019-fosdem/4000-giant.term +++ b/2019-fosdem/6500-giant-ramdisk.term @@ -3,7 +3,7 @@ source functions # Title. -export title="Giant disks" +export title="Giant RAM disk" # History. remember 'nbdkit memory size=$(( 2**63 - 1 ))' diff --git a/2019-fosdem/4500-testing.html b/2019-fosdem/7000-visualization.html similarity index 100% rename from 2019-fosdem/4500-testing.html rename to 2019-fosdem/7000-visualization.html diff --git a/2019-fosdem/4600-testing-delay.html b/2019-fosdem/7100-delay-filter.html similarity index 100% rename from 2019-fosdem/4600-testing-delay.html rename to 2019-fosdem/7100-delay-filter.html diff --git a/2019-fosdem/4700-testing-error.html b/2019-fosdem/7200-error-filter.html similarity index 100% rename from 2019-fosdem/4700-testing-error.html rename to 2019-fosdem/7200-error-filter.html diff --git a/2019-fosdem/4800-testing-log.html b/2019-fosdem/7300-log-filter.html similarity index 100% rename from 2019-fosdem/4800-testing-log.html rename to 2019-fosdem/7300-log-filter.html diff --git a/2019-fosdem/4900-testing-log-2.html b/2019-fosdem/7400-log-filter-2.html similarity index 75% rename from 2019-fosdem/4900-testing-log-2.html rename to 2019-fosdem/7400-log-filter-2.html index d32a407..be116c0 100644 --- a/2019-fosdem/4900-testing-log-2.html +++ b/2019-fosdem/7400-log-filter-2.html @@ -8,5 +8,5 @@ nbdkit --filter=log [...] logfile=/tmp/log - - + + diff --git a/2019-fosdem/4900-testing-log-2.svg b/2019-fosdem/7400-log-filter-2.svg similarity index 100% rename from 2019-fosdem/4900-testing-log-2.svg rename to 2019-fosdem/7400-log-filter-2.svg diff --git a/2019-fosdem/4900-testing-log-2.svg.png b/2019-fosdem/7400-log-filter-2.svg.png similarity index 100% rename from 2019-fosdem/4900-testing-log-2.svg.png rename to 2019-fosdem/7400-log-filter-2.svg.png diff --git a/2019-fosdem/5000-single-fs-next b/2019-fosdem/7500-single-fs-next similarity index 100% rename from 2019-fosdem/5000-single-fs-next rename to 2019-fosdem/7500-single-fs-next diff --git a/2019-fosdem/5000-single-fs.sh b/2019-fosdem/7500-single-fs.sh similarity index 55% rename from 2019-fosdem/5000-single-fs.sh rename to 2019-fosdem/7500-single-fs.sh index be1bfd4..0649f7f 100755 --- a/2019-fosdem/5000-single-fs.sh +++ b/2019-fosdem/7500-single-fs.sh @@ -1,4 +1,4 @@ #!/bin/bash - xfce4-terminal --disable-server \ - -x ./5000-single-fs-next + -x ./7500-single-fs-next diff --git a/2019-fosdem/5500-raid-next b/2019-fosdem/7600-raid-next similarity index 100% rename from 2019-fosdem/5500-raid-next rename to 2019-fosdem/7600-raid-next diff --git a/2019-fosdem/5500-raid.sh b/2019-fosdem/7600-raid.sh similarity index 58% rename from 2019-fosdem/5500-raid.sh rename to 2019-fosdem/7600-raid.sh index d333b36..da4a8e9 100755 --- a/2019-fosdem/5500-raid.sh +++ b/2019-fosdem/7600-raid.sh @@ -1,4 +1,4 @@ #!/bin/bash - xfce4-terminal --disable-server \ - -x ./5500-raid-next + -x ./7600-raid-next diff --git a/2019-fosdem/NOTES b/2019-fosdem/NOTES deleted file mode 100644 index e69de29..0000000 diff --git a/2019-fosdem/run b/2019-fosdem/run index 3745bef..09b55e2 100755 --- a/2019-fosdem/run +++ b/2019-fosdem/run @@ -13,14 +13,14 @@ export GNOME_KEYRING_PID= #unset ftp_proxy # Check the files are precreated. -if [ ! -f 1000-loop-mounting.d/fedora-29.img ]; then - pushd 1000-loop-mounting.d +if [ ! -f 2000-loop-mounting.d/fedora-29.img ]; then + pushd 2000-loop-mounting.d virt-builder fedora-29 popd fi -if [ ! -f 2000-xz-compressed.d/Fedora-Cloud-Base-29-1.2.x86_64.raw.xz ]; then - pushd 2000-xz-compressed.d +if [ ! -f 3000-xz-compressed.d/Fedora-Cloud-Base-29-1.2.x86_64.raw.xz ]; then + pushd 3000-xz-compressed.d wget https://download.fedoraproject.org/pub/fedora/linux/releases/29/Cloud/x86_64/images/Fedora-Cloud-Base-29-1.2.x86_64.raw.xz popd fi