From: Konrad Rzeszutek Wilk Date: Tue, 10 Feb 2015 16:16:53 +0000 (-0500) Subject: Makefile: Disable plymouth install. X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6d5eaa612ade91b98acc00d4dc09b3c6f329f7fe;p=xentesttools%2Fbootstrap.git Makefile: Disable plymouth install. We needed that at some point to make sure that KMS would function properly - but at this point it is just a waste of extra space on the ramdisk. Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/root_image/Makefile b/root_image/Makefile index 5f4bdaa..da64613 100644 --- a/root_image/Makefile +++ b/root_image/Makefile @@ -190,7 +190,7 @@ distdir: .PHONY: root_image-userspace-install root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins \ tools-install wget-install vim-install rsync-install openssh-install \ - xtt-tools-install netperf-install lvm2-install plymouth-install \ + xtt-tools-install netperf-install lvm2-install \ pciutils-install iscsi-install bridge-utils-install xend-install \ nfs-install fio-install irqbalance-install pm-utils-install \ cpufrequtils-install xenalyze-install diff --git a/root_image/etc/init.d/primary_fb b/root_image/etc/init.d/primary_fb index 4336ad8..17af8bd 100755 --- a/root_image/etc/init.d/primary_fb +++ b/root_image/etc/init.d/primary_fb @@ -38,6 +38,11 @@ fb_stop() plymouth --hide-splash } +which plymouth 1>/dev/null 2>/dev/null +if [ $? -eq 1 ]; then + echo "No plymouth. Disabling FB tests." + exit +fi NORM=$(boot_parameter 'nofb') if [ $? == 1 ]; then case "$1" in