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

nixos: Generalise the container tests in stage-2 boot

Browse Source 
This way, stage-2 behaves correctly also for libvirt-lxc containers.

Some more discussion on this:
https://github.com/NixOS/nixpkgs/commit/a7a08188bf650ababa36300a9a6f34169e2a73bf
https://github.com/NixOS/nixpkgs/commit/bfe46a653ba2f8ff9902128f485cbd87c49cbca7
This commit is contained in:
Rickard Nilsson
2016-09-07 07:50:04 +00:00
parent 5f6557d437
commit ab9537ca22
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/stage-2-init.sh
+2 -2
View File
@@ -29,14 +29,14 @@ setPath "@path@"
# Normally, stage 1 mounts the root filesystem read/writable. # Normally, stage 1 mounts the root filesystem read/writable.
# However, in some environments, stage 2 is executed directly, and the # However, in some environments, stage 2 is executed directly, and the
# root is read-only. So make it writable here. # root is read-only. So make it writable here.
if [ "$container" != systemd-nspawn ]; then if [ -z "$container" ]; then
mount -n -o remount,rw none / mount -n -o remount,rw none /
fi fi
# Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a # Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a
# stage 1, we need to do that here. # stage 1, we need to do that here.
if [ ! -e /proc/1 ]; then if [ ! -e /proc/1 ] || [ -n "$container" ]; then
specialMount() { specialMount() {
local device="$1" local device="$1"
local mountPoint="$2" local mountPoint="$2"