--- p2v/image-builder/common-minimizer.ks | 2 +- p2v/image-builder/common-pkgs.ks | 2 ++ p2v/image-builder/common-post-nochroot.ks | 2 ++ p2v/image-builder/common-post.ks | 2 ++ p2v/image-builder/p2v-post.ks | 2 ++ p2v/image-builder/virt-p2v-image.ks | 6 ------ 6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/p2v/image-builder/common-minimizer.ks b/p2v/image-builder/common-minimizer.ks index cd2c8d6..f1ba537 100644 --- a/p2v/image-builder/common-minimizer.ks +++ b/p2v/image-builder/common-minimizer.ks @@ -5,7 +5,7 @@ # # Matthew Booth <[email protected]> - 18/4/2011 -%post --nochroot --interpreter image-minimizer +%post --nochroot # lokkit is just an install-time dependency; we can remove # it afterwards, which we do here droprpm system-config-* diff --git a/p2v/image-builder/common-pkgs.ks b/p2v/image-builder/common-pkgs.ks index 2dfd86e..1c6eaca 100644 --- a/p2v/image-builder/common-pkgs.ks +++ b/p2v/image-builder/common-pkgs.ks @@ -1,3 +1,4 @@ +%packages --excludedocs --nobase # Direct requirements rubygem-virt-p2v dejavu-sans-fonts @@ -52,3 +53,4 @@ ql2200-firmware ql23xx-firmware ql2400-firmware ql2500-firmware +%end diff --git a/p2v/image-builder/common-post-nochroot.ks b/p2v/image-builder/common-post-nochroot.ks index 58015a2..fee305d 100644 --- a/p2v/image-builder/common-post-nochroot.ks +++ b/p2v/image-builder/common-post-nochroot.ks @@ -1,3 +1,4 @@ +%post --nochroot %include version.ks PRODUCT='Virt P2V' @@ -58,3 +59,4 @@ cp $INSTALL_ROOT/etc/issue $INSTALL_ROOT/etc/issue.net if [ -f "$INSTALL_ROOT/initrd0.img" ]; then mv -v "$INSTALL_ROOT/initrd0.img" "$LIVE_ROOT/isolinux/initrd0.img" fi +%end diff --git a/p2v/image-builder/common-post.ks b/p2v/image-builder/common-post.ks index f591d67..268965d 100644 --- a/p2v/image-builder/common-post.ks +++ b/p2v/image-builder/common-post.ks @@ -1,3 +1,4 @@ +%post # -*-Shell-script-*- echo "Starting Kickstart Post" PATH=/sbin:/usr/sbin:/bin:/usr/bin @@ -34,3 +35,4 @@ sed -i '/rm -f \/etc\/yp.conf/d' $DHSCRIPT localedef --list-archive | grep -v -i -E 'en_US.utf8' |xargs localedef --delete-from-archive mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl /usr/sbin/build-locale-archive +%end diff --git a/p2v/image-builder/p2v-post.ks b/p2v/image-builder/p2v-post.ks index 31fa8e3..bf58692 100644 --- a/p2v/image-builder/p2v-post.ks +++ b/p2v/image-builder/p2v-post.ks @@ -1,3 +1,4 @@ +%post # Run virt-p2v if [ ! -e /etc/rc.d/rc.local ]; then echo "#!/bin/sh" > /etc/rc.d/rc.local @@ -53,3 +54,4 @@ done done /sbin/poweroff EOF +%end diff --git a/p2v/image-builder/virt-p2v-image.ks b/p2v/image-builder/virt-p2v-image.ks index dca8840..4b40a85 100644 --- a/p2v/image-builder/virt-p2v-image.ks +++ b/p2v/image-builder/virt-p2v-image.ks @@ -2,19 +2,13 @@ %include common-install.ks -%packages --excludedocs --nobase %include common-pkgs.ks -%end -%post %include common-post.ks %include p2v-post.ks -%end %include common-minimizer.ks -%post --nochroot %include common-post-nochroot.ks -%end %include common-manifest-post.ks -- 1.7.11.7 _______________________________________________ Libguestfs mailing list [email protected] https://www.redhat.com/mailman/listinfo/libguestfs
