Add default disk size option, fix daemon kernel config bug

3 files changed, 8 insertions, 2 deletions

diff --git a/daemon.php b/daemon.php
index 60c1616..04e0f4c 100644
--- a/daemon.php
+++ b/daemon.php
@@ -111,6 +111,8 @@
                         preg_match("/Step (.+):/", $progressLine, $matches);
                         if (sizeof($matches) > 0) {
                             $job->sendStatus($matches[1], $progressMagic);
+                        } elseif (substr($progressLine, 0, 5) == "yes: ") {
+                            // do nothing
                         } else {
                             $nonstatusOutput .= $progressLine;
                         }
diff --git a/web/config.php b/web/config.php
index bdb5b47..9d86c0c 100644
--- a/web/config.php
+++ b/web/config.php
@@ -33,6 +33,9 @@
     // What should we set as the default list of packages?
     define("DEFAULT_KEYWORDS", "");
     
+    // What should the default virtual machine disk size be?
+    define("DEFAULT_DISK_SIZE", 8192);
+    
     // What should we limit the virtual machine disk size to?
     define("MAX_DISK_SIZE", 16384);
     
diff --git a/web/index.php b/web/index.php
index aa17151..cdeecd3 100644
--- a/web/index.php
+++ b/web/index.php
@@ -120,7 +120,8 @@
                             <label for="partitioning_size">Disk size</label>
                             <br />
                             <input id="partitioning_size" class="required"
-                                type="text" name="image_size" value="4096"><br>
+                                type="text" name="image_size" value="<?php echo DEFAULT_DISK_SIZE; ?>">
+                            <br>
 
                             <label for="">Split</label><br /><br />
                             <div id="partitioning_split" name="split"></div>
@@ -211,4 +212,4 @@
         </script>
         <script type="text/javascript" src=" /js/gentoaster.js"></script>
     </body>
-</html>
+</html>
\ No newline at end of file