diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-11-04 14:05:57 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-11-04 14:05:57 +0000 |
| commit | 9b27817656c02746ae230508631ebfb4334f6f57 (patch) | |
| tree | 7d9655383f438fc558a054daa8e3ad55dc8aceb5 | |
| parent | f024f6ede059ff4b9cfe03076b1339b203132ba1 (diff) | |
| download | drakx-9b27817656c02746ae230508631ebfb4334f6f57.tar drakx-9b27817656c02746ae230508631ebfb4334f6f57.tar.gz drakx-9b27817656c02746ae230508631ebfb4334f6f57.tar.bz2 drakx-9b27817656c02746ae230508631ebfb4334f6f57.tar.xz drakx-9b27817656c02746ae230508631ebfb4334f6f57.zip | |
Revert "images: Fix 32-bit isolinux wrapper (s/i586/i386)"
This reverts commit addfd6769673ba661498183a220769144f758f5a.
Conflicts:
images/NEWS
| -rw-r--r-- | images/NEWS | 2 | ||||
| -rw-r--r-- | images/isolinux.cfg | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/images/NEWS b/images/NEWS index 43c9ef30c..6ee96e164 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- revert back to static per-arch isolinux.cfg files + Version 2.00 - 2 November 2013 by Thomas Backlund - ensure initrd is created with 644 perms (normally 600 for security reasons) diff --git a/images/isolinux.cfg b/images/isolinux.cfg index 70fa19d0a..1facfc8a3 100644 --- a/images/isolinux.cfg +++ b/images/isolinux.cfg @@ -1,8 +1,8 @@ default detect label detect com32 ifcpu.c32 - append 64 -- x86_64 -- i386 + append 64 -- x86_64 -- i586 label x86_64 config x86_64.cfg -label i386 - config i386.cfg +label i586 + config i586.cfg |