From 9537b5c3216a6755bade498c5cf4d331c084a0a6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 16 Nov 2018 16:41:36 +0000
Subject: [PATCH] Move partitioning slide earlier.

---
 2019-fosdem/.gitignore                                       |  8 ++++----
 .../{3500-partitioning.d => 2200-partitioning.d}/.stamp      |  0
 .../{3500-partitioning.term => 2200-partitioning.term}       |  2 +-
 2019-fosdem/run                                              | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename 2019-fosdem/{3500-partitioning.d => 2200-partitioning.d}/.stamp (100%)
 rename 2019-fosdem/{3500-partitioning.term => 2200-partitioning.term} (92%)

diff --git a/2019-fosdem/.gitignore b/2019-fosdem/.gitignore
index 4148a9c..349864b 100644
--- a/2019-fosdem/.gitignore
+++ b/2019-fosdem/.gitignore
@@ -2,10 +2,10 @@
 /history
 /1000-loopback-mounting.d/fedora-29.img
 /2000-xz-compressed.d/Fedora-Cloud-Base-29-1.2.x86_64.raw.xz
-/3500-partitioning.d/boot.img
-/3500-partitioning.d/.root.img
-/3500-partitioning.d/root.img
-/3500-partitioning.d/swap.img
+/2200-partitioning.d/boot.img
+/2200-partitioning.d/.root.img
+/2200-partitioning.d/root.img
+/2200-partitioning.d/swap.img
 /nbdview/error?
 /nbdview/log?
 /nbdview/sock?
\ No newline at end of file
diff --git a/2019-fosdem/3500-partitioning.d/.stamp b/2019-fosdem/2200-partitioning.d/.stamp
similarity index 100%
rename from 2019-fosdem/3500-partitioning.d/.stamp
rename to 2019-fosdem/2200-partitioning.d/.stamp
diff --git a/2019-fosdem/3500-partitioning.term b/2019-fosdem/2200-partitioning.term
similarity index 92%
rename from 2019-fosdem/3500-partitioning.term
rename to 2019-fosdem/2200-partitioning.term
index 4f216dc..139c403 100755
--- a/2019-fosdem/3500-partitioning.term
+++ b/2019-fosdem/2200-partitioning.term
@@ -16,6 +16,6 @@ remember 'touch /tmp/mnt/hello-fosdem'
 echo "Create partitions"
 
 ./restore
-pushd 3500-partitioning.d >/dev/null
+pushd 2200-partitioning.d >/dev/null
 terminal
 popd >/dev/null
diff --git a/2019-fosdem/run b/2019-fosdem/run
index fe4a70e..535fe92 100755
--- a/2019-fosdem/run
+++ b/2019-fosdem/run
@@ -25,18 +25,18 @@ if [ ! -f 2000-xz-compressed.d/Fedora-Cloud-Base-29-1.2.x86_64.raw.xz ]; then
     popd
 fi
 
-if [ ! -f 3500-partitioning.d/boot.img ]; then
+if [ ! -f 2200-partitioning.d/boot.img ]; then
     guestfish --ro -a 1000-loopback-mounting.d/fedora-29.img -i <<EOF
-download /dev/sda2 3500-partitioning.d/boot.img
-download /dev/sda3 3500-partitioning.d/swap.img
+download /dev/sda2 2200-partitioning.d/boot.img
+download /dev/sda3 2200-partitioning.d/swap.img
 # Save to hidden file.
-download /dev/sda4 3500-partitioning.d/.root.img
+download /dev/sda4 2200-partitioning.d/.root.img
 EOF
 fi
 
 # Restore original root.img before each run.
-if ! cmp -s 3500-partitioning.d/{.root.img,root.img}; then
-    cp 3500-partitioning.d/{.root.img,root.img}
+if ! cmp -s 2200-partitioning.d/{.root.img,root.img}; then
+    cp 2200-partitioning.d/{.root.img,root.img}
 fi
 
 # Create mountpoint.
-- 
1.8.3.1