more careful detection of when we are running in a snap
This commit is contained in:
parent
a1b973f79d
commit
634d0e8013
|
@ -18,6 +18,7 @@ import logging
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import sys
|
||||||
|
|
||||||
from systemd import journal
|
from systemd import journal
|
||||||
|
|
||||||
|
@ -226,7 +227,7 @@ class InstallProgressController(BaseController):
|
||||||
|
|
||||||
def start_journald_forwarder(self):
|
def start_journald_forwarder(self):
|
||||||
log.debug("starting curtin journald forwarder")
|
log.debug("starting curtin journald forwarder")
|
||||||
if "SNAP" in os.environ:
|
if "SNAP" in os.environ and sys.executable.startswith(os.environ["SNAP"]):
|
||||||
script = os.path.join(os.environ["SNAP"], 'usr/bin/curtin-journald-forwarder')
|
script = os.path.join(os.environ["SNAP"], 'usr/bin/curtin-journald-forwarder')
|
||||||
else:
|
else:
|
||||||
script = './bin/curtin-journald-forwarder'
|
script = './bin/curtin-journald-forwarder'
|
||||||
|
|
Loading…
Reference in New Issue