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

* Absolutise $systemConfig in case it's a symlink.

Browse Source 
svn path=/nixos/trunk/; revision=22677
This commit is contained in:
Eelco Dolstra 2010-07-20 13:50:10 +00:00
parent 63962dd7d6
commit 1b04d3a813
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/system/boot/stage-2-init.sh
View File

@ -3,11 +3,6 @@
# !!! copied from stage 1; remove duplication # !!! copied from stage 1; remove duplication
# If no `systemConfig' parameter is specified on the kernel command
# line, use a fallback.
systemConfig=/nix/var/nix/profiles/system
# Print a greeting. # Print a greeting.
echo echo
echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m" echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m"
@ -61,6 +56,11 @@ rm -f /etc/mtab* # not that we care about stale locks
cat /proc/mounts > /etc/mtab cat /proc/mounts > /etc/mtab
# If no `systemConfig' parameter is specified on the kernel command
# line, use a fallback.
systemConfig=/nix/var/nix/profiles/system
# Process the kernel command line. # Process the kernel command line.
for o in $(cat /proc/cmdline); do for o in $(cat /proc/cmdline); do
case $o in case $o in
@ -90,6 +90,8 @@ for o in $(cat /proc/cmdline); do
esac esac
done done
systemConfig="$(readlink -f "$systemConfig")"
# More special file systems, initialise required directories. # More special file systems, initialise required directories.
mkdir -m 0777 /dev/shm mkdir -m 0777 /dev/shm