Add --enable flags for CD properties.

diff --git a/configure.ac b/configure.ac
index ea7f3ad..560d5b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,45 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(virt-p2v,0.9.2)
 
+dnl Override CD properties.
+AC_ARG_ENABLE([cd-arch],
+       [AS_HELP_STRING([--enable-cd-arch],
+               [set CD architecture @<:@default=i386@:>@])],
+       [CD_ARCH=$enableval],
+       [CD_ARCH=i386])
+AC_ARG_ENABLE([cd-lang],
+       [AS_HELP_STRING([--enable-cd-lang],
+               [set CD language @<:@default=en_US.UTF-8@:>@])],
+       [CD_LANG=$enableval],
+       [CD_LANG=en_US.UTF-8])
+AC_ARG_ENABLE([cd-keyboard],
+       [AS_HELP_STRING([--enable-cd-keyboard],
+               [set CD keyboard @<:@default=us@:>@])],
+       [CD_KEYBOARD=$enableval],
+       [CD_KEYBOARD=us])
+AC_ARG_ENABLE([cd-timezone],
+       [AS_HELP_STRING([--enable-cd-timezone],
+               [set CD timezone @<:@default=US/Eastern@:>@])],
+       [CD_TIMEZONE=$enableval],
+       [CD_TIMEZONE=US/Eastern])
+AC_ARG_ENABLE([cd-base],
+       [AS_HELP_STRING([--enable-cd-base],
+               [set base Fedora for CD @<:@default=8@:>@])],
+       [CD_BASE=$enableval],
+       [CD_BASE=8])
+AC_ARG_ENABLE([cd-base-url],
+       [AS_HELP_STRING([--enable-cd-base-url],
+               [set download URL for packages])],
+       [CD_BASE_URL=$enableval],
+       [CD_BASE_URL=http://download.fedora.redhat.com/pub/fedora/linux/releases/$CD_BASE/Everything/$CD_ARCH/os/])
+
+AC_SUBST(CD_ARCH)
+AC_SUBST(CD_BASE)
+AC_SUBST(CD_BASE_URL)
+AC_SUBST(CD_LANG)
+AC_SUBST(CD_KEYBOARD)
+AC_SUBST(CD_TIMEZONE)
+
 dnl Check for basic OCaml script interpreter.
 AC_PROG_OCAML
 
@@ -47,27 +86,6 @@ dnl Check for optional qemu or qemu-kvm (for test-booting).
 AC_CHECK_PROG(HAVE_QEMU,qemu,qemu)
 AC_CHECK_PROG(HAVE_QEMU_KVM,qemu-kvm,qemu-kvm)
 
-dnl XXX Later we will change these so that the user can set them with
-dnl ./configure parameters.  This is just for testing.
-
-# i386 images also work on x86-64, so best to stick with i386.
-ARCH=i386
-
-# Base repository.
-BASE=8
-BASEURL=http://download.fedora.redhat.com/pub/fedora/linux/releases/$BASE/Everything/$ARCH/os/
-
-LANG=en_US.UTF-8
-KEYBOARD=us
-TIMEZONE=US/Eastern
-
-AC_SUBST(ARCH)
-AC_SUBST(BASE)
-AC_SUBST(BASEURL)
-AC_SUBST(LANG)
-AC_SUBST(KEYBOARD)
-AC_SUBST(TIMEZONE)
-
 dnl Summary.
 echo "------------------------------------------------------------"
 echo "Thanks for downloading" $PACKAGE_STRING

diff --git a/p2v.ks.in b/p2v.ks.in
index bf6ea39..4415690 100644 (file)
--- a/p2v.ks.in
+++ b/p2v.ks.in
@@ -18,15 +18,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-lang @LANG@
-keyboard @KEYBOARD@
-timezone @TIMEZONE@
+lang @CD_LANG@
+keyboard @CD_KEYBOARD@
+timezone @CD_TIMEZONE@
 auth --useshadow --enablemd5
 selinux --enforcing
 firewall --disabled
 
-repo --name=released --baseurl=@BASEURL@
-#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-@BASE@&arch=@ARCH@
+repo --name=released --baseurl=@CD_BASE_URL@
+#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-@CD_BASE@&arch=@CD_ARCH@
 
 %packages
 bash