X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=p2v.ks.in;h=116a04f6a924ee4a2ac94788a058cb8ab09485b9;hb=HEAD;hp=c62d4e8338e165e7f4983bbcf532d82e649b5e9f;hpb=56cb3cbf0f571df50f8b80efe651c24da81f07d2;p=virt-p2v.git

diff --git a/p2v.ks.in b/p2v.ks.in
index c62d4e8..116a04f 100644
--- a/p2v.ks.in
+++ b/p2v.ks.in
@@ -25,11 +25,22 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --disabled
 
+# This should enable the serial console.  However it requires
+# livecd-tools 018 or above (is ignored on earlier versions).
+bootloader --append="console=tty0 console=ttyS0,9600n8"
+
+# Basic Fedora repository and updates.
 repo --name=released --baseurl=@CD_BASE_URL@
+repo --name=updates --baseurl=@CD_UPDATES_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@
 
-%packages
+# The p2vrepo subdirectory, containing virt-p2v RPM.
+repo --name=p2v --baseurl=file://@abs_top_builddir@/p2vrepo
+
+%packages --excludedocs
 bash
 kernel
 syslinux
@@ -39,6 +50,9 @@ chkconfig
 authconfig
 rootfiles
 
+# For unicode console support.
+kbd
+
 # dd, sleep, sync, etc.
 coreutils
 
@@ -63,15 +77,6 @@ findutils
 iproute
 net-tools
 
-# For OCaml
-ocaml
-ocaml-runtime
-ocaml-pcre
-ocaml-extlib
-ocaml-xml-light
-ocaml-libvirt
-ocaml-newt
-
 # For network configuration
 dhclient
 
@@ -86,6 +91,17 @@ vim-enhanced
 bind-utils
 file
 
+# virt-p2v package and its deps
+ocaml
+ocaml-findlib
+ocaml-pcre
+ocaml-extlib
+ocaml-xml-light
+ocaml-libvirt
+ocaml-newt
+ocaml-gettext
+virt-p2v
+
 
 %post --nochroot
 
@@ -99,7 +115,6 @@ 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
     echo "**************************************************"
@@ -113,19 +128,16 @@ 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
 
+# Overwrite /etc/event.d/tty1 (normally from initscripts).
+install -m 0644 -o root -g root @abs_top_srcdir@/tty1 $INSTALL_ROOT/etc/event.d/
+
+# Also /etc/inittab (from initscripts).
+install -m 0644 -o root -g root @abs_top_srcdir@/inittab $INSTALL_ROOT/etc/
+
 # Copy everything under extras to the squashfs /extras.
 cp -a @abs_top_srcdir@/extras $INSTALL_ROOT/extras
 
@@ -160,7 +172,7 @@ 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
+#rm -rf /usr/share/doc		;# 44 MB
+#rm -rf /usr/share/locale	;# 60 MB
 
 %end