From db2f21796bdcbab3f8941fd56361047233aa81f7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 16 Nov 2018 22:44:11 +0000
Subject: [PATCH] In trouble for calling it "loopback mounting", use "loop
 mounting" instead.

---
 2019-fosdem/.gitignore                                            | 2 +-
 2019-fosdem/0000-introduction.html                                | 8 ++++----
 .../{1000-loopback-mounting.d => 1000-loop-mounting.d}/.stamp     | 0
 .../{1000-loopback-mounting.term => 1000-loop-mounting.term}      | 4 ++--
 2019-fosdem/9000-final.html                                       | 4 ++--
 2019-fosdem/run                                                   | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename 2019-fosdem/{1000-loopback-mounting.d => 1000-loop-mounting.d}/.stamp (100%)
 rename 2019-fosdem/{1000-loopback-mounting.term => 1000-loop-mounting.term} (80%)

diff --git a/2019-fosdem/.gitignore b/2019-fosdem/.gitignore
index 1a52eaa..f5857df 100644
--- a/2019-fosdem/.gitignore
+++ b/2019-fosdem/.gitignore
@@ -1,6 +1,6 @@
 /bindings
 /history
-/1000-loopback-mounting.d/fedora-29.img
+/1000-loop-mounting.d/fedora-29.img
 /2000-xz-compressed.d/Fedora-Cloud-Base-29-1.2.x86_64.raw.xz
 /2200-partitioning.d/boot.img
 /2200-partitioning.d/.root.img
diff --git a/2019-fosdem/0000-introduction.html b/2019-fosdem/0000-introduction.html
index c490a94..968fe92 100644
--- a/2019-fosdem/0000-introduction.html
+++ b/2019-fosdem/0000-introduction.html
@@ -4,16 +4,16 @@
 
 <div id="titlepage">
   <p class="title">
-    Better loopback mounts with NBD &mdash; <br/>
-    <small>Take your loopback mounts to the next level with nbdkit</small>
+    Better loop mounts with NBD &mdash; <br/>
+    <small>Take your loop mounts to the next level with nbdkit</small>
   </p>
   <p><author>
       Richard W.M. Jones <br/>
       <small>rjones @ redhat.com</small>
   </author></p>
   <p style="width: 75%; margin: auto; text-align: left;">
-    <b>Loopback devices</b> let you turn a raw file into a device.
-    <b>Loopback mounts</b> let you mount filesystems from a raw file.
+    <b>Loop devices</b> let you turn a raw file into a device.
+    <b>Loop mounts</b> let you mount filesystems from a raw file.
     <b>Network Block Device</b> with the <b>nbdkit</b> server takes
     this concept to the next level, elegantly solving simple problems
     like how to mount filesystems from a compressed file, but as we
diff --git a/2019-fosdem/1000-loopback-mounting.d/.stamp b/2019-fosdem/1000-loop-mounting.d/.stamp
similarity index 100%
rename from 2019-fosdem/1000-loopback-mounting.d/.stamp
rename to 2019-fosdem/1000-loop-mounting.d/.stamp
diff --git a/2019-fosdem/1000-loopback-mounting.term b/2019-fosdem/1000-loop-mounting.term
similarity index 80%
rename from 2019-fosdem/1000-loopback-mounting.term
rename to 2019-fosdem/1000-loop-mounting.term
index f65fef1..f9bcac9 100755
--- a/2019-fosdem/1000-loopback-mounting.term
+++ b/2019-fosdem/1000-loop-mounting.term
@@ -3,7 +3,7 @@
 source functions
 
 # Title.
-export title="Loopback mounting"
+export title="Regular loop mounting"
 
 # History.
 remember 'ls -lh'
@@ -14,6 +14,6 @@ remember 'sudo mount /dev/mapper/loop0p4 /tmp/mnt'
 remember 'ls -l /tmp/mnt'
 
 ./restore
-pushd 1000-loopback-mounting.d >/dev/null
+pushd 1000-loop-mounting.d >/dev/null
 terminal
 popd >/dev/null
diff --git a/2019-fosdem/9000-final.html b/2019-fosdem/9000-final.html
index 7de2cb5..9aea925 100644
--- a/2019-fosdem/9000-final.html
+++ b/2019-fosdem/9000-final.html
@@ -5,8 +5,8 @@
 <h1>In summary</h1>
 
 <ul>
-<li> Loopback mounts &mdash; don't do much.
-<li> Loopback mounts with NBD and nbdkit &mdash; infinitely flexible.
+<li> Loop mounts &mdash; don't do much.
+<li> Loop mounts with NBD and nbdkit &mdash; infinitely flexible.
 <li> Lots of plugins, or write your own.
 <li> Software development and testing.
 <li> nbdkit 1.8 now available in all major Linux distros.
diff --git a/2019-fosdem/run b/2019-fosdem/run
index 535fe92..e8e364b 100755
--- a/2019-fosdem/run
+++ b/2019-fosdem/run
@@ -13,8 +13,8 @@ export GNOME_KEYRING_PID=
 #unset ftp_proxy
 
 # Check the files are precreated.
-if [ ! -f 1000-loopback-mounting.d/fedora-29.img ]; then
-    pushd 1000-loopback-mounting.d
+if [ ! -f 1000-loop-mounting.d/fedora-29.img ]; then
+    pushd 1000-loop-mounting.d
     virt-builder fedora-29
     popd
 fi
@@ -26,7 +26,7 @@ if [ ! -f 2000-xz-compressed.d/Fedora-Cloud-Base-29-1.2.x86_64.raw.xz ]; then
 fi
 
 if [ ! -f 2200-partitioning.d/boot.img ]; then
-    guestfish --ro -a 1000-loopback-mounting.d/fedora-29.img -i <<EOF
+    guestfish --ro -a 1000-loop-mounting.d/fedora-29.img -i <<EOF
 download /dev/sda2 2200-partitioning.d/boot.img
 download /dev/sda3 2200-partitioning.d/swap.img
 # Save to hidden file.
-- 
1.8.3.1