Perry Myers
2008-Jun-30 13:11 UTC
[Ovirt-devel] [PATCH] Remove separation between x86_64 and i386 managed node kickstarts
In Fedora 8 we needed to maintain two kickstarts (one for each arch) for
the managed node since Fedora 8 would install the i386 versions of RPMs
in the x86_64 OS. Fedora 9 is smarter about this and only installs the
package specific to the arch. Since the only difference between the two
kickstarts was the removal of specific i386/i686 packages, this can be
simplified.
Signed-off-by: Perry Myers <pmyers at redhat.com>
---
ovirt-host-creator/Makefile | 2 +-
ovirt-host-creator/ovirt-common.sh | 2 +-
ovirt-host-creator/ovirt-x86_64.ks | 33 ------------------------
ovirt-host-creator/{ovirt-i386.ks => ovirt.ks} | 0
4 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 ovirt-host-creator/ovirt-x86_64.ks
rename ovirt-host-creator/{ovirt-i386.ks => ovirt.ks} (100%)
diff --git a/ovirt-host-creator/Makefile b/ovirt-host-creator/Makefile
index 7d74b08..9c1d1db 100644
--- a/ovirt-host-creator/Makefile
+++ b/ovirt-host-creator/Makefile
@@ -12,7 +12,7 @@ distclean: clean
repos.ks: repos.ks.in
cp repos.ks.in repos.ks
-build: ovirt-$(ARCH).ks common-install.ks common-pkgs.ks common-post.ks
repos.ks
+build: ovirt.ks common-install.ks common-pkgs.ks common-post.ks repos.ks
rm -rf tftpboot/
./ovirt-pxe.sh > ovirt-pxe.log 2>&1
diff --git a/ovirt-host-creator/ovirt-common.sh
b/ovirt-host-creator/ovirt-common.sh
index a015cc3..62d2e93 100644
--- a/ovirt-host-creator/ovirt-common.sh
+++ b/ovirt-host-creator/ovirt-common.sh
@@ -2,7 +2,7 @@ PATH=/sbin:/bin:/usr/bin
export PATH
create_iso() {
- KICKSTART=ovirt-`uname -i`.ks
+ KICKSTART=ovirt.ks
if [ $# -eq 0 ]; then
LABEL=ovirt-`date +%Y%m%d%H%M`
livecd-creator --skip-minimize -c $KICKSTART -f $LABEL 1>&2
&&
diff --git a/ovirt-host-creator/ovirt-x86_64.ks
b/ovirt-host-creator/ovirt-x86_64.ks
deleted file mode 100644
index 302d436..0000000
--- a/ovirt-host-creator/ovirt-x86_64.ks
+++ /dev/null
@@ -1,33 +0,0 @@
-%include common-install.ks
-
-%include repos.ks
-
-%packages --excludedocs
-%include common-pkgs.ks
--glibc.i686
--xen-libs.i386
--libxml2.i386
--zlib.i386
--libvirt.i386
--avahi.i386
--libgcrypt.i386
--gnutls.i386
--libstdc++.i386
--e2fsprogs-libs.i386
--readline.i386
--libselinux.i386
--device-mapper-libs.i386
--libdaemon.i386
--dbus-libs.i386
--expat.i386
--libsepol.i386
--libcap.i386
--libgpg-error.i386
--libgcc.i386
--cyrus-sasl-gssapi.i386
--cyrus-sasl-lib.i386
-
-%post
-%include common-post.ks
-
-%end
diff --git a/ovirt-host-creator/ovirt-i386.ks b/ovirt-host-creator/ovirt.ks
similarity index 100%
rename from ovirt-host-creator/ovirt-i386.ks
rename to ovirt-host-creator/ovirt.ks
--
1.5.5.1