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 <konrad.wilk@oracle.com>

diff --git a/root_image/Makefile b/root_image/Makefile
index 5f4bdaa0d87c22bd63ad363dcf5fdc049dfcf916..da6461377a426503bbf7f17322ff6da6680016f7 100644 (file)
--- 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 4336ad8cdea66a0dd25701067ea17ccab2a6bbb6..17af8bd08c2795e05c35c1b229351f3d02df3619 100755 (executable)
--- 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