From 7f9ff2c70e164ae6c081481d5e93f3b60bfe1c86 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Thu, 9 May 2019 10:01:49 +1200
Subject: [PATCH] add separate curthook script to bind mount /run

---
 bin/subiquity-configure-run   | 5 +++++
 snapcraft.yaml                | 2 ++
 subiquity/models/subiquity.py | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100755 bin/subiquity-configure-run

diff --git a/bin/subiquity-configure-run b/bin/subiquity-configure-run
new file mode 100755
index 00000000..f5b35a78
--- /dev/null
+++ b/bin/subiquity-configure-run
@@ -0,0 +1,5 @@
+#!/bin/bash -eux
+
+# curtin should probably change to do this itself. But for now:
+
+mount --bind /run "$TARGET_MOUNT_POINT/run"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 0dd3f035..e24a60c4 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -11,6 +11,8 @@ apps:
     command: usr/bin/subiquity-loadkeys
   subiquity-configure-apt:
     command: usr/bin/subiquity-configure-apt
+  subiquity-configure-run:
+    command: usr/bin/subiquity-configure-run
   console-conf:
     command: usr/bin/console-conf
   probert:
diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py
index c738242b..a8f42147 100644
--- a/subiquity/models/subiquity.py
+++ b/subiquity/models/subiquity.py
@@ -178,7 +178,10 @@ class SubiquityModel:
                 },
 
             'curthooks_commands': {
-                '000-configure-apt': [
+                '000-configure-run': [
+                    '/snap/bin/subiquity.subiquity-configure-run',
+                    ],
+                '001-configure-apt': [
                     '/snap/bin/subiquity.subiquity-configure-apt',
                     sys.executable, str(self.network.has_network).lower(),
                     ],