Author: simons
Date: Tue Sep 13 18:49:50 2011
New Revision: 29246
URL: https://ssl.nixos.org/websvn/nix/?rev=29246&sc=1
Log:
Strip trailing whitespace.
Modified:
nixos/trunk/modules/system/boot/stage-1-init.sh
nixos/trunk/modules/system/boot/stage-2-init.sh
nixos/trunk/modules/system/boot/stage-2.nix
Modified: nixos/trunk/modules/system/boot/stage-1-init.sh
==============================================================================
--- nixos/trunk/modules/system/boot/stage-1-init.sh Tue Sep 13 18:49:47
2011 (r29245)
+++ nixos/trunk/modules/system/boot/stage-1-init.sh Tue Sep 13 18:49:50
2011 (r29246)
@@ -8,7 +8,7 @@
fail() {
if [ -n "$panicOnFail" ]; then exit 1; fi
-
+
# If starting stage 2 failed, allow the user to repair the problem
# in an interactive shell.
cat <<EOF
@@ -24,7 +24,7 @@
EOF
read reply
-
+
case $reply in
f)
exec @shell@;;
@@ -126,7 +126,7 @@
echo "starting device mapper and LVM..."
lvm vgscan
lvm vgchange -ay
-
+
if test -n "$debug1devices"; then fail; fi
@@ -176,7 +176,7 @@
then
return 0
fi
-
+
# Don't run `fsck' if the machine is on battery power. !!! Is
# this a good idea?
if ! onACPower; then
Modified: nixos/trunk/modules/system/boot/stage-2-init.sh
==============================================================================
--- nixos/trunk/modules/system/boot/stage-2-init.sh Tue Sep 13 18:49:47
2011 (r29245)
+++ nixos/trunk/modules/system/boot/stage-2-init.sh Tue Sep 13 18:49:50
2011 (r29246)
@@ -36,7 +36,7 @@
if [ ! -e /proc/1 ]; then
mkdir -m 0755 -p /proc
mount -n -t proc none /proc
- mkdir -m 0755 -p /sys
+ mkdir -m 0755 -p /sys
mount -t sysfs none /sys
mkdir -m 0755 -p /dev
mount -t tmpfs -o "mode=0755" none /dev
@@ -86,9 +86,9 @@
mkdir -m 0777 /dev/shm
mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
mkdir -m 0755 -p /dev/pts
-mount -t devpts -o mode=0600,gid=@ttyGid@ none /dev/pts
+mount -t devpts -o mode=0600,gid=@ttyGid@ none /dev/pts
[ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have
USB by default
-mkdir -m 01777 -p /tmp
+mkdir -m 01777 -p /tmp
mkdir -m 0755 -p /var
mkdir -m 0755 -p /nix/var
mkdir -m 0700 -p /root
Modified: nixos/trunk/modules/system/boot/stage-2.nix
==============================================================================
--- nixos/trunk/modules/system/boot/stage-2.nix Tue Sep 13 18:49:47 2011
(r29245)
+++ nixos/trunk/modules/system/boot/stage-2.nix Tue Sep 13 18:49:50 2011
(r29246)
@@ -66,7 +66,7 @@
${config.powerManagement.powerUpCommands}
'';
};
-
+
in
{
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
