On Wed, Oct 03, 2007 at 12:40:11PM +0200, Morten Werner Forsbring wrote: > Morten Werner Forsbring <[EMAIL PROTECTED]> writes: > > > The problem is when trying to install grub or lilo. First > > syslog-entries from grub-installer: > > I added set -x as requested by lunar, and the results is out [1]. I > aslo tried to patch lilo-installer.postinst, which also is in the same > webfolder [1].
Thanks for the tests and logs. I made a mistake in a sed expression that is both present in lilo-installer and grub-installer. *sigh* I have update the test image at: http://people.debian.org/~lunar/i2o_support-i386-mini.iso Attached is an updated version of the previous patch. Cheers, -- Jérémy Bobbio .''`. [EMAIL PROTECTED] : :Ⓐ : # apt-get install anarchism `. `'` `-
diff --git a/packages/arch/i386/grub-installer/debian/changelog
b/packages/arch/i386/grub-installer/debian/changelog
index ad98647..db171d9 100644
--- a/packages/arch/i386/grub-installer/debian/changelog
+++ b/packages/arch/i386/grub-installer/debian/changelog
@@ -1,3 +1,10 @@
+grub-installer (1.27) UNRELEASED; urgency=low
+
+ [ Jérémy Bobbio ]
+ * Add support for i2o RAID adapters.
+
+ -- Jérémy Bobbio <[EMAIL PROTECTED]> Wed, 03 Oct 2007 00:19:29 +0200
+
grub-installer (1.26) unstable; urgency=low
[ Joey Hess ]
diff --git a/packages/arch/i386/grub-installer/grub-installer
b/packages/arch/i386/grub-installer/grub-installer
index 16c9183..b45004c 100755
--- a/packages/arch/i386/grub-installer/grub-installer
+++ b/packages/arch/i386/grub-installer/grub-installer
@@ -247,7 +247,7 @@ esac
rootfs_nodevfs=$(mapdevfs $rootfs)
bootfs_nodevfs=$(mapdevfs $bootfs)
prefix=$(echo "$bootfs" | \
- sed 's:\(/dev/\(cciss\|ida\)/c[0-9]d[0-9]\|/dev/[a-z]\+\).*:\1:')
+ sed
's:\(/dev/\(cciss\|ida\)/c[0-9]d[0-9]\|/dev/[a-z]\+\|/dev/i2o/hd[a-z]\).*:\1:')
case $prefix in
/dev/md)
@@ -256,7 +256,7 @@ case $prefix in
/dev/mapper)
disc_offered_devfs="$bootfs"
;;
- /dev/[hs]d[a-z]|/dev/cciss/c[0-9]d[0-9]|/dev/ida/c[0-9]d[0-9])
+
/dev/[hs]d[a-z]|/dev/cciss/c[0-9]d[0-9]|/dev/ida/c[0-9]d[0-9]|/dev/i2o/hd[a-z])
disc_offered_devfs="$prefix"
;;
*)
diff --git a/packages/arch/i386/lilo-installer/debian/changelog
b/packages/arch/i386/lilo-installer/debian/changelog
index 9a21983..e5a6852 100644
--- a/packages/arch/i386/lilo-installer/debian/changelog
+++ b/packages/arch/i386/lilo-installer/debian/changelog
@@ -2,6 +2,7 @@ lilo-installer (1.25) UNRELEASED; urgency=low
[ Jérémy Bobbio ]
* Add more englishness to lilo-installer/manual_bootdev.
+ * Add support for i2o RAID adapters.
-- Jérémy Bobbio <[EMAIL PROTECTED]> Mon, 01 Oct 2007 12:12:28 +0200
diff --git a/packages/arch/i386/lilo-installer/debian/postinst
b/packages/arch/i386/lilo-installer/debian/postinst
index e9ba935..ceb692a 100755
--- a/packages/arch/i386/lilo-installer/debian/postinst
+++ b/packages/arch/i386/lilo-installer/debian/postinst
@@ -69,7 +69,7 @@ fi
bootfs=$(mapdevfs $bootfs_devfs)
prefix=$(echo "$bootfs_devfs" | \
- sed 's/\(\/dev\/\(cciss\|ida\)\/c[0-9]d[0-9]\|\/dev\/[a-z]\+\).*/\1/')
+ sed
's/\(\/dev\/\(cciss\|ida\)\/c[0-9]d[0-9]\|\/dev\/[a-z]\+\|/dev/i2o/hd[a-z]\).*/\1/')
case $prefix in
/dev/md)
diff --git a/packages/debian-installer-utils/debian/changelog
b/packages/debian-installer-utils/debian/changelog
index d5e49aa..c8dfe94 100644
--- a/packages/debian-installer-utils/debian/changelog
+++ b/packages/debian-installer-utils/debian/changelog
@@ -1,8 +1,12 @@
debian-installer-utils (1.50) UNRELEASED; urgency=low
+ [ Frans Pop ]
* register-module: remove support for obsolete modutils and for no longer
used type chandev.
+ [ Jérémy Bobbio ]
+ * Add suppor for i2o RAID adapters in list-devices.
+
-- Frans Pop <[EMAIL PROTECTED]> Sun, 23 Sep 2007 16:38:50 +0200
debian-installer-utils (1.49) unstable; urgency=low
diff --git a/packages/debian-installer-utils/list-devices
b/packages/debian-installer-utils/list-devices
index 1d0515c..7772396 100755
--- a/packages/debian-installer-utils/list-devices
+++ b/packages/debian-installer-utils/list-devices
@@ -72,7 +72,7 @@ for x in $syspaths; do
fi
if ! $match && [ "$TYPE" = disk ]; then
case $devpath in
- /block/cciss\!*|/block/ida\!*|/block/rd\!*)
+ /block/cciss\!*|/block/ida\!*|/block/rd\!*|/block/i2o\!*)
match=:
;;
esac
diff --git a/packages/partman/partman-base/debian/changelog
b/packages/partman/partman-base/debian/changelog
index 9854522..753a4b6 100644
--- a/packages/partman/partman-base/debian/changelog
+++ b/packages/partman/partman-base/debian/changelog
@@ -1,3 +1,10 @@
+partman-base (111) UNRELEASED; urgency=low
+
+ [ Jérémy Bobbio ]
+ * Add support for i2o RAID adapters to the humandev function.
+
+ -- Jérémy Bobbio <[EMAIL PROTECTED]> Wed, 03 Oct 2007 00:00:52 +0200
+
partman-base (110) unstable; urgency=low
[ Colin Watson ]
diff --git a/packages/partman/partman-base/definitions.sh
b/packages/partman/partman-base/definitions.sh
index 3aac718..dce1131 100644
--- a/packages/partman/partman-base/definitions.sh
+++ b/packages/partman/partman-base/definitions.sh
@@ -579,7 +579,7 @@ humandev () {
db_metaget partman/text/scsi_partition description
printf "$RET" ${scsinum} ${bus} ${target} ${lun} ${part} ${linux}
;;
- /dev/sd[a-z]|/dev/sd[a-z][a-z])
+ /dev/sd[a-z]|/dev/sd[a-z][a-z]|/dev/i2o/hd[a-z])
disk="${1#/dev/}"
if [ -h "/sys/block/$disk/device" ]; then
bus_id="$(basename "$(readlink "/sys/block/$disk/device")")"
@@ -599,7 +599,7 @@ humandev () {
echo "$1"
fi
;;
- /dev/sd[a-z][0-9]*|/dev/sd[a-z][a-z][0-9]*)
+ /dev/sd[a-z][0-9]*|/dev/sd[a-z][a-z][0-9]*|/dev/i2o/hd[a-z][0-9]*)
part="${1#/dev/}"
disk="${part%%[0-9]*}"
part="${part#$disk}"
signature.asc
Description: Digital signature
