Hi folks,
As I've just blogged, I've got a second alpha CD released with EFI
support, this time using grub-efi by default. The first release used
elilo only, but I think grub is preferred. So, my question is: should
we follow existing x86 convention and allow users a choice of
bootloader (grub-efi/elilo like grub/lilo for BIOS boot), or should we
just offer grub-efi? Both work OK, but grub-efi is a bit more capable
IMHO. If we *do* want to support elilo too, we'll need small patches
applying to both elilo and elilo-installer (see attached for what I
have so far). Talking of elilo, I also found #685186 in my testing...
Thoughts?
--
Steve McIntyre, Cambridge, UK. st...@einval.com
There's no sensation to compare with this
Suspended animation, A state of bliss
diff -Nru elilo-3.14/debian/changelog elilo-3.14/debian/changelog
--- elilo-3.14/debian/changelog 2012-06-29 18:42:58.000000000 +0100
+++ elilo-3.14/debian/changelog 2012-08-12 02:34:01.000000000 +0100
@@ -1,3 +1,13 @@
+elilo (3.14-1.1) unstable; urgency=low
+
+ * NMU
+ * Quick hacks for amd64 EFI CD testing:
+ + Use UTF-8 instead of ISO8859-1, etc. when mounting FAT fs in elilo
+ + Pick up on "pci=" entries as well as "console=" in /proc/cmdline
+ when generating append entries
+
+ -- Steve McIntyre <93...@debian.org> Sun, 12 Aug 2012 13:30:28 +0100
+
elilo (3.14-1) unstable; urgency=low
* new upstream version
diff -Nru elilo-3.14/debian/elilo.sh elilo-3.14/debian/elilo.sh
--- elilo-3.14/debian/elilo.sh 2012-06-29 18:42:58.000000000 +0100
+++ elilo-3.14/debian/elilo.sh 2012-08-12 02:32:37.000000000 +0100
@@ -345,7 +345,7 @@
fi
[ "$VERBOSE" = 1 ] && echo "$PRG: Mounting $boot..."
- mount -t "$fstype" -o
codepage=437,iocharset=iso8859-1,rw,noexec,umask=077$loop "$boot"
"$TMP/bootstrap.$$"
+ mount -t "$fstype" -o rw,noexec,umask=077$loop "$boot" "$TMP/bootstrap.$$"
if [ $? != 0 ] ; then
echo 1>&2 "$PRG: An error occured mounting $boot"
return 1
@@ -521,9 +521,12 @@
cmdline=""
fi
-append=`echo $cmdline | tr ' ' '\n' | grep "^console=" | tr '\n' ' '`
+append=`echo $cmdline | tr ' ' '\n' | grep -e "^console=" -e "^pci="| tr '\n'
' '`
if [ ! -z "$append" ]; then append="append=\"$append\""; fi
+echo "$PRG: cmdline $cmdline"
+echo "$PRG: append now $append"
+
echo \
"## elilo configuration file generated by elilo $VERSION
mr diff: /home/steve/debian/d-i/d-i/packages/elilo-installer
diff --git a/debian/changelog b/debian/changelog
index 8d8a217..8a4f33e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+elilo-installer (1.21) unstable; urgency=low
+
+ [Steve McIntyre]
+ * Allow use of elilo for amd64/efi and i386/efi.
+
+ -- Steve McIntyre <93...@debian.org> Tue, 21 Aug 2012 22:05:39 +0100
+
elilo-installer (1.20) unstable; urgency=low
* Team upload
diff --git a/debian/control b/debian/control
index acca7f2..c91f77f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: git://git.debian.org/d-i/elilo-installer.git
Package: elilo-installer
Package-Type: udeb
-Architecture: i386 ia64
+Architecture: i386 ia64 amd64
Provides: bootable-system
Depends: cdebconf-udeb, installed-base, partconf-find-partitions (>= 1.08), di-utils-mapdevfs, fat-modules, efi-modules
XB-Installer-Menu-Item: 7600
diff --git a/debian/isinstallable b/debian/isinstallable
index 4914855..164bccd 100755
--- a/debian/isinstallable
+++ b/debian/isinstallable
@@ -4,9 +4,10 @@ set -e
ARCH="$(archdetect)"
case $ARCH in
- i386/mac|amd64/mac)
- # x86-based Apple systems use elilo, but only if EFI is available
- # (not booting in BIOS compatibility mode).
+ i386/mac|amd64/mac|i386/efi|amd64/efi)
+ # x86-based Apple and newer EFI-compatible systems use elilo, but
+ # only if EFI is available (not booting in BIOS compatibility
+ # mode).
# Note: depends on partman-efi to load the efivars module!
if [ -d /sys/firmware/efi ]; then
exit 0
