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

Merge pull request #13415 from MatrixAI/master

Browse Source 
nixos/stage-1/2: Added -r option to read so that read interprets backslashes literally
This commit is contained in:
Eelco Dolstra 2016-02-24 13:50:59 +01:00
commit e2af876c78
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/system/boot/stage-1-init.sh
View File

@ -71,14 +71,13 @@ mount -t devtmpfs -o "size=@devSize@" devtmpfs /dev
mkdir -p /run mkdir -p /run
mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run
# Log the script output to /dev/kmsg or /run/log/stage-1-init.log.
# Optionally log the script output to /dev/kmsg or /run/log/stage-1-init.log.
mkdir -p /tmp mkdir -p /tmp
mkfifo /tmp/stage-1-init.log.fifo mkfifo /tmp/stage-1-init.log.fifo
logOutFd=8 && logErrFd=9 logOutFd=8 && logErrFd=9
eval "exec $logOutFd>&1 $logErrFd>&2" eval "exec $logOutFd>&1 $logErrFd>&2"
if test -w /dev/kmsg; then if test -w /dev/kmsg; then
tee -i < /tmp/stage-1-init.log.fifo /proc/self/fd/"$logOutFd" | while read line; do tee -i < /tmp/stage-1-init.log.fifo /proc/self/fd/"$logOutFd" | while read -r line; do
if test -n "$line"; then if test -n "$line"; then
echo "<7>stage-1-init: $line" > /dev/kmsg echo "<7>stage-1-init: $line" > /dev/kmsg
fi fi

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

@ -155,11 +155,11 @@ mkdir -m 0755 -p /var/setuid-wrappers
mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers
# Optionally log the script output to /dev/kmsg or /run/log/stage-2-init.log. # Log the script output to /dev/kmsg or /run/log/stage-2-init.log.
# Only at this point are all the necessary prerequisites ready for these commands. # Only at this point are all the necessary prerequisites ready for these commands.
exec {logOutFd}>&1 {logErrFd}>&2 exec {logOutFd}>&1 {logErrFd}>&2
if test -w /dev/kmsg; then if test -w /dev/kmsg; then
exec > >(tee -i /proc/self/fd/"$logOutFd" | while read line; do exec > >(tee -i /proc/self/fd/"$logOutFd" | while read -r line; do
if test -n "$line"; then if test -n "$line"; then
echo "<7>stage-2-init: $line" > /dev/kmsg echo "<7>stage-2-init: $line" > /dev/kmsg
fi fi