From fac360b8e7a8aca764d1e80d66a3aaca5980a26e Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Mon, 29 Mar 2021 14:49:59 +1300
Subject: [PATCH] remove curtin hook to bind mount /run into target now curtin
 does this

Curtin added this in version 19.3 so we can stop doing it.
---
 bin/subiquity-configure-run   | 5 -----
 setup.py                      | 1 -
 snapcraft.yaml                | 3 ---
 subiquity/models/subiquity.py | 3 ---
 4 files changed, 12 deletions(-)
 delete mode 100755 bin/subiquity-configure-run

diff --git a/bin/subiquity-configure-run b/bin/subiquity-configure-run
deleted file mode 100755
index f5b35a78..00000000
--- a/bin/subiquity-configure-run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -eux
-
-# curtin should probably change to do this itself. But for now:
-
-mount --bind /run "$TARGET_MOUNT_POINT/run"
diff --git a/setup.py b/setup.py
index b708fb3a..d635710b 100644
--- a/setup.py
+++ b/setup.py
@@ -109,7 +109,6 @@ setup(name='subiquity',
           'bin/console-conf-wrapper',
           'bin/subiquity-debug',
           'bin/subiquity-configure-apt',
-          'bin/subiquity-configure-run',
           'bin/subiquity-loadkeys',
           'bin/subiquity-service',
       ],
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4390dd51..c6bd897f 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -14,8 +14,6 @@ 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:
@@ -109,7 +107,6 @@ parts:
       'bin/subiquity-service': usr/bin/subiquity-service
       'bin/subiquity-server': usr/bin/subiquity-server
       'bin/subiquity-configure-apt': usr/bin/subiquity-configure-apt
-      'bin/subiquity-configure-run': usr/bin/subiquity-configure-run
   users-and-groups:
     plugin: nil
     build-packages:
diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py
index 0a55c7c5..17bfa258 100644
--- a/subiquity/models/subiquity.py
+++ b/subiquity/models/subiquity.py
@@ -279,9 +279,6 @@ class SubiquityModel:
                 },
 
             'curthooks_commands': {
-                '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(),