Use links to reference generated layers

piranna · piranna · commit f79de517c9a5 · 2015-10-13T23:29:50.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
 deps/
 obj/
 out/
-rootfs.img
-rootfs.iso
diff --git a/package.json b/package.json
@@ -4,8 +4,7 @@
   "scripts": {
     "install": "scripts/build",
     "preinstall": "scripts/preinstall",
-    "startImage": "scripts/startImage",
-    "startIso": "scripts/startIso",
+    "start": "scripts/start",
     "test": "scripts/test",
     "unbuild": "scripts/unbuild"
   },
diff --git a/scripts/start b/scripts/start
@@ -4,10 +4,13 @@ var readlinkSync = require('fs').readlinkSync
 var spawn        = require('child_process').spawn
 
 
-var cpu = readlinkSync('rootfs.img').split('/');
+var link = readlinkSync('out/latest').split('/');
+
+var cpu  = link[link.length-2]
+var type = link[link.length-1]
 
 var cpu_family;
-switch(cpu[cpu.length-2])
+switch(cpu)
 {
   case 'armv6':
     cpu_family = 'arm'
@@ -28,12 +31,21 @@ switch(cpu[cpu.length-2])
 }
 
 var command = 'qemu-system-'+cpu_family
+var args    = ['-enable-kvm']
+
+switch(type)
+{
+  case 'iso':
+    args.push(['-cdrom', 'out/latest'])
+  break
 
-var args =
-[
-  '-enable-kvm',
-  '-hda', 'rootfs.img'
-]
+  case 'img':
+    args.push(['-hda', 'out/latest'])
+  break
+
+  default:
+    throw 'Unknown rootfs type "'+type+'"'
+}
 
 spawn(command, args, {stdio: 'inherit'})
 .on('error', console.trace.bind(console))
diff --git a/scripts/startIso b/scripts/startIso

-Original file line number
+Diff line change
@@ @@ -1,5 +1,3 @@ @@
 deps/
 obj/
 out/
 -rootfs.img
 -rootfs.iso