From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland
Date: Mon, 15 Mar 2021 13:55:39 +0000 [thread overview]
Message-ID: <20210315135540.4980-1-hi@alyssa.is> (raw)
This errored because of the undefined XDG_RUNTIME_DIR or
WAYLAND_DISPLAY. I'd tried to prevent that by disabling -e around
this part, but it turns out I should have disabled -u instead.
---
pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in
index 4fa0287a805..8d95c178689 100755
--- a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in
+++ b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in
@@ -55,7 +55,7 @@ do
esac
done
-set +e
+set +u
if [ -n "$XDG_RUNTIME_DIR" ]
then
set -- -s "$XDG_RUNTIME_DIR" "$@"
@@ -63,7 +63,7 @@ then
then set -- --wayland-sock "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" "$@"
fi
fi
-set -e
+set -u
exec "$crosvm" run \
-p init=/sbin/init \
--
2.30.0
next reply other threads:[~2021-03-15 13:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 13:55 Alyssa Ross [this message]
2021-03-15 14:51 ` Alyssa Ross
-- strict thread matches above, loose matches on Subject: below --
2020-08-25 16:48 Alyssa Ross
2020-08-25 17:26 ` Cole Helbling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210315135540.4980-1-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).