bootdisk: installer-dest (HEAD) installer-prep (HEAD) installer-raid-functions (HEAD)

[kloczek]

Module name:	bootdisk
Changes by:	kloczek	03/01/12 19:29:28

Modified files:
	installer-dest installer-prep installer-raid-functions

Log message:
s/mdctl/mdadm/

Index: installer-dest
===================================================================
RCS file: /cvsroot/bootdisk/batch-installer/installer-dest,v
diff -d -u -r1.61 -r1.62
--- installer-dest	12 Sep 2002 12:31:42 -0000	1.61
+++ installer-dest	12 Jan 2003 18:29:27 -0000	1.62
@@ -456,8 +456,8 @@
       grep '^md[0-9]' /proc/mdstat | sed -e 's/md\([0-9]*\).*/\1/' | sort -r -n | \
       while read dev ; do
         log debug "Stopping RAID device $dev"
-	if [ $mdctl = yes ] ; then
-	  mdctl --stop /dev/md$dev 2> /dev/null || :
+	if [ $mdadm = yes ] ; then
+	  mdadm --stop /dev/md$dev 2> /dev/null || :
 	else
 	  raidstop /dev/md$dev 2> /dev/null || :
 	fi

Index: installer-prep
===================================================================
RCS file: /cvsroot/bootdisk/batch-installer/installer-prep,v
diff -d -u -r1.90 -r1.91
--- installer-prep	16 Oct 2002 18:16:13 -0000	1.90
+++ installer-prep	12 Jan 2003 18:29:27 -0000	1.91
@@ -438,6 +438,11 @@
 
   if echo "$1" | grep -q '/dev/ida/' ; then
     . installer-raid-functions
+    setup_softraid
+  fi
+
+  if echo "$1" | grep -q '/dev/ida/' ; then
+    . installer-raid-functions
     setup_cpqarray
   fi
 

Index: installer-raid-functions
===================================================================
RCS file: /cvsroot/bootdisk/batch-installer/installer-raid-functions,v
diff -d -u -r1.13 -r1.14
--- installer-raid-functions	10 Jan 2003 09:59:04 -0000	1.13
+++ installer-raid-functions	12 Jan 2003 18:29:27 -0000	1.14
@@ -51,9 +51,9 @@
 
 # used in installer-dest
 prep_soft_raid () {
-  # we can either use mdctl or raidtools. in either case raidtab
-  # is generated and stored on destination partition, it also includes
-  # (in comments) commands used to create raids with mdctl.
+  # we can either use mdadm. In either case raidtab is generated and stored
+  # on destination partition, it also includes (in comments) commands used
+  # to create raids with mdadm.
   
   # extract information about raid devices to be configured
   id=0
@@ -121,21 +121,21 @@
   
     log debug "writing raidtab normal=$dev_normal, spare=$dev_spare"
     
-    mdctl_opt=""
+    mdadm_opt=""
     if [ $nr_spare != 0 ] ; then
-      mdctl_opt="$mdctl_opt --spare-disks=$nr_spare"
+      mdadm_opt="$mdadm_opt --spare-disks=$nr_spare"
     fi
     if [ $raid_lev = 5 ] ; then
-      mdctl_opt="$mdctl_opt --parity=$(echo ${parity_algorithm} | sed -e 's/-/_/')"
+      mdadm_opt="$mdadm_opt --parity=$(echo ${parity_algorithm} | sed -e 's/-/_/')"
     fi
   
     # we have to split MDCTL*: stuff since raidtools are braindamaged
     # and cannot handle comments longer then 100 characters
     cat >> /tmp/raidtab <<EOF
 # created from dest_part${id}:
-# MDCTL$md_dev: mdctl --create /dev/md${md_dev} --chunk=${chunk_size} 
+# MDCTL$md_dev: mdadm --create /dev/md${md_dev} --chunk=${chunk_size} 
 # MDCTL$md_dev:   --level=${raid_lev} --raid-disks=${nr_normal}
-# MDCTL$md_dev:  $mdctl_opt 
+# MDCTL$md_dev:  $mdadm_opt 
 # MDCTL$md_dev:   --run
 EOF
     for f in $dev_normal $dev_spare ; do
@@ -219,7 +219,7 @@
       raid-raidstart )
         log info "$(nls "Starting RAID device /dev/md%s" $minor)"
         if test "x$dry_run" = "xno"; then
-          log_wrap mdctl --run /dev/md$minor
+          log_wrap mdadm --run /dev/md$minor
         fi
         ;;
       raid-mkraid )