Merge pull request #479 from xnox/real-target-run

Have the real /run in-target.

bin/subiquity-configure-apt

@@ -49,10 +49,8 @@ setup_overlay () {
 
 setup_overlay $TARGET_MOUNT_POINT/etc/apt
 
-
-mount -t tmpfs tmpfs "$TARGET_MOUNT_POINT/run"
-mkdir -p "$TARGET_MOUNT_POINT/run/cdrom"
-mount --bind /cdrom "$TARGET_MOUNT_POINT/run/cdrom"
+mkdir -p "$TARGET_MOUNT_POINT/cdrom"
+mount --bind /cdrom "$TARGET_MOUNT_POINT/cdrom"
 
 if [ $HAS_NETWORK = 'true' ]; then
     mv "$TARGET_MOUNT_POINT/etc/apt/sources.list" "$TARGET_MOUNT_POINT/etc/apt/sources.list.d/original.list"
@@ -63,7 +61,7 @@ else
 fi
 
 cat > "$TARGET_MOUNT_POINT/etc/apt/sources.list" <<EOF
-deb file:///run/cdrom $(lsb_release -sc) main restricted
+deb file:///cdrom $(lsb_release -sc) main restricted
 EOF
 
 $PY -m curtin in-target -- apt-get update

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"

setup.py

@@ -62,6 +62,7 @@ setup(name='subiquity',
           'bin/console-conf-wrapper',
           'bin/subiquity-debug',
           'bin/subiquity-configure-apt',
+          'bin/subiquity-configure-run',
           'bin/subiquity-loadkeys',
           'bin/subiquity-service',
       ],

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:
@@ -65,6 +67,7 @@ parts:
       'bin/subiquity-loadkeys': usr/bin/subiquity-loadkeys
       'bin/subiquity-service': usr/bin/subiquity-service
       'bin/subiquity-configure-apt': usr/bin/subiquity-configure-apt
+      'bin/subiquity-configure-run': usr/bin/subiquity-configure-run
   users-and-groups:
     plugin: dump
     build-packages:

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(),
                     ],