diff -Nru /tmp/q302FxKHA5/lilo-installer-1.14ubuntu2/debian/changelog /tmp/PK9tJN81iN/lilo-installer-1.14ubuntu3/debian/changelog --- /tmp/q302FxKHA5/lilo-installer-1.14ubuntu2/debian/changelog 2006-03-22 08:53:27.000000000 +0000 +++ /tmp/PK9tJN81iN/lilo-installer-1.14ubuntu3/debian/changelog 2006-05-24 12:53:55.000000000 +0100 @@ -1,3 +1,11 @@ +lilo-installer (1.14ubuntu3) dapper; urgency=low + + * Fix syntax error in isinstallable script (closes: Malone #43820). + * Add a collection of nasty little hacks to make the postinst work with + non-devfs partition names. + + -- Colin Watson Wed, 24 May 2006 12:53:54 +0100 + lilo-installer (1.14ubuntu2) dapper; urgency=low * Run debconf-updatepo to update msgids in ku.po. diff -Nru /tmp/q302FxKHA5/lilo-installer-1.14ubuntu2/debian/isinstallable /tmp/PK9tJN81iN/lilo-installer-1.14ubuntu3/debian/isinstallable --- /tmp/q302FxKHA5/lilo-installer-1.14ubuntu2/debian/isinstallable 2006-03-22 08:49:23.000000000 +0000 +++ /tmp/PK9tJN81iN/lilo-installer-1.14ubuntu3/debian/isinstallable 2006-05-24 12:10:12.000000000 +0100 @@ -13,6 +13,5 @@ exit 1 ;; esac -;; exit 0 diff -Nru /tmp/q302FxKHA5/lilo-installer-1.14ubuntu2/debian/postinst /tmp/PK9tJN81iN/lilo-installer-1.14ubuntu3/debian/postinst --- /tmp/q302FxKHA5/lilo-installer-1.14ubuntu2/debian/postinst 2005-10-24 17:34:45.000000000 +0100 +++ /tmp/PK9tJN81iN/lilo-installer-1.14ubuntu3/debian/postinst 2006-05-24 12:43:45.000000000 +0100 @@ -52,12 +52,18 @@ prefix=$(echo "$bootfs_devfs" | sed 's/\(\/dev\/[a-z]\+\).*/\1/') -if [ "$prefix" != /dev/md ]; then - disc_offered_devfs=$(find $prefix -follow -name disc | head -n 1) -else - disc_offered_devfs="$bootfs_devfs" - db_register lilo-installer/bootdev_raid lilo-installer/bootdev -fi +case $prefix in + /dev/md) + disc_offered_devfs="$bootfs_devfs" + db_register lilo-installer/bootdev_raid lilo-installer/bootdev + ;; + /dev/[hs]d[a-z]) + disc_offered_devfs="$prefix" + ;; + *) + disc_offered_devfs=$(find $prefix -follow -name disc | head -n 1) + ;; +esac disc_offered=$(mapdevfs "$disc_offered_devfs") db_capb backup @@ -74,7 +80,7 @@ *Master*|*RAID*) bootdev=$(mapdevfs $disc_offered_devfs) ;; *Ubuntu*) bootdev=$(mapdevfs $bootfs_devfs) - part=$(echo $bootdev | sed 's/.*\([0-9]\)/part\1/') + part=$(echo $bootdev | sed 's/.*\([0-9]\)/\1/') ;; *Advanced*) not_done=1 @@ -90,13 +96,13 @@ if [ -b "$RET" ]; then bootdev="$(mapdevfs $RET)" not_done=0 - part=$(echo $bootdev | sed 's/.*\([0-9]\)/part\1/') + part=$(echo $bootdev | sed 's/.*\([0-9]\)/\1/') fi ;; /dev/[hs]d[a-z]*|/dev/md*) bootdev=$RET; not_done=0 - part=$(echo $bootdev | sed 's/.*\([0-9]\)/part\1/') + part=$(echo $bootdev | sed 's/.*\([0-9]\)/\1/') ;; esac @@ -129,7 +135,7 @@ # Do not try to make MD device active if (echo "${bootdev}" | grep -q '[0-9]$') && [ "${raid_boot}" = "no" ]; then # Installing to a partition, check if it is already marked active - if ! fdisk -l ${disc_offered_devfs} | grep "^/dev[a-z0-9/]\+${part} " | grep -q '\*'; then + if ! fdisk -l ${disc_offered_devfs} | grep "^/dev[a-z0-9/]\+\(part\|[hs]d[a-z]\)${part} " | grep -q '\*'; then # partition is not marked active, offer to make it so db_input high lilo-installer/activate-part || [ $? -eq 30 ] if ! db_go; then