summaryrefslogtreecommitdiffstats
path: root/templates/pxedefault.template
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-05-28 11:07:39 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-05-28 11:07:39 -0400
commit36fd29894dc5859fa295aac08d2726cf77667088 (patch)
tree75ec187193a029af50a898878c9fe9f56735075b /templates/pxedefault.template
parent60e7b2048cb810082d9f5da189d827d0dec3747c (diff)
parent2963016f5c143a6f3c3bc711a2b6d1ed07d65abe (diff)
downloadthird_party-cobbler-36fd29894dc5859fa295aac08d2726cf77667088.tar.gz
third_party-cobbler-36fd29894dc5859fa295aac08d2726cf77667088.tar.xz
third_party-cobbler-36fd29894dc5859fa295aac08d2726cf77667088.zip
Merge branch 'devel'
Conflicts: cobbler.spec cobbler/item_system.py cobbler/webui/master.py
Diffstat (limited to 'templates/pxedefault.template')
-rw-r--r--templates/pxedefault.template6
1 files changed, 4 insertions, 2 deletions
diff --git a/templates/pxedefault.template b/templates/pxedefault.template
index d731892..bb09893 100644
--- a/templates/pxedefault.template
+++ b/templates/pxedefault.template
@@ -1,5 +1,5 @@
-DEFAULT local
-PROMPT 1
+DEFAULT menu
+PROMPT 0
MENU TITLE Cobbler | http://cobbler.et.redhat.com
TIMEOUT 200
TOTALTIMEOUT 6000
@@ -11,3 +11,5 @@ LABEL local
LOCALBOOT 0
$pxe_menu_items
+
+MENU end