[gnome-build-meta/valentindavid/fix-repartitioning] Fix repartitioning

[Valentin David <valentindavid src gnome org>]

commit d913540c40b1dc1e588362a4816bf1109946f98e
Author: Valentin David <valentin david codethink co uk>
Date:   Thu May 7 17:03:40 2020 +0200

    Fix repartitioning
    
    EOS repartitioning scripts was passing back input to sfdisk that is
    not accepted. That stopped sfdisk script execution and the
    repartitioning.

 elements/vm/eos-repartition.bst                      |  2 ++
 files/vm/eos-repartition/fix-sector-size-issue.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+)
---
diff --git a/elements/vm/eos-repartition.bst b/elements/vm/eos-repartition.bst
index c71272e6..db4d4703 100644
--- a/elements/vm/eos-repartition.bst
+++ b/elements/vm/eos-repartition.bst
@@ -3,6 +3,8 @@ kind: manual
 sources:
 - kind: tar
   url: github_com:endlessm/eos-boot-helper/archive/Release_3.7.7.tar.gz
+- kind: patch
+  path: files/vm/eos-repartition/fix-sector-size-issue.patch
 
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/files/vm/eos-repartition/fix-sector-size-issue.patch 
b/files/vm/eos-repartition/fix-sector-size-issue.patch
new file mode 100644
index 00000000..9a2e8187
--- /dev/null
+++ b/files/vm/eos-repartition/fix-sector-size-issue.patch
@@ -0,0 +1,13 @@
+diff -ur eos-repartition.old/dracut/repartition/endless-repartition.sh 
eos-repartition/dracut/repartition/endless-repartition.sh
+--- eos-repartition.old/dracut/repartition/endless-repartition.sh      2020-05-07 16:33:35.337556363 +0200
++++ eos-repartition/dracut/repartition/endless-repartition.sh  2020-05-07 16:35:04.488211539 +0200
+@@ -195,6 +195,9 @@
+ $preserve_partition"
+ fi
+ 
++# sfdisk does not seem to like to redefinition of sector-size
++parts=$(echo "$parts" | sed -e '/^sector-size:/d')
++
+ echo "$parts"
+ echo "$parts" | sfdisk --force --no-reread $root_disk
+ ret=$?