diff -Nru rescue-1.12/debian/changelog rescue-1.12ubuntu1/debian/changelog --- rescue-1.12/debian/changelog 2007-09-14 22:05:17.000000000 +0100 +++ rescue-1.12ubuntu1/debian/changelog 2008-04-28 12:24:32.000000000 +0100 @@ -1,3 +1,10 @@ +rescue (1.12ubuntu1) hardy-proposed; urgency=low + + * Fix selection of menu items without a corresponding intro question, + broken in rescue 1.12 (LP: #218549). + + -- Colin Watson Mon, 28 Apr 2008 12:24:32 +0100 + rescue (1.12) unstable; urgency=low [ Jérémy Bobbio ] diff -Nru /tmp/TXneOn4E2R/rescue-1.12/debian/control /tmp/DGTyNPVE56/rescue-1.12ubuntu1/debian/control --- rescue-1.12/debian/control 2007-07-23 12:16:20.000000000 +0100 +++ rescue-1.12ubuntu1/debian/control 2008-04-28 12:05:59.000000000 +0100 @@ -1,7 +1,8 @@ Source: rescue Section: debian-installer Priority: optional -Maintainer: Debian Install System Team +Maintainer: Ubuntu Installer Team +XSBC-Original-Maintainer: Debian Install System Team Uploaders: Colin Watson , Frans Pop Build-Depends: debhelper (>= 4.2) XS-Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/rescue diff -Nru /tmp/TXneOn4E2R/rescue-1.12/debian/rescue-mode.postinst /tmp/DGTyNPVE56/rescue-1.12ubuntu1/debian/rescue-mode.postinst --- rescue-1.12/debian/rescue-mode.postinst 2007-09-14 22:00:17.000000000 +0100 +++ rescue-1.12ubuntu1/debian/rescue-mode.postinst 2008-04-28 11:01:37.000000000 +0100 @@ -266,11 +266,13 @@ log "Could not find menu item for '$RET'!" continue fi - db_subst "rescue/${item#[0-9][0-9]}/intro" \ - DEVICE "${RESCUE_ROOTDEV}" - db_input high "rescue/${item#[0-9][0-9]}/intro" || true - if ! db_go; then - continue + item_name="${item#[0-9][0-9]}" + if db_subst "rescue/$item_name/intro" \ + DEVICE "${RESCUE_ROOTDEV}"; then + db_input high "rescue/$item_name/intro" || true + if ! db_go; then + continue + fi fi code=0 "/lib/rescue.d/$item" || code=$?