tags 414419 patch
thanks

Hi Bdale,

Here's a patch that should fix this problem.  My original thought was to
check for an initial install of the package instead of checking for an
unconfigured fstab, but Dann suggested checking for the presence of
elilo.conf, so I've done that instead.

The patch also loses the various 'exit 0's that were added, as a manner of
future-proofing, because this bypasses the #DEBHELPER# token at the bottom
of the script.  Not a problem today with the null expansion, but better to
fix it sooner rather than later.

The NMU will be uploaded shortly, and I have Dann's word that he'll scream
at me if it doesn't work. :)

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
diff -u elilo-3.6/debian/changelog elilo-3.6/debian/changelog
--- elilo-3.6/debian/changelog
+++ elilo-3.6/debian/changelog
@@ -1,3 +1,16 @@
+elilo (3.6-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * The check for new installs is broken, because apt-install elilo is
+    apparently not guaranteed to complete before the fstab is configured;
+    instead, check for the existence of /etc/elilo.conf to determine 
+    whether to run elilo on install.  Closes: #414419.
+  * Also fix a missing $ in the debconf config script that caused a syntax
+    error.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Mon, 12 Mar 2007 03:44:09 -0700
+
 elilo (3.6-3) unstable; urgency=high
 
   * patch from Dann Frazier that adds an option to run /usr/sbin/elilo in 
diff -u elilo-3.6/debian/elilo.config elilo-3.6/debian/elilo.config
--- elilo-3.6/debian/elilo.config
+++ elilo-3.6/debian/elilo.config
@@ -4,7 +4,7 @@
 
 . /usr/share/debconf/confmodule
 
-if [ "2" ] && dpkg --compare-versions $2 lt 3.2-1
+if [ "$2" ] && dpkg --compare-versions $2 lt 3.2-1
 then
   db_input high elilo/format || true
 else
diff -u elilo-3.6/debian/postinst elilo-3.6/debian/postinst
--- elilo-3.6/debian/postinst
+++ elilo-3.6/debian/postinst
@@ -10,22 +10,21 @@
 case "$1" in
     configure|reconfigure)
 	# On new installs, do nothing - elilo-installer will handle it for d-i
-	if grep -q "^# UNCONFIGURED FSTAB FOR BASE SYSTEM" /etc/fstab ; then
-	  exit 0
-	fi
-        if [ "$2" ] && dpkg --compare-versions $2 lt 3.2-1
-        then
-            db_get elilo/format || true;
-            if [ x"$RET" = x"true" ]; then
-                echo "Running elilo..."
-                /usr/sbin/elilo --format --efiboot
+	if [ -e /etc/elilo.conf ]; then
+            if [ "$2" ] && dpkg --compare-versions "$2" lt 3.2-1
+            then
+                db_get elilo/format || true;
+                if [ x"$RET" = x"true" ]; then
+                    echo "Running elilo..."
+                    /usr/sbin/elilo --format --efiboot
+                fi
+            else
+                db_get elilo/runme || true;
+                if [ x"$RET" = x"true" ]; then
+                    echo "Running elilo..."
+                    /usr/sbin/elilo
+                fi
             fi
-            exit 0
-        fi
-        db_get elilo/runme || true;
-        if [ x"$RET" = x"true" ]; then
-            echo "Running elilo..."
-            /usr/sbin/elilo
         fi
     ;;
 

Reply via email to