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

* Handle booting from /dev/xvda.

Browse Source 
svn path=/nixos/trunk/; revision=33645
This commit is contained in:
Eelco Dolstra 2012-04-06 12:23:12 +00:00
parent 011e389390
commit 852e513638
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,6 +255,7 @@ mountFS() {
# Try to find and mount the root device. # Try to find and mount the root device.
sleep 3
mkdir /mnt-root mkdir /mnt-root
mountPoints=(@mountPoints@) mountPoints=(@mountPoints@)

2
modules/virtualisation/amazon-image.nix
View File

@ -92,7 +92,7 @@ with pkgs.lib;
diskNr=0 diskNr=0
diskForAufs= diskForAufs=
for device in /dev/xvd*; do 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) fsType=$(blkid -o value -s TYPE "$device" || true)
if [ "$fsType" = swap ]; then if [ "$fsType" = swap ]; then
echo "activating swap device $device..." echo "activating swap device $device..."