* [PATCH nixpkgs] spectrumPackages.rootfs: add /sys
@ 2021-03-15 13:55 Alyssa Ross
2021-03-15 14:53 ` Alyssa Ross
0 siblings, 1 reply; 5+ messages in thread
From: Alyssa Ross @ 2021-03-15 13:55 UTC (permalink / raw)
To: devel
Programs assume this and it's useful to have.
---
pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 2 +-
pkgs/os-specific/linux/spectrum/rootfs/stage1.nix | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix
index 778b18dafa0..0a99f99bd5b 100644
--- a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix
+++ b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix
@@ -31,7 +31,7 @@ let
mkdir $out
cd $out
- mkdir bin sbin dev proc run tmp
+ mkdir bin sbin dev proc run sys tmp
ln -s ${dash}/bin/dash bin/sh
ln -s ${makeStage1 { inherit run; }} sbin/init
cp -r ${./etc} etc
diff --git a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix
index 75cfed56e7f..be7853316e9 100644
--- a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix
+++ b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix
@@ -27,6 +27,7 @@ writeScript "init-stage1" ''
if { s6-mount -t devpts -o gid=4,mode=620 none /dev/pts }
if { s6-mount -t tmpfs none /dev/shm }
if { s6-mount -t proc none /proc }
+ if { s6-mount -t sysfs none /sys }
if { s6-ln -s ${mesa.drivers} /run/opengl-driver }
export HOME /
--
2.30.0
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH nixpkgs] spectrumPackages.rootfs: add /sys
2021-03-15 13:55 [PATCH nixpkgs] spectrumPackages.rootfs: add /sys Alyssa Ross
@ 2021-03-15 14:53 ` Alyssa Ross
2021-03-15 23:09 ` Cole Helbling
0 siblings, 1 reply; 5+ messages in thread
From: Alyssa Ross @ 2021-03-15 14:53 UTC (permalink / raw)
To: devel
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
On Mon, Mar 15, 2021 at 01:55:40PM +0000, Alyssa Ross wrote:
> Programs assume this and it's useful to have.
> ---
> pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 2 +-
> pkgs/os-specific/linux/spectrum/rootfs/stage1.nix | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
I already posted this patch too[1]. Oops.
Although it could still use a review...
[1]: https://spectrum-os.org/lists/archives/spectrum-devel/20200825164845.8850-1-hi@alyssa.is/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH nixpkgs] spectrumPackages.rootfs: add /sys
2021-03-15 14:53 ` Alyssa Ross
@ 2021-03-15 23:09 ` Cole Helbling
2021-03-16 0:50 ` Alyssa Ross
0 siblings, 1 reply; 5+ messages in thread
From: Cole Helbling @ 2021-03-15 23:09 UTC (permalink / raw)
To: Alyssa Ross, devel
On Mon Mar 15, 2021 at 7:53 AM PDT, Alyssa Ross wrote:
> On Mon, Mar 15, 2021 at 01:55:40PM +0000, Alyssa Ross wrote:
> > Programs assume this and it's useful to have.
> > ---
> > pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 2 +-
> > pkgs/os-specific/linux/spectrum/rootfs/stage1.nix | 1 +
> > 2 files changed, 2 insertions(+), 1 deletion(-)
>
> I already posted this patch too[1]. Oops.
>
> Although it could still use a review...
>
> [1]:
> https://spectrum-os.org/lists/archives/spectrum-devel/20200825164845.8850-1-hi@alyssa.is/
Unable to find the old mail in my box, so I'll just send it here:
Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH nixpkgs] spectrumPackages.rootfs: add /sys
2021-03-15 23:09 ` Cole Helbling
@ 2021-03-16 0:50 ` Alyssa Ross
0 siblings, 0 replies; 5+ messages in thread
From: Alyssa Ross @ 2021-03-16 0:50 UTC (permalink / raw)
To: Cole Helbling; +Cc: devel
[-- Attachment #1: Type: text/plain, Size: 1127 bytes --]
On Mon, Mar 15, 2021 at 04:09:20PM -0700, Cole Helbling wrote:
> On Mon Mar 15, 2021 at 7:53 AM PDT, Alyssa Ross wrote:
> > On Mon, Mar 15, 2021 at 01:55:40PM +0000, Alyssa Ross wrote:
> > > Programs assume this and it's useful to have.
> > > ---
> > > pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 2 +-
> > > pkgs/os-specific/linux/spectrum/rootfs/stage1.nix | 1 +
> > > 2 files changed, 2 insertions(+), 1 deletion(-)
> >
> > I already posted this patch too[1]. Oops.
> >
> > Although it could still use a review...
> >
> > [1]:
> > https://spectrum-os.org/lists/archives/spectrum-devel/20200825164845.8850-1-hi@alyssa.is/
>
> Unable to find the old mail in my box, so I'll just send it here:
No problem. :)
> Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
Committed as 3eb1b848b6a. Thanks for the review!
BTW, just in case you don't know this trick:
When I can't find an email, I find the thread overview on public-inbox
and download it with the "mbox.gz" button. Then I just need to
gzip -d t.mbox.gz
neomutt -f t.mbox
and I'm looking at the thread.
I assume aerc has a similar flag.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH nixpkgs] spectrumPackages.rootfs: add /sys
@ 2020-08-25 16:48 Alyssa Ross
0 siblings, 0 replies; 5+ messages in thread
From: Alyssa Ross @ 2020-08-25 16:48 UTC (permalink / raw)
To: devel
Programs assume this and it's useful to have.
---
pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 2 +-
pkgs/os-specific/linux/spectrum/rootfs/stage1.nix | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix
index 778b18dafa0..0a99f99bd5b 100644
--- a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix
+++ b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix
@@ -31,7 +31,7 @@ let
mkdir $out
cd $out
- mkdir bin sbin dev proc run tmp
+ mkdir bin sbin dev proc run sys tmp
ln -s ${dash}/bin/dash bin/sh
ln -s ${makeStage1 { inherit run; }} sbin/init
cp -r ${./etc} etc
diff --git a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix
index 75cfed56e7f..be7853316e9 100644
--- a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix
+++ b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix
@@ -27,6 +27,7 @@ writeScript "init-stage1" ''
if { s6-mount -t devpts -o gid=4,mode=620 none /dev/pts }
if { s6-mount -t tmpfs none /dev/shm }
if { s6-mount -t proc none /proc }
+ if { s6-mount -t sysfs none /sys }
if { s6-ln -s ${mesa.drivers} /run/opengl-driver }
export HOME /
--
2.27.0
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-16 0:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-15 13:55 [PATCH nixpkgs] spectrumPackages.rootfs: add /sys Alyssa Ross
2021-03-15 14:53 ` Alyssa Ross
2021-03-15 23:09 ` Cole Helbling
2021-03-16 0:50 ` Alyssa Ross
-- strict thread matches above, loose matches on Subject: below --
2020-08-25 16:48 Alyssa Ross
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).