more careful detection of when we are running in a snap

This commit is contained in:
Michael Hudson-Doyle 2017-10-10 09:19:08 +13:00
parent a1b973f79d
commit 634d0e8013
1 changed files with 2 additions and 1 deletions

View File

@ -18,6 +18,7 @@ import logging
import os
import random
import subprocess
import sys
from systemd import journal
@ -226,7 +227,7 @@ class InstallProgressController(BaseController):
def start_journald_forwarder(self):
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')
else:
script = './bin/curtin-journald-forwarder'