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

[malekith]

Module name:	bootdisk
Changes by:	malekith	03/02/17 22:17:46

Modified files:
	installer-dest installer-raid-functions

Log message:
- yet another few kloczko-fixes

Index: installer-dest
===================================================================
RCS file: /cvsroot/bootdisk/batch-installer/installer-dest,v
diff -d -u -r1.62 -r1.63
--- installer-dest	12 Jan 2003 18:29:27 -0000	1.62
+++ installer-dest	17 Feb 2003 21:17:45 -0000	1.63
@@ -456,11 +456,7 @@
       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 [ $mdadm = yes ] ; then
-	  mdadm --stop /dev/md$dev 2> /dev/null || :
-	else
-	  raidstop /dev/md$dev 2> /dev/null || :
-	fi
+	mdadm --stop /dev/md$dev 2> /dev/null || :
       done
     fi
 fi

Index: installer-raid-functions
===================================================================
RCS file: /cvsroot/bootdisk/batch-installer/installer-raid-functions,v
diff -d -u -r1.14 -r1.15
--- installer-raid-functions	12 Jan 2003 18:29:27 -0000	1.14
+++ installer-raid-functions	17 Feb 2003 21:17:45 -0000	1.15
@@ -51,9 +51,9 @@
 
 # used in installer-dest
 prep_soft_raid () {
-  # 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.
+  # We use mdadm, although 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
@@ -129,17 +129,17 @@
       mdadm_opt="$mdadm_opt --parity=$(echo ${parity_algorithm} | sed -e 's/-/_/')"
     fi
   
-    # we have to split MDCTL*: stuff since raidtools are braindamaged
+    # we have to split MDADM*: 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: mdadm --create /dev/md${md_dev} --chunk=${chunk_size} 
-# MDCTL$md_dev:   --level=${raid_lev} --raid-disks=${nr_normal}
-# MDCTL$md_dev:  $mdadm_opt 
-# MDCTL$md_dev:   --run
+# MDADM$md_dev: mdadm --create /dev/md${md_dev} --chunk=${chunk_size} 
+# MDADM$md_dev:   --level=${raid_lev} --raid-disks=${nr_normal}
+# MDADM$md_dev:  $mdadm_opt 
+# MDADM$md_dev:   --run
 EOF
     for f in $dev_normal $dev_spare ; do
-      echo "# MDCTL$md_dev:         $f" >> /tmp/raidtab
+      echo "# MDADM$md_dev:         $f" >> /tmp/raidtab
     done
 
   cat >> /tmp/raidtab <<EOF
@@ -225,8 +225,8 @@
       raid-mkraid )
         log info "$(nls "Creating RAID device /dev/md%s" $minor)"
         if test "x$dry_run" = "xno"; then
-	  log_wrap $(echo $(grep MDCTL$minor: /tmp/raidtab | \
-  	  	sed -e "s/. MDCTL$minor://"))
+	  log_wrap $(echo $(grep MDADM$minor: /tmp/raidtab | \
+  	  	sed -e "s/. MDADM$minor://"))
         fi
         ;;
       * )