Frans Pop ha scritto: > This should be done by a test _inside_ the if statement and not by adding > a condition to the if statement: > > if echo $device | grep -q "^/dev/mapper/"; then > [ -f "$dev/sataraid" ] || continue > > dmtype=$(dm_table $device) > [ "$dmtype" = multipath ] || continue > fi > > Also, the comment just above that code should be updated!
Done. > >> partman-base > > This needs a comment in the code and the grep needs '-q'. Done. > >> With this merge dmraid support seems to be more improved, >> No more special procedure is needed, simply use dmraid=true and install >> Debian > > I also miss a cleanup of partman-dmraid, or can that udeb be dropped > completely? If the last is the case then we need a patch for hw-detect so > it no longer gets installed. I think that udeb can be dropped completely, but please verify. > >> Automatic/guided and manual partition now seems to work. > > Then why do you disable guided partitioning in the partman-auto patch? Where? + * lib/auto-shared.sh: Consider device-mapper devices/dmraid arrays with the + sataraid flag set as usable for automatic partitioning. > P.S. Are you subscribed to the d-boot list or should we keep you CCed? No, I'm not subscribed, please keep me CCed. Giuseppe.
diff -Nru partman-auto-81/debian/changelog partman-auto-81+nmu1/debian/changelog
--- partman-auto-81/debian/changelog 2008-08-25 21:04:47.000000000 +0200
+++ partman-auto-81+nmu1/debian/changelog 2008-09-06 18:24:23.000000000
+0200
@@ -1,3 +1,11 @@
+partman-auto (81+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * lib/auto-shared.sh: Consider device-mapper devices/dmraid arrays with the
+ sataraid flag set as usable for automatic partitioning.
+
+ -- Giuseppe Iuculano <[EMAIL PROTECTED]> Sat, 06 Sep 2008 18:23:55 +0200
+
partman-auto (81) unstable; urgency=low
[ Jérémy Bobbio ]
diff -Nru partman-auto-81/lib/auto-shared.sh
partman-auto-81+nmu1/lib/auto-shared.sh
--- partman-auto-81/lib/auto-shared.sh 2008-08-25 21:01:13.000000000 +0200
+++ partman-auto-81+nmu1/lib/auto-shared.sh 2008-09-06 20:53:44.000000000
+0200
@@ -202,11 +202,13 @@
for dev in $DEVICES/*; do
[ -d "$dev" ] || continue
- # Skip /dev/mapper/X (except multipath) devices and
+ # Skip /dev/mapper/X (except multipath and dmraid) devices and
# RAID (/dev/md/X and /dev/mdX) devices
device=$(cat $dev/device)
$(echo "$device" | grep -Eq "/dev/md/?[0-9]*$") && continue
if echo $device | grep -q "^/dev/mapper/"; then
+ [ -f "$dev/sataraid" ] || continue
+
dmtype=$(dm_table $device)
[ "$dmtype" = multipath ] || continue
fi
diff -Nru partman-base-125/debian/changelog
partman-base-125+nmu1/debian/changelog
--- partman-base-125/debian/changelog 2008-08-25 21:09:58.000000000 +0200
+++ partman-base-125+nmu1/debian/changelog 2008-09-06 16:56:57.000000000
+0200
@@ -1,3 +1,10 @@
+partman-base (125+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * init.d/parted: Set the sataraid flag for dmraid arrays.
+
+ -- Giuseppe Iuculano <[EMAIL PROTECTED]> Sat, 06 Sep 2008 16:56:09 +0200
+
partman-base (125) unstable; urgency=low
[ Jérémy Bobbio ]
diff -Nru partman-base-125/init.d/parted partman-base-125+nmu1/init.d/parted
--- partman-base-125/init.d/parted 2008-08-10 08:43:40.000000000 +0200
+++ partman-base-125+nmu1/init.d/parted 2008-09-06 16:56:03.000000000 +0200
@@ -108,6 +108,13 @@
printf "%s" "$size" >$dev/size
printf "%s" "$model" >$dev/model
+ if type dmraid >/dev/null 2>&1; then
+ if dmraid -sa -c | grep $(basename $device); then
+ >$dev/sataraid
+ fi
+ fi
+
+
cd $dev
open_dialog OPEN "$(cat $dev/device)"
read_line response
signature.asc
Description: OpenPGP digital signature
