diff options
| author | Anne Nicolas <ennael@mageia.org> | 2011-02-10 22:40:02 +0000 |
|---|---|---|
| committer | Anne Nicolas <ennael@mageia.org> | 2011-02-10 22:40:02 +0000 |
| commit | 2c5ea7b5eb8d456cd2225156f2703ffd49fb01bb (patch) | |
| tree | a50a0fd3db3c5823f7a8ca02003dd099db755aed | |
| parent | e90e6e799b450584fa7ee7135bc6322cbed22567 (diff) | |
| download | drakx-2c5ea7b5eb8d456cd2225156f2703ffd49fb01bb.tar drakx-2c5ea7b5eb8d456cd2225156f2703ffd49fb01bb.tar.gz drakx-2c5ea7b5eb8d456cd2225156f2703ffd49fb01bb.tar.bz2 drakx-2c5ea7b5eb8d456cd2225156f2703ffd49fb01bb.tar.xz drakx-2c5ea7b5eb8d456cd2225156f2703ffd49fb01bb.zip | |
revert gfxboot.com change as we postpone syslinux update
| -rwxr-xr-x | images/make_boot_img | 6 | ||||
| -rw-r--r-- | rescue/Makefile | 2 | ||||
| -rw-r--r-- | rescue/NEWS | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/images/make_boot_img b/images/make_boot_img index 415cbd5c2..81b2d6429 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -119,7 +119,7 @@ display help.msg implicit 1 EOF my $header_gfxboot = <<EOF; -ui gfxboot.c32 bootlogo +ui gfxboot.com bootlogo label harddisk localboot 0x80 EOF @@ -723,7 +723,7 @@ sub isolinux { syslinux_all_files('isolinux', $kernels); _ "cp $isolinux_bin isolinux/isolinux.bin"; - _ "cp /usr/lib/syslinux/gfxboot.c32 isolinux/gfxboot.c32"; + _ "cp /usr/lib/syslinux/gfxboot.com isolinux/gfxboot.com"; output("isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1)); xbox_stage1() if arch() =~ /i.86/; @@ -761,7 +761,7 @@ sub boot_iso { _ "cp /usr/share/gfxboot/themes/Mageia/install/* .boot_iso/isolinux" if $with_gfxboot; # _ "cp /home/pixel/cooker/soft/theme/mandriva-gfxboot-theme/inst/* .boot_iso/isolinux" if $with_gfxboot; #_ "cp /home/teuf/mdv/src/mandriva-gfxboot-theme/inst/* .boot_iso/isolinux" if $with_gfxboot; - _ "cp /usr/lib/syslinux/gfxboot.c32 .boot_iso/isolinux/gfxboot.c32" if $with_gfxboot; + _ "cp /usr/lib/syslinux/gfxboot.com .boot_iso/isolinux/gfxboot.com" if $with_gfxboot; output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot)); diff --git a/rescue/Makefile b/rescue/Makefile index 4a6edd9e9..cbc1a981b 100644 --- a/rescue/Makefile +++ b/rescue/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.22 +VERSION=1.21 PRODUCT=drakx-installer-rescue RESCUE = rescue.sqfs diff --git a/rescue/NEWS b/rescue/NEWS index 557db4c4e..078c48ef2 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -1,6 +1,3 @@ -Version 1.22 - 24 February 2011, by Pascal "pterjan" Terjan - -- cleaning for Mageia import - include /etc/netconfig (needed by mount.nfs) Version 1.18 - 13 April 2010, by Olivier "blino" Blin |