Changes in / [6ea5e7a:3c8b0a8] in mainline

Files:

• contrib/qemu/build-from-scratch.sh (modified) (1 diff)
• kernel/genarch/src/multiboot/multiboot.c (modified) (1 diff)
• uspace/app/sysinst/sysinst.c (modified) (1 diff)

contrib/qemu/build-from-scratch.sh

@@ -29 +29 @@
 #
 
-VERSION=3.0.0
+VERSION=3.1.0
 BASENAME=qemu-${VERSION}
 BASENAME_MASTER=qemu-master

kernel/genarch/src/multiboot/multiboot.c

@@ -55 +55 @@
         /*
          * Find last occurence of '/' before 'end'. If found, place start at
-         * next character. Otherwise, place start at beginning of buffer.
+         * next character. Otherwise, place start at beginning of command line.
          */
         const char *cp = end;
-        const char *start = buf;
+        const char *start = cmd_line;
 
         while (cp != start) {

uspace/app/sysinst/sysinst.c

@@ -62 +62 @@
  * in Grub notation).
  */
-#define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.0\\ata-c1\\d0"
+#define DEFAULT_DEV "devices/\\hw\\sys\\00:01.0\\ata-c1\\d0"
 //#define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.2\\uhci_rh\\usb01_a1\\mass-storage0\\l0"
 /** Volume label for the new file system */