[Ovirt-devel] [PATCH] separate out repo locations into repos.ks files

[Hugh O. Brock]

On Thu, May 22, 2008 at 03:48:41PM -0400, Perry N. Myers wrote:
> Not sure if everyone will think this is a good idea, but I get annoyed when 
> I modify one of the ks to have my local mirrors and then get merge 
> conflicts with other changes.  This patch just splits out the repo/url
> definitions into separate files.
>
> -------------
>
> Extract repo locations from the sections of the kickstart that might be modified
> during developement so that developers can overwrite with their local mirrors.
>    Signed-off-by: Perry Myers <pmyers at redhat.com>
>
> diff --git a/ovirt-host-creator/common-install.ks b/ovirt-host-creator/common-install.ks
> index 2273531..8f4d175 100644
> --- a/ovirt-host-creator/common-install.ks
> +++ b/ovirt-host-creator/common-install.ks
> @@ -9,6 +9,3 @@ services --enabled=ntpd,collectd,iptables,network
> bootloader --timeout=1
> rootpw --iscrypted Xa8QeYfWrtscM
>
> -repo --name=f9 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
> -repo --name=f9-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch
> -
> diff --git a/ovirt-host-creator/ovirt-i386.ks b/ovirt-host-creator/ovirt-i386.ks
> index 4911883..e58176a 100644
> --- a/ovirt-host-creator/ovirt-i386.ks
> +++ b/ovirt-host-creator/ovirt-i386.ks
> @@ -1,5 +1,7 @@
> %include common-install.ks
>
> +%include repos.ks
> +
> %packages --excludedocs
> %include common-pkgs.ks
>
> diff --git a/ovirt-host-creator/ovirt-x86_64.ks b/ovirt-host-creator/ovirt-x86_64.ks
> index 62f62d6..91aeea6 100644
> --- a/ovirt-host-creator/ovirt-x86_64.ks
> +++ b/ovirt-host-creator/ovirt-x86_64.ks
> @@ -1,5 +1,7 @@
> %include common-install.ks
>
> +%include repos.ks
> +
> %packages --excludedocs
> %include common-pkgs.ks
> -glibc.i686
> diff --git a/ovirt-host-creator/repos.ks b/ovirt-host-creator/repos.ks
> new file mode 100644
> index 0000000..6703b91
> --- /dev/null
> +++ b/ovirt-host-creator/repos.ks
> @@ -0,0 +1,3 @@
> +repo --name=f9 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
> +repo --name=f9-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch
> +
> diff --git a/wui-appliance/repos.ks b/wui-appliance/repos.ks
> new file mode 100644
> index 0000000..a182bde
> --- /dev/null
> +++ b/wui-appliance/repos.ks
> @@ -0,0 +1,8 @@
> +url --url http://download.fedora.redhat.com/pub/fedora/linux/releases/9/Fedora/x86_64/os/
> +
> +repo --name=f9 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=x86_64
> +repo --name=f9-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=x86_64
> +repo --name=ovirt --baseurl=http://ovirt.org/repos/ovirt/9/x86_64
> +# temporary
> +repo --name=f9testing --includepkgs=rubygem-rubyforge,rubygem-activeldap,rubygem-hoe --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f9&arch=x86_64
> +
> diff --git a/wui-appliance/wui-devel-x86_64.ks b/wui-appliance/wui-devel-x86_64.ks
> index 77dd3c5..84f0eae 100644
> --- a/wui-appliance/wui-devel-x86_64.ks
> +++ b/wui-appliance/wui-devel-x86_64.ks
> @@ -1,5 +1,4 @@
> install
> -url --url http://download.fedora.redhat.com/pub/fedora/linux/releases/9/Fedora/x86_64/os/
>
> %include common-install.ks
>
> @@ -10,12 +9,7 @@ logvol /iscsi3 --name=iSCSI3 --vgname=VolGroup00 --size=64
> logvol /iscsi4 --name=iSCSI4 --vgname=VolGroup00 --size=64
> logvol /iscsi5 --name=iSCSI5 --vgname=VolGroup00 --size=64
>
> -repo --name=f9 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=x86_64
> -repo --name=f9-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=x86_64
> -repo --name=ovirt-management --baseurl=http://ovirt.org/repos/ovirt/9/x86_64
> -# temporary
> -repo --name=f9testing --includepkgs=rubygem-rubyforge,rubygem-activeldap,rubygem-hoe --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f9&arch=x86_64
> -
> +%include repos.ks
>
> %packages

ACK

If it works for you, I'm fine with it...

--Hugh