Ovirt devel - Sep 2008 - [PATCH ovirt-appliance] import base-pkgs.ks

to make it work with appliance-tools-002-3.fc9
---
 base-pkgs.ks       |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ovirt-appliance.ks |    2 +-
 2 files changed, 59 insertions(+), 1 deletions(-)
 create mode 100644 base-pkgs.ks

diff --git a/base-pkgs.ks b/base-pkgs.ks
new file mode 100644
index 0000000..6e36711
--- /dev/null
+++ b/base-pkgs.ks
@@ -0,0 +1,58 @@
+#
+# Packages to Add
+#
+ at core
+bash
+kernel
+grub
+e2fsprogs
+passwd
+policycoreutils
+chkconfig
+rootfiles
+yum
+vim-minimal
+acpid
+
+#Allow for dhcp access
+dhclient
+iputils
+
+#
+# Packages to Remove
+#
+
+# no need for kudzu if the hardware doesn't change
+-kudzu
+-prelink
+-setserial
+-ed
+
+# Remove the authconfig pieces
+-authconfig
+-rhpl
+-wireless-tools
+
+# Remove the kbd bits
+-kbd
+-usermode
+
+# these are all kind of overkill but get pulled in by mkinitrd ordering
+-mkinitrd
+-kpartx
+-dmraid
+-mdadm
+-lvm2
+-tar
+
+# selinux toolchain of policycoreutils, libsemanage, ustr
+-policycoreutils
+-checkpolicy
+-selinux-policy*
+-libselinux-python
+-libselinux
+
+# Things it would be nice to loose
+-fedora-logos
+-fedora-release-notes
+
diff --git a/ovirt-appliance.ks b/ovirt-appliance.ks
index e60181d..66e5aa2 100644
--- a/ovirt-appliance.ks
+++ b/ovirt-appliance.ks
@@ -28,7 +28,7 @@ network --device=eth1 --bootproto=static --ip=192.168.50.2
--netmask=255.255.255
 %include repos.ks
 
 %packages --nobase
-%include /usr/share/appliance-tools/base-pkgs.ks
+%include base-pkgs.ks
 ovirt-recipe
 lokkit
 
-- 
1.5.5.1

Alan Pevec wrote:
> to make it work with appliance-tools-002-3.fc9
> ---
>  base-pkgs.ks       |   58
++++++++++++++++++++++++++++++++++++++++++++++++++++
>  ovirt-appliance.ks |    2 +-
>  2 files changed, 59 insertions(+), 1 deletions(-)
>  create mode 100644 base-pkgs.ks
Changes to tar-src in ovirt.mk need to be made in conjunction with this.

Perry
> diff --git a/base-pkgs.ks b/base-pkgs.ks
> new file mode 100644
> index 0000000..6e36711
> --- /dev/null
> +++ b/base-pkgs.ks
> @@ -0,0 +1,58 @@
> +#
> +# Packages to Add
> +#
> + at core
> +bash
> +kernel
> +grub
> +e2fsprogs
> +passwd
> +policycoreutils
> +chkconfig
> +rootfiles
> +yum
> +vim-minimal
> +acpid
> +
> +#Allow for dhcp access
> +dhclient
> +iputils
> +
> +#
> +# Packages to Remove
> +#
> +
> +# no need for kudzu if the hardware doesn't change
> +-kudzu
> +-prelink
> +-setserial
> +-ed
> +
> +# Remove the authconfig pieces
> +-authconfig
> +-rhpl
> +-wireless-tools
> +
> +# Remove the kbd bits
> +-kbd
> +-usermode
> +
> +# these are all kind of overkill but get pulled in by mkinitrd ordering
> +-mkinitrd
> +-kpartx
> +-dmraid
> +-mdadm
> +-lvm2
> +-tar
> +
> +# selinux toolchain of policycoreutils, libsemanage, ustr
> +-policycoreutils
> +-checkpolicy
> +-selinux-policy*
> +-libselinux-python
> +-libselinux
> +
> +# Things it would be nice to loose
> +-fedora-logos
> +-fedora-release-notes
> +
> diff --git a/ovirt-appliance.ks b/ovirt-appliance.ks
> index e60181d..66e5aa2 100644
> --- a/ovirt-appliance.ks
> +++ b/ovirt-appliance.ks
> @@ -28,7 +28,7 @@ network --device=eth1 --bootproto=static
--ip=192.168.50.2 --netmask=255.255.255
>  %include repos.ks
>  
>  %packages --nobase
> -%include /usr/share/appliance-tools/base-pkgs.ks
> +%include base-pkgs.ks
>  ovirt-recipe
>  lokkit
>  
-- 
|=-        Red Hat, Engineering, Emerging Technologies, Boston        -=|
|=-                     Email: pmyers at redhat.com                      -=|
|=-         Office: +1 412 474 3552   Mobile: +1 703 362 9622         -=|
|=- GnuPG: E65E4F3D 88F9 F1C9 C2F3 1303 01FE 817C C5D2 8B91 E65E 4F3D -=|

Alan Pevec wrote:
> to make it work with appliance-tools-002-3.fc9
This patch is deprecated since Huff provided an appliance-os package which 
is now on ovirt.org.

Patches are pushed already to ovirt-release and ovirt-appliance and the 
build instructions on ovirt.org have been updated.

The important point to note is you need to install appliance-os package as 
follows:

yum install --enablerepo=ovirt appliance-os

Patches were:

commit 6d706bf1b096fbaf2574f47096bea2f317196123
Author: Perry Myers <pmyers at redhat.com>
Date:   Mon Sep 29 16:16:48 2008 -0400

    Fix base-packages ks location due to change in upstream appliance-os package
    
    Signed-of-by: Perry Myers <pmyers at redhat.com>

diff --git a/ovirt-appliance.ks b/ovirt-appliance.ks
index e60181d..0fd5186 100644
--- a/ovirt-appliance.ks
+++ b/ovirt-appliance.ks
@@ -28,7 +28,7 @@ network --device=eth1 --bootproto=static --ip=192.168.50.2
--netmask=255.255.255
 %include repos.ks
 
 %packages --nobase
-%include /usr/share/appliance-tools/base-pkgs.ks
+%include /usr/share/appliance-os/includes/base-pkgs.ks
 ovirt-recipe
 lokkit


commit 626df1f8076b23b78a3b438a96b653a1c57a103a
Author: Perry Myers <pmyers at redhat.com>
Date:   Mon Sep 29 16:16:25 2008 -0400

    Fix base-packages ks location due to change in upstream appliance-os package
    
    Signed-of-by: Perry Myers <pmyers at redhat.com>

diff --git a/ovirt.mk b/ovirt.mk
index cf56c06..d6b6ef1 100644
--- a/ovirt.mk
+++ b/ovirt.mk
@@ -108,7 +108,7 @@ tar-src:
        echo "repo --name=thincrust-net-src
--baseurl=$(THINCRUST_URL)/srpms" ; \
        echo "repo --name=ovirt-local
--baseurl=file://$(OVIRT_CACHE_DIR)/ovirt" ; \
        echo "%packages --nobase" ; \
-       grep -v '^-' /usr/share/appliance-tools/base-pkgs.ks ; \
+       grep -v '^-' /usr/share/appliance-os/includes/base-pkgs.ks ; \
        echo "lokkit" ; \
        for dir in $(SUBDIRS); do \
          echo "ovirt-$$dir" ; \

Perry