X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=p2v.ks.in;h=74ba0c1fd0ee1cdd1549b1d6035c42700134a4de;hb=b16a2c25233749983e1ba95122aa2036b6b67cbe;hp=bf6ea3933a461f51e0f2263d30f1cd901858e8d3;hpb=b5bdeec09a583c5a6e8dc1dbed1591723e5b708f;p=virt-p2v.git

diff --git a/p2v.ks.in b/p2v.ks.in
index bf6ea39..74ba0c1 100644
--- a/p2v.ks.in
+++ b/p2v.ks.in
@@ -18,15 +18,16 @@
 # 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@
+@LOCALREPO@
 
 %packages
 bash
@@ -53,12 +54,15 @@ openssh-clients
 nc
 
 # For the shell script
-dialog
 grep
 sed
 gawk
 findutils
 
+# For IP configuration
+iproute
+net-tools
+
 # For OCaml
 ocaml
 ocaml-runtime
@@ -66,8 +70,12 @@ ocaml-pcre
 ocaml-extlib
 ocaml-xml-light
 ocaml-libvirt
+# REQUIRED: ocaml-newt >= 0.9
+ocaml-newt
 
 # For network configuration
+# dhclient >= 4.0.0 fixes the cwd-holds-filesystem-open problem.
+# REQUIRED: dhclient >= 4.0.0
 dhclient
 
 # Some other generally useful packages
@@ -93,6 +101,7 @@ file
 if test "x$INSTALL_ROOT" = "x"; then ERROR=1; fi
 if ! test -d "$INSTALL_ROOT/usr/bin"; then ERROR=1; fi
 if ! test -d "@abs_top_srcdir@"; then ERROR=1; fi
+if ! test -d "@abs_top_srcdir@/extras"; then ERROR=1; fi
 if ! test -f "@abs_top_srcdir@/virt-p2v"; then ERROR=1; fi
 
 if test "x$ERROR" = "x1"; then
@@ -120,6 +129,9 @@ cp -a $INSTALL_ROOT/etc/lvm $INSTALL_ROOT/etc/lvm.new
 install -m 0644 -o root -g root @abs_top_srcdir@/lvm.conf \
 	$INSTALL_ROOT/etc/lvm.new
 
+# Copy everything under extras to the squashfs /extras.
+cp -a @abs_top_srcdir@/extras $INSTALL_ROOT/extras
+
 %end
 
 %post
@@ -149,4 +161,9 @@ touch /media/.hal-mtab
 # Make some mountpoints.
 mkdir /mnt/root
 
+# Remove some unused files.
+rm -rf /usr/share/man		;# 20 MB
+rm -rf /usr/share/doc		;# 44 MB
+rm -rf /usr/share/locale	;# 60 MB
+
 %end