summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-09-18 12:42:55 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-09-18 12:42:55 -0400
commit7de4732ca424ac2ac27ae8731619fce3c36ba81b (patch)
treee13ec53757a7383af535e38222b14081e9ed3f52
parentd1df136344b4a1d0888e8ddcdd0830df2a7a5785 (diff)
downloadcobbler-7de4732ca424ac2ac27ae8731619fce3c36ba81b.tar.gz
cobbler-7de4732ca424ac2ac27ae8731619fce3c36ba81b.tar.xz
cobbler-7de4732ca424ac2ac27ae8731619fce3c36ba81b.zip
Change default PXE behavior to use ksdevice=bootif and IPAPPEND 2 to ensure eth0 is always the boot interface.
-rw-r--r--CHANGELOG1
-rw-r--r--config/settings2
-rw-r--r--templates/pxedefault.template1
-rw-r--r--templates/pxeprofile.template4
-rw-r--r--templates/pxesystem.template1
5 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index de2fcb9e..04f64ee0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ Cobbler CHANGELOG
- (FEAT) included network_config snippet and added --static=0/1 to system objects
- (FEAT) added /usr/bin/cobbler-setup tool
- (FEAT) cobbler report gains additional options for Wiki formatting, csv, and showing only certain fields
+- (FEAT) changed default kernel options to include ksdevice=bootif (not ksdevice=eth0) and added ipappend 2 to PXE
- ??? - 1.2.5 (pending)
- (BUGF) expose --arch for "cobbler image add"
diff --git a/config/settings b/config/settings
index d463bb0d..55d409fd 100644
--- a/config/settings
+++ b/config/settings
@@ -68,7 +68,7 @@ http_port: 80
# kernel options can also be applied at the distro/profile/system
# level.
kernel_options:
- ksdevice: eth0
+ ksdevice: bootif
lang: ' '
text: ~
diff --git a/templates/pxedefault.template b/templates/pxedefault.template
index bb09893c..bba48b37 100644
--- a/templates/pxedefault.template
+++ b/templates/pxedefault.template
@@ -4,6 +4,7 @@ MENU TITLE Cobbler | http://cobbler.et.redhat.com
TIMEOUT 200
TOTALTIMEOUT 6000
ONTIMEOUT local
+IPAPPEND 2
LABEL local
MENU LABEL (local)
diff --git a/templates/pxeprofile.template b/templates/pxeprofile.template
index e1a6e2ea..3b5a53d0 100644
--- a/templates/pxeprofile.template
+++ b/templates/pxeprofile.template
@@ -1,3 +1,7 @@
+default linux
+prompt 0
+timeout 1
+ipappend 2
LABEL $profile_name
kernel $kernel_path
$menu_label
diff --git a/templates/pxesystem.template b/templates/pxesystem.template
index b551164b..2e23a42b 100644
--- a/templates/pxesystem.template
+++ b/templates/pxesystem.template
@@ -1,6 +1,7 @@
default linux
prompt 0
timeout 1
+ipappend 2
label linux
kernel $kernel_path
$append_line