X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=p2v.ks.in;h=ae385d1a6aad04899075b85b34c8883430165792;hb=06c28adccc3dbd0734659d5b10c60d63d5775ca8;hp=44156905ed10b84270736f979bfd1123f6016d2a;hpb=67e7961ca21aa09bcb966b1d62be68a686c87d8a;p=virt-p2v.git

diff --git a/p2v.ks.in b/p2v.ks.in
index 4415690..ae385d1 100644
--- a/p2v.ks.in
+++ b/p2v.ks.in
@@ -25,9 +25,16 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --disabled
 
+# Basic Fedora repo.
 repo --name=released --baseurl=@CD_BASE_URL@
 #repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-@CD_BASE@&arch=@CD_ARCH@
 
+# A local repository if selected by ./configure --enable-localrepo=...
+@LOCALREPO@
+
+# The rpmbuild subdirectory, containing virt-p2v RPM.
+repo --name=p2v --baseurl=file://@abs_top_builddir@/rpmbuild
+
 %packages
 bash
 kernel
@@ -53,19 +60,14 @@ openssh-clients
 nc
 
 # For the shell script
-dialog
 grep
 sed
 gawk
 findutils
 
-# For OCaml
-ocaml
-ocaml-runtime
-ocaml-pcre
-ocaml-extlib
-ocaml-xml-light
-ocaml-libvirt
+# For IP configuration
+iproute
+net-tools
 
 # For network configuration
 dhclient
@@ -81,6 +83,9 @@ vim-enhanced
 bind-utils
 file
 
+# virt-p2v package and its deps
+virt-p2v
+
 
 %post --nochroot
 
@@ -93,7 +98,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 -f "@abs_top_srcdir@/virt-p2v"; then ERROR=1; fi
+if ! test -d "@abs_top_srcdir@/extras"; then ERROR=1; fi
 
 if test "x$ERROR" = "x1"; then
     echo "**************************************************"
@@ -107,19 +112,13 @@ if test "x$ERROR" = "x1"; then
     exit 1
 fi
 
-install -m 0755 -o root -g root \
-	@abs_top_srcdir@/virt-p2v \
-	@abs_top_srcdir@/virt-p2v-update-wrapper \
-	@abs_top_srcdir@/iso-attach \
-	$INSTALL_ROOT/usr/bin
-
-install -m 0644 -o root -g root @abs_top_srcdir@/inittab \
-	$INSTALL_ROOT/etc
-
 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 +148,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