public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2720 from aristidb/master

Browse Source 
fhs-chrootenv (steam): support directly using users other than root, fix sound support, fix /run/user
This commit is contained in:
Sander van der Burg
2014-05-23 11:41:14 +02:00
parent 925a016113 eb928c5d46
commit 7cdeb712c3
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/build-fhs-chrootenv/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2, {stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2,
bashInteractive, xz, shadow, gawk, less, su, buildEnv}: bashInteractive, xz, shadow, gawk, less, buildEnv}:
{name, pkgs ? [], profile ? ""}: {name, pkgs ? [], profile ? ""}:
let let
basePkgs = [ basePkgs = [
glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar
gzip bzip2 bashInteractive xz shadow gawk less su gzip bzip2 bashInteractive xz shadow gawk less
]; ];
# Compose a global profile for the chroot environment # Compose a global profile for the chroot environment
pkgs/build-support/build-fhs-chrootenv/load.sh.in
+1 -1
View File
@@ -3,4 +3,4 @@
chrootenvDest=/run/chrootenv/@name@ chrootenvDest=/run/chrootenv/@name@
# Enter the LFS chroot environment # Enter the LFS chroot environment
chroot $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="/root" PATH="/bin:/sbin" /bin/bash --login sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="$HOME" PATH="/bin:/sbin" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" /bin/bash --login
pkgs/build-support/build-fhs-chrootenv/mount.sh.in
+1 -1
View File
@@ -17,7 +17,7 @@ mount --bind /home $chrootenvDest/home
# Bind mount state directories # Bind mount state directories
mount --bind /var $chrootenvDest/var mount --bind /var $chrootenvDest/var
mount --bind /run $chrootenvDest/run mount --rbind /run $chrootenvDest/run
# Bind mount the host system's /etc # Bind mount the host system's /etc
mount --bind /etc $chrootenvDest/host-etc mount --bind /etc $chrootenvDest/host-etc
pkgs/build-support/build-fhs-chrootenv/umount.sh.in
+2 -2
View File
@@ -2,5 +2,5 @@
chrootenvDest=/run/chrootenv/@name@ chrootenvDest=/run/chrootenv/@name@
# Unmount all bind mounts # Unmount all (r)bind mounts
umount $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run} umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run}
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -270,7 +270,7 @@ let
buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv { buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv {
inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils; inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils;
inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk; inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk;
inherit less su buildEnv; inherit less buildEnv;
}; };
dotnetenv = import ../build-support/dotnetenv { dotnetenv = import ../build-support/dotnetenv {