Most of these diffs come from directory reorg/cleanup, though the main feature here is the start of a better --import command that creates significantly shorter paths and can work more reliably on mounted DVD images (losetup or otherwise). Detection of kickstarts based on paths needs to be augmented by additional means for this to really work. However, changes going in here (and still more to come) result in cleaner names for imported profiles, and substantially shorter kernel option command lines, which is needed to keep under the 255 limit. There is also some work here going in to template out all of the files for PXE, reducing the amount of code in action_sync and also making PXE setups much more customizable (menu choices, titles, random parameters, ipappend 2, etc) without patching the source. "tree" on import is also attached now to the distro, not the profile. So, whew, that's a lot.

6 files changed, 68 insertions, 0 deletions

diff --git a/templates/dhcp.template b/templates/dhcp.template
new file mode 100644
index 00000000..705cc778
--- /dev/null
+++ b/templates/dhcp.template
@@ -0,0 +1,27 @@
+# ******************************************************************
+# Cobbler managed dhcpd.conf file
+#
+# generated from cobbler dhcp.conf template ($date)
+#
+# ******************************************************************
+
+ddns-update-style interim;
+
+allow booting;
+allow bootp;
+
+ignore client-updates;
+set vendorclass = option vendor-class-identifier;
+
+subnet 192.168.1.0 netmask 255.255.255.0 {
+     option routers          192.168.1.5;
+     option subnet-mask      255.255.255.0;
+     range dynamic-bootp     192.168.1.100 192.168.1.254;
+     filename                "/pxelinux.0";
+     default-lease-time      21600;
+     max-lease-time          43200;
+     next-server             $next_server;
+}
+
+$insert_cobbler_system_definitions
+
diff --git a/templates/pxedefault.template b/templates/pxedefault.template
new file mode 100644
index 00000000..d731892d
--- /dev/null
+++ b/templates/pxedefault.template
@@ -0,0 +1,13 @@
+DEFAULT local
+PROMPT 1
+MENU TITLE Cobbler | http://cobbler.et.redhat.com
+TIMEOUT 200
+TOTALTIMEOUT 6000
+ONTIMEOUT local
+
+LABEL local
+        MENU LABEL (local)
+        MENU DEFAULT
+        LOCALBOOT 0
+
+$pxe_menu_items
diff --git a/templates/pxeprofile.template b/templates/pxeprofile.template
new file mode 100644
index 00000000..e1a6e2ea
--- /dev/null
+++ b/templates/pxeprofile.template
@@ -0,0 +1,4 @@
+LABEL $profile_name
+        kernel $kernel_path
+        $menu_label
+        $append_line
diff --git a/templates/pxesystem.template b/templates/pxesystem.template
new file mode 100644
index 00000000..1564d7e7
--- /dev/null
+++ b/templates/pxesystem.template
@@ -0,0 +1,7 @@
+default linux
+prompt 0
+timeout 1
+label linux
+        kernel $kernel_path
+        append $append_line
+
diff --git a/templates/pxesystem_ia64.template b/templates/pxesystem_ia64.template
new file mode 100644
index 00000000..dd06d4e4
--- /dev/null
+++ b/templates/pxesystem_ia64.template
@@ -0,0 +1,6 @@
+image=$kernel_path
+	label=netinstall
+	append=$append_line
+	initrd=$initrd_path
+	read-only
+	root=/dev/ram
diff --git a/templates/rsync.exclude b/templates/rsync.exclude
new file mode 100644
index 00000000..15ed695b
--- /dev/null
+++ b/templates/rsync.exclude
@@ -0,0 +1,11 @@
+### files to exclude from "cobbler import" commands that use
+### rsync mirrors.  by default ISOs, PPC code, and debug
+### RPM's are not transferred.  Some users may want to
+### re-enable debug RPM's.
+**/debug/**
+**/ppc/**
+**/source/**
+**/iso/**
+**/openoffice.org-langpack**
+**/kde-i18n**
+**/SPRMS/**