From c8c2983b732eda5a3d4d1bf0de690003b8837a74 Mon Sep 17 00:00:00 2001 From: Antoine Ginies Date: Mon, 29 Nov 2010 08:26:02 +0000 Subject: fix mes5 detection --- BCD/Isolinux.pm | 2 +- BCD/Media.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BCD/Isolinux.pm b/BCD/Isolinux.pm index 41c3d97..6b0d8df 100644 --- a/BCD/Isolinux.pm +++ b/BCD/Isolinux.pm @@ -32,7 +32,7 @@ sub switch_theme { my $binary = "/usr/share/bootsplash/scripts/make-boot-splash-raw"; -x $binary or die "$LOG you need $binary which is available in bootsplash >= 3.2.3\n"; my $cmd; - if ($isoconf->{based_on} gt "2009.1") { + if ($isoconf->{based_on} gt "2009.1" && $isoconf->{based_on} ne "mes5") { $cmd = "$binary $initrd $theme"; } else { # old script use a resolution parameter diff --git a/BCD/Media.pm b/BCD/Media.pm index 819979d..3b5878a 100644 --- a/BCD/Media.pm +++ b/BCD/Media.pm @@ -132,7 +132,7 @@ sub create_mediacfg { print $MEDIACFG "\n"; print $MEDIACFG "[media_info]\n"; print $MEDIACFG "version=$version\n"; - if ($isoconf->{based_on} gt "2009.1" or $isoconf->{based_on} ne "mes5") { + if ($isoconf->{based_on} gt "2009.1" && $isoconf->{based_on} ne "mes5") { print_color("$LOG > 2009.1 or not a mes5 product", $color); print $MEDIACFG "mediacfg_version=2\n"; } -- cgit v1.2.1