stage-2: process options as first action

this way `set -x` is set early
This commit is contained in:
Jörg Thalheim 2017-04-05 00:27:25 +02:00
parent b42af25223
commit a17344c2ad
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA

View file

@ -5,6 +5,21 @@ systemConfig=@systemConfig@
export HOME=/root PATH="@path@"
# Process the kernel command line.
for o in $(cat /proc/cmdline); do
case $o in
boot.debugtrace)
# Show each command.
set -x
;;
resume=*)
set -- $(IFS==; echo $o)
resumeDevice=$2
;;
esac
done
# Print a greeting.
echo
echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m"
@ -62,21 +77,6 @@ rm -f /etc/mtab* # not that we care about stale locks
ln -s /proc/mounts /etc/mtab
# Process the kernel command line.
for o in $(cat /proc/cmdline); do
case $o in
boot.debugtrace)
# Show each command.
set -x
;;
resume=*)
set -- $(IFS==; echo $o)
resumeDevice=$2
;;
esac
done
# More special file systems, initialise required directories.
[ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default
mkdir -m 01777 -p /tmp