summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-01-31 01:43:16 +0100
committerLudovic Courtès <ludo@gnu.org>2014-01-31 01:43:16 +0100
commitfc4bc4b6debecf9acc7e86ecb519c03b5b598bc4 (patch)
treec70eaa5b91f85fa9d13d18684caacb4a22bfee93 /gnu
parent83b9e6a1854d4fb86f0269afac33200dce996f06 (diff)
downloadpatches-fc4bc4b6debecf9acc7e86ecb519c03b5b598bc4.tar
patches-fc4bc4b6debecf9acc7e86ecb519c03b5b598bc4.tar.gz
gnu: linux-initrd: Properly distinguish between /dev/sda* and /dev/vda*.
* guix/build/linux-initrd.scm (make-essential-device-nodes): Rename devices with major = 8 to /dev/sda*. Make /dev/vda* devices. * gnu/system/vm.scm (qemu-image): Change '/dev/vda' to '/dev/sda'. * gnu/system.scm (operating-system-derivation): Likewise.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system.scm2
-rw-r--r--gnu/system/vm.scm8
2 files changed, 5 insertions, 5 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 5fb4a7483e..e9ecfd2732 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -330,7 +330,7 @@ alias ll='ls -l'
(package-full-name kernel)
" (technology preview)"))
(linux kernel)
- (linux-arguments `("--root=/dev/vda1"
+ (linux-arguments `("--root=/dev/sda1"
,(string-append "--load=" boot)))
(initrd initrd-file))))
(grub.cfg (grub-configuration-file entries))
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index bd7718a14a..5407522652 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -294,18 +294,18 @@ such as /etc files."
(assoc-ref %build-inputs "gawk") "/bin"))
(display "creating partition table...\n")
- (and (zero? (system* parted "/dev/vda" "mklabel" "msdos"
+ (and (zero? (system* parted "/dev/sda" "mklabel" "msdos"
"mkpart" "primary" "ext2" "1MiB"
,(format #f "~aB"
(- disk-image-size
(* 5 (expt 2 20))))))
(begin
(display "creating ext3 partition...\n")
- (and (zero? (system* mkfs "-F" "/dev/vda1"))
+ (and (zero? (system* mkfs "-F" "/dev/sda1"))
(let ((store (string-append "/fs" ,%store-directory)))
(display "mounting partition...\n")
(mkdir "/fs")
- (mount "/dev/vda1" "/fs" "ext3")
+ (mount "/dev/sda1" "/fs" "ext3")
(mkdir-p "/fs/boot/grub")
(symlink grub.cfg "/fs/boot/grub/grub.cfg")
@@ -379,7 +379,7 @@ such as /etc files."
(and (zero?
(system* grub "--no-floppy"
"--boot-directory" "/fs/boot"
- "/dev/vda"))
+ "/dev/sda"))
(zero? (system* umount "/fs"))
(reboot))))))))
#:system system