Ovirt devel - Dec 2008 - [PATCH appliance] fix cobbler tree import

cobbler tree import used to determine arch via --arch flag.  Now
it checks arch flag against arch of kernel-headers package in the
imported tree.  Needed to add kernel-headers to our minimal tree
so that this works.

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 gettree.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gettree.sh b/gettree.sh
index 9188a4e..b96bf8b 100755
--- a/gettree.sh
+++ b/gettree.sh
@@ -64,6 +64,8 @@ echo $os $ver $arch > "$dest/.treeinfo.ova"
 mkdir -p "$dest/Packages"
 download "$dest/Packages"
"$url/Packages/basesystem-8.1-1.noarch.rpm" \
                          
"$url/Packages/basesystem-10.0-1.noarch.rpm"
+download "$dest/Packages"
"$url/Packages/kernel-headers-2.6.27.5-117.fc10.$arch.rpm" \
+                         
"$url/Packages/kernel-headers-2.6.28-3.fc11.$arch.rpm"
 createrepo "$dest"
 dir="$dest/$(dirname $stage2)"
 mkdir -p "$dir"
-- 
1.6.0.6

cobbler used to put sample kickstarts into /etc/cobbler.  This
has moved to /var/lib/cobbler/kickstarts so cobbler-import had
to be updated accordingly.

Also location of pxe templates moved from /etc/cobbler to
/etc/cobbler/pxe so had to fix that too

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 appliances/ovirt/files/cobbler-import |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/appliances/ovirt/files/cobbler-import
b/appliances/ovirt/files/cobbler-import
index f5ec528..d516c68 100644
--- a/appliances/ovirt/files/cobbler-import
+++ b/appliances/ovirt/files/cobbler-import
@@ -21,8 +21,8 @@ for dir in $ksdir/* ; do
 
     cobbler import --name=$os-$ver --arch=$arch --path=$dir
 
-    sed -e 's#^reboot.*#poweroff#' /etc/cobbler/sample_end.ks \
-        > /etc/cobbler/sample-$os-$ver-$arch.ks
+    sed -e 's#^reboot.*#poweroff#'
/var/lib/cobbler/kickstarts/sample_end.ks \
+        > /var/lib/cobbler/kickstarts/sample-$os-$ver-$arch.ks
 
     if [[ "$ver" =~ "$rawhide" ]]; then
         cobbler repo add --name=f$ver-$arch --arch=$arch --mirror-locally=0 \
@@ -38,7 +38,7 @@ for dir in $ksdir/* ; do
 
     cobbler profile edit --name=$os-$ver-$arch \
         --repos="$repos" \
-        --kickstart=/etc/cobbler/sample-$os-$ver-$arch.ks
+        --kickstart=/var/lib/cobbler/kickstarts/sample-$os-$ver-$arch.ks
 done
 
 node_arch=$(rpm -q --qf "%{arch}" ovirt-node-image)
@@ -67,9 +67,9 @@ sed -i -e "s/^module = authn_denyall.*/module =
authn_configfile/" \
 sed -i -e "s/^server:.*/server: '192.168.50.2'/" \
     -e "s/^next_server:.*/next_server: '192.168.50.2'/" \
     /etc/cobbler/settings
-sed -i -e '/kernel /a \\tIPAPPEND 2' /etc/cobbler/pxesystem.template
+sed -i -e '/kernel /a \\tIPAPPEND 2'
/etc/cobbler/pxe/pxesystem.template
 sed -i -e "s/^ONTIMEOUT.*/ONTIMEOUT oVirt-Node-$node_arch/" \
-    /etc/cobbler/pxedefault.template
+    /etc/cobbler/pxe/pxedefault.template
 
 service cobblerd restart
 cobbler sync
-- 
1.6.0.6

Perry Myers wrote:
> cobbler tree import used to determine arch via --arch flag.  Now
> it checks arch flag against arch of kernel-headers package in the
> imported tree.  Needed to add kernel-headers to our minimal tree
> so that this works.
This patch was pushed since it fixes a major build issue.

Perry