boot: Change file paths.

diff --git a/www/boot.py b/www/boot.py
index 6f1cabc16e229d3a268ebecbf267e449cbbb5bd6..9f69b6b59db6ad8344f10c104c86988fe61d6f18 100644 (file)
--- a/www/boot.py
+++ b/www/boot.py
@@ -132,12 +132,12 @@ class Application(tornado.web.Application):
 
                self.add_handlers(r"boot.ipfire.org", [
                        # Configurations
-                       (r"/files/menu.gpxe", MenuGPXEHandler),
-                       (r"/files/menu.cfg", MenuCfgHandler),
+                       (r"/menu.gpxe", MenuGPXEHandler),
+                       (r"/menu.cfg", MenuCfgHandler),
                        (r"/config/([0-9]+)/boot.gpxe", BootGPXEHandler),
 
                        # Static files
-                       (r"/files/(boot.png|custom.gpxe|premenu.cfg|vesamenu.c32|menu.c32)",
+                       (r"/(boot.png|custom.gpxe|premenu.cfg|vesamenu.c32|menu.c32)",
                                tornado.web.StaticFileHandler, { "path" : self.settings["static_path"] }),
                ])
 

diff --git a/www/templates/netboot/menu.cfg b/www/templates/netboot/menu.cfg
index bd50075d87b129bd657d306279c32767016c2f20..83325f8e3f39a16f73220ab69cbee66843fe835c 100644 (file)
--- a/www/templates/netboot/menu.cfg
+++ b/www/templates/netboot/menu.cfg
@@ -9,7 +9,7 @@ menu color tabmsg               * #ffffffff #00000000 *
 menu vshift 8
 menu rows 10
 menu helpmsgrow 16
-menu background /files/boot.png
+menu background boot.png
 prompt 0
 allowoptions 0