[Fai-commit] r3085 - in trunk: bin debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-23 12:38:13 +0000 (Wed, 23 Nov 2005)
New Revision: 3085

Modified:
   trunk/bin/setup_harddisks
   trunk/debian/changelog
Log:
add i2o support (closes: #317797)


Modified: trunk/bin/setup_harddisks
===================================================================
--- trunk/bin/setup_harddisks	2005-11-23 12:32:57 UTC (rev 3084)
+++ trunk/bin/setup_harddisks	2005-11-23 12:38:13 UTC (rev 3085)
@@ -37,6 +37,7 @@
 # [-d]                     default: no DOS alignment
 #
 #---------------------------------------------------
+# Last changes:  see svn log
 # Last changes:  31.3.2005 by Thomas Lange add sub mapdisk{}
 # Last changes:  8.11.2004 by Thomas Lange add $devdisklist when calling sfdisk
 # Last changes:   3.2.2004 by Thomas Lange typos
@@ -151,7 +152,7 @@
 # Variables
 #****************************************************
 
-my $Version = "version 0.35fai";
+my $Version = "version 0.36fai";
 
 my $megabyte = 1024 * 1024;    # guess
 # $gigabyte = 1024 * $megabyte;
@@ -253,8 +254,8 @@
     my ($disk, $partno) = @_;
     my $ppath;
     for ($disk) {
-	/^[a-z]+$/ and $ppath = "${disk}${partno}";
-	/\d$/ and $ppath = "${disk}p${partno}";
+      /^(i2o\/)?[a-z]+$/ and $ppath = "${disk}${partno}";
+      /\d$/ and $ppath = "${disk}p${partno}";
     }
     return $ppath;
 }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-23 12:32:57 UTC (rev 3084)
+++ trunk/debian/changelog	2005-11-23 12:38:13 UTC (rev 3085)
@@ -33,6 +33,7 @@
   * ftar: test if $single is set (closes: #340421)
   * FAIBASE/30-interface: do not overwrite resolv.conf if it's a symlink
     (closes: #305783)
+  * setup_harddisks: add i2o support (closes: #317797)
   
  -- Thomas Lange <lange at debian.org>  Wed, 23 Nov 2005 12:58:56 +0100