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.
This commit is contained in:
parent
7451f362b2
commit
fac360b8e7
|
@ -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"
|
|
1
setup.py
1
setup.py
|
@ -109,7 +109,6 @@ setup(name='subiquity',
|
||||||
'bin/console-conf-wrapper',
|
'bin/console-conf-wrapper',
|
||||||
'bin/subiquity-debug',
|
'bin/subiquity-debug',
|
||||||
'bin/subiquity-configure-apt',
|
'bin/subiquity-configure-apt',
|
||||||
'bin/subiquity-configure-run',
|
|
||||||
'bin/subiquity-loadkeys',
|
'bin/subiquity-loadkeys',
|
||||||
'bin/subiquity-service',
|
'bin/subiquity-service',
|
||||||
],
|
],
|
||||||
|
|
|
@ -14,8 +14,6 @@ apps:
|
||||||
command: usr/bin/subiquity-loadkeys
|
command: usr/bin/subiquity-loadkeys
|
||||||
subiquity-configure-apt:
|
subiquity-configure-apt:
|
||||||
command: usr/bin/subiquity-configure-apt
|
command: usr/bin/subiquity-configure-apt
|
||||||
subiquity-configure-run:
|
|
||||||
command: usr/bin/subiquity-configure-run
|
|
||||||
console-conf:
|
console-conf:
|
||||||
command: usr/bin/console-conf
|
command: usr/bin/console-conf
|
||||||
probert:
|
probert:
|
||||||
|
@ -109,7 +107,6 @@ parts:
|
||||||
'bin/subiquity-service': usr/bin/subiquity-service
|
'bin/subiquity-service': usr/bin/subiquity-service
|
||||||
'bin/subiquity-server': usr/bin/subiquity-server
|
'bin/subiquity-server': usr/bin/subiquity-server
|
||||||
'bin/subiquity-configure-apt': usr/bin/subiquity-configure-apt
|
'bin/subiquity-configure-apt': usr/bin/subiquity-configure-apt
|
||||||
'bin/subiquity-configure-run': usr/bin/subiquity-configure-run
|
|
||||||
users-and-groups:
|
users-and-groups:
|
||||||
plugin: nil
|
plugin: nil
|
||||||
build-packages:
|
build-packages:
|
||||||
|
|
|
@ -279,9 +279,6 @@ class SubiquityModel:
|
||||||
},
|
},
|
||||||
|
|
||||||
'curthooks_commands': {
|
'curthooks_commands': {
|
||||||
'000-configure-run': [
|
|
||||||
'/snap/bin/subiquity.subiquity-configure-run',
|
|
||||||
],
|
|
||||||
'001-configure-apt': [
|
'001-configure-apt': [
|
||||||
'/snap/bin/subiquity.subiquity-configure-apt',
|
'/snap/bin/subiquity.subiquity-configure-apt',
|
||||||
sys.executable, str(self.network.has_network).lower(),
|
sys.executable, str(self.network.has_network).lower(),
|
||||||
|
|
Loading…
Reference in New Issue