StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #921 from mwhudson/no-mount-run 

remove curtin hook to bind mount /run into target now curtin does this
This commit is contained in:
Michael Hudson-Doyle 2021-03-31 11:47:20 +13:00 committed by GitHub
parent 65e0984243 fac360b8e7
commit 83823515ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/subiquity-configure-run
View File

@ -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
View File

@ -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',
], ],

3
snapcraft.yaml
View File

@ -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:

3
subiquity/models/subiquity.py
View File

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