Move boot.ipfire.org service to own subdirectory.

diff --git a/boot/backend b/boot/backend
new file mode 120000 (symlink)
index 0000000..e57052c
--- /dev/null
+++ b/boot/backend
@@ -0,0 +1 @@
+../www/webapp/backend/
\ No newline at end of file

diff --git a/www/boot.py b/boot/boot.py
similarity index 95%
rename from www/boot.py
rename to boot/boot.py
index 9f69b6b59db6ad8344f10c104c86988fe61d6f18..a4a3826b4db222a67178605cceeca4e8bed99c11 100644 (file)
--- a/www/boot.py
+++ b/boot/boot.py
@@ -8,12 +8,10 @@ import tornado.locale
 import tornado.options
 import tornado.web
 
-from webapp import backend
+import backend
 
 BASEDIR = os.path.dirname(__file__)
 
-# Enable logging
-tornado.options.enable_pretty_logging()
 tornado.options.parse_command_line()
 
 def word_wrap(s, width=45):
@@ -108,6 +106,8 @@ class BootGPXEHandler(BaseHandler):
                line = "kernel -n img %s" % config.image1
                if line.endswith(".iso"):
                        line += " iso"
+               if config.args:
+                       line += " %s" % config.args
                lines.append(line)
 
                if config.image2:
@@ -124,8 +124,8 @@ class Application(tornado.web.Application):
                settings = dict(
                        debug = True,
                        gzip = True,
-                       static_path = os.path.join(BASEDIR, "static/netboot"),
-                       template_path = os.path.join(BASEDIR, "templates/netboot"),
+                       static_path = os.path.join(BASEDIR, "static"),
+                       template_path = os.path.join(BASEDIR, "templates"),
                )
 
                tornado.web.Application.__init__(self, **settings)

diff --git a/boot/static b/boot/static
new file mode 120000 (symlink)
index 0000000..80b7039
--- /dev/null
+++ b/boot/static
@@ -0,0 +1 @@
+../www/static/netboot/
\ No newline at end of file

diff --git a/boot/templates b/boot/templates
new file mode 120000 (symlink)
index 0000000..b5c72a4
--- /dev/null
+++ b/boot/templates
@@ -0,0 +1 @@
+../www/templates/netboot
\ No newline at end of file