Strip trailing whitespace.
svn path=/nixos/trunk/; revision=29246
This commit is contained in:
parent
d3528a3c4e
commit
a499049ce5
@ -8,7 +8,7 @@ export PATH=@extraUtils@/bin
|
|||||||
|
|
||||||
fail() {
|
fail() {
|
||||||
if [ -n "$panicOnFail" ]; then exit 1; fi
|
if [ -n "$panicOnFail" ]; then exit 1; fi
|
||||||
|
|
||||||
# If starting stage 2 failed, allow the user to repair the problem
|
# If starting stage 2 failed, allow the user to repair the problem
|
||||||
# in an interactive shell.
|
# in an interactive shell.
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
@ -24,7 +24,7 @@ of the following keys:
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
read reply
|
read reply
|
||||||
|
|
||||||
case $reply in
|
case $reply in
|
||||||
f)
|
f)
|
||||||
exec @shell@;;
|
exec @shell@;;
|
||||||
@ -126,7 +126,7 @@ udevadm control --env=STARTUP=
|
|||||||
echo "starting device mapper and LVM..."
|
echo "starting device mapper and LVM..."
|
||||||
lvm vgscan
|
lvm vgscan
|
||||||
lvm vgchange -ay
|
lvm vgchange -ay
|
||||||
|
|
||||||
if test -n "$debug1devices"; then fail; fi
|
if test -n "$debug1devices"; then fail; fi
|
||||||
|
|
||||||
|
|
||||||
@ -176,7 +176,7 @@ checkFS() {
|
|||||||
then
|
then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Don't run `fsck' if the machine is on battery power. !!! Is
|
# Don't run `fsck' if the machine is on battery power. !!! Is
|
||||||
# this a good idea?
|
# this a good idea?
|
||||||
if ! onACPower; then
|
if ! onACPower; then
|
||||||
|
@ -36,7 +36,7 @@ mount -n -o remount,rw none /
|
|||||||
if [ ! -e /proc/1 ]; then
|
if [ ! -e /proc/1 ]; then
|
||||||
mkdir -m 0755 -p /proc
|
mkdir -m 0755 -p /proc
|
||||||
mount -n -t proc none /proc
|
mount -n -t proc none /proc
|
||||||
mkdir -m 0755 -p /sys
|
mkdir -m 0755 -p /sys
|
||||||
mount -t sysfs none /sys
|
mount -t sysfs none /sys
|
||||||
mkdir -m 0755 -p /dev
|
mkdir -m 0755 -p /dev
|
||||||
mount -t tmpfs -o "mode=0755" none /dev
|
mount -t tmpfs -o "mode=0755" none /dev
|
||||||
@ -86,9 +86,9 @@ done
|
|||||||
mkdir -m 0777 /dev/shm
|
mkdir -m 0777 /dev/shm
|
||||||
mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
|
mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
|
||||||
mkdir -m 0755 -p /dev/pts
|
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
|
[ -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 /var
|
||||||
mkdir -m 0755 -p /nix/var
|
mkdir -m 0755 -p /nix/var
|
||||||
mkdir -m 0700 -p /root
|
mkdir -m 0700 -p /root
|
||||||
|
@ -66,7 +66,7 @@ let
|
|||||||
${config.powerManagement.powerUpCommands}
|
${config.powerManagement.powerUpCommands}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user