Author: eelco
Date: Fri Apr 6 12:23:12 2012
New Revision: 33645
URL: https://nixos.org/websvn/nix/?rev=33645&sc=1
Log:
* Handle booting from /dev/xvda.
Modified:
nixos/trunk/modules/system/boot/stage-1-init.sh
nixos/trunk/modules/virtualisation/amazon-image.nix
Modified: nixos/trunk/modules/system/boot/stage-1-init.sh
==============================================================================
--- nixos/trunk/modules/system/boot/stage-1-init.sh Fri Apr 6 11:19:48
2012 (r33644)
+++ nixos/trunk/modules/system/boot/stage-1-init.sh Fri Apr 6 12:23:12
2012 (r33645)
@@ -255,6 +255,7 @@
# Try to find and mount the root device.
+sleep 3
mkdir /mnt-root
mountPoints=(@mountPoints@)
Modified: nixos/trunk/modules/virtualisation/amazon-image.nix
==============================================================================
--- nixos/trunk/modules/virtualisation/amazon-image.nix Fri Apr 6 11:19:48
2012 (r33644)
+++ nixos/trunk/modules/virtualisation/amazon-image.nix Fri Apr 6 12:23:12
2012 (r33645)
@@ -92,7 +92,7 @@
diskNr=0
diskForAufs=
for device in /dev/xvd*; do
- if [ "$device" = /dev/xvda1 ]; then continue; fi
+ if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then
continue; fi
fsType=$(blkid -o value -s TYPE "$device" || true)
if [ "$fsType" = swap ]; then
echo "activating swap device $device..."
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
