geninitrd/trunk: geninitrd geninitrd.8.xml
arekm
cvs at pld-linux.org
Sat Jan 28 14:16:24 CET 2006
Author: arekm
Date: Sat Jan 28 14:16:19 2006
New Revision: 6893
Modified:
geninitrd/trunk/geninitrd
geninitrd/trunk/geninitrd.8.xml
Log:
Old raidtools no longer supported.
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Sat Jan 28 14:16:19 2006
@@ -35,7 +35,6 @@
MODULES=""
img_vers=""
modulefile=""
-raidtab="/etc/raidtab"
fstab="/etc/fstab"
insmod="insmod"
modext=".o"
@@ -368,45 +367,10 @@
print "dev_list=\"" dev_list "\"";
}'`
fi
- if [ "$raidfound" != "yes" ]; then
- [ -n "$verbose" ] && echo "Finding RAID details using raidtab for rootdev=$1"
- eval `awk -v rootdev="$1" 'BEGIN {
- found="no";
- dev_list="";
- rootdev_devfs = rootdev;
- if (rootdev ~ /\/dev\/md\/[0-9]/) {
- gsub(/\/dev\/md\//,"/dev/md",rootdev_devfs);
- }
-}
-
-{
- gsub("\t"," ");
- gsub(" +", " ");
- gsub("^ ","");
- if (/^[\t ]*#/)
- next;
- if (/^raiddev/) {
- if (($2 == rootdev) || ($2 == rootdev_devfs)) {
- found="yes";
- } else {
- if (found == "yes") {
- exit 0;
- };
- };
- };
- if (found == "yes") {
- if ($1 == "device") {
- dev_list = dev_list " " $2;
- };
- if ($1 == "raid-level") {
- raidlevel=$2;
- }
- };
-}
-END {
- print "raidfound=" found "\nraidlevel=" raidlevel "\ndev_list=\"" dev_list "\"\n";
-}' $raidtab `
+ if [ "$raidfound" != "yes" -a -f /etc/raidtab ]; then
+ echo "ERROR: raidtools are not longer supported. Please migrate to mdadm setup!" 1>&2
+ exit 1
fi
if is_yes "$raidfound" ; then
@@ -418,7 +382,7 @@
findmodule "linear"
;;
*)
- echo "raid level $number (in $raidtab) not recognized" 1>&2
+ echo "raid level $number (in mdadm config) not recognized" 1>&2
;;
esac
else
@@ -733,13 +697,6 @@
modulefile="$2"
shift
;;
- --raidtab=*)
- raidtab="`echo $1 | awk -F= '{print $2;}'`"
- ;;
- --raidtab)
- raidtab="$2"
- shift
- ;;
--use-raidstart|--with-raidstart)
USERAIDSTART="yes"
;;
Modified: geninitrd/trunk/geninitrd.8.xml
==============================================================================
--- geninitrd/trunk/geninitrd.8.xml (original)
+++ geninitrd/trunk/geninitrd.8.xml Sat Jan 28 14:16:19 2006
@@ -22,7 +22,6 @@
<arg rep="repeat">--with=module</arg>
<arg rep="repeat">--preload=module</arg>
<arg>--fstab=fstab</arg>
- <arg>--raidtab=raidtab</arg>
<arg>--lvmtoolsversion=1|2</arg>
<arg>--modules-conf=modules.conf</arg>
<arg>--fs=rom|ext2|cram</arg>
@@ -88,14 +87,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>--raidtab=<filename>raidtab</filename></term>
- <listitem>
- <para>Use <filename>raidtab</filename> to automatically
- determine raid settings of the root device. Normally,
- <filename>/etc/raidtab</filename> is used.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term>--ifneeded</term>
<listitem>
<para>Only builds the image if their are modules that need
More information about the pld-cvs-commit
mailing list