aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2010-11-29 08:26:02 +0000
committerAntoine Ginies <aginies@mandriva.com>2010-11-29 08:26:02 +0000
commitc8c2983b732eda5a3d4d1bf0de690003b8837a74 (patch)
tree287ecfbd59a85007db8d52fc9931f42c12ca084c
parentdb9651a56a3dffdf17a303282f789e823cd90096 (diff)
downloadbcd-c8c2983b732eda5a3d4d1bf0de690003b8837a74.tar
bcd-c8c2983b732eda5a3d4d1bf0de690003b8837a74.tar.gz
bcd-c8c2983b732eda5a3d4d1bf0de690003b8837a74.tar.bz2
bcd-c8c2983b732eda5a3d4d1bf0de690003b8837a74.tar.xz
bcd-c8c2983b732eda5a3d4d1bf0de690003b8837a74.zip
fix mes5 detection
-rw-r--r--BCD/Isolinux.pm2
-rw-r--r--BCD/Media.pm2
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";
}