summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-08-24 20:29:43 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-08-24 20:29:43 +0000
commit757e10d2736034c0a7b58704735ec88482efb870 (patch)
tree8d2188b58e63dedc1595d969927b748bdd2fed98
parent73a937d5cdf364622d2e0ae4501cefcd08ff87bf (diff)
downloaddrakx-backup-do-not-use-757e10d2736034c0a7b58704735ec88482efb870.tar
drakx-backup-do-not-use-757e10d2736034c0a7b58704735ec88482efb870.tar.gz
drakx-backup-do-not-use-757e10d2736034c0a7b58704735ec88482efb870.tar.bz2
drakx-backup-do-not-use-757e10d2736034c0a7b58704735ec88482efb870.tar.xz
drakx-backup-do-not-use-757e10d2736034c0a7b58704735ec88482efb870.zip
- descr of proc files
- fix small typo (segfault or not segfault? that's the question)
-rw-r--r--mdk-stage1/probing.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index 703913a0e..692f86fca 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -512,9 +512,10 @@ static void find_media(void)
/* ----------------------------------------------- */
log_message("looking for Compaq Smart Array media");
{
- char * procfiles[] = { "/proc/driver/array/ida0", "/proc/array/ida",
- "/proc/driver/cciss/cciss0", "/proc/cciss/cciss",
+ char * procfiles[] = { "/proc/driver/array/ida0", "/proc/driver/cciss/cciss0", // 2.4 style
+ "/proc/array/ida", "/proc/cciss/cciss", // 2.2 style
NULL };
+ static char cpq_descr[] = "Compaq RAID logical disk";
char ** procfile = procfiles;
FILE * f;
while (procfile && *procfile && (f = fopen(*procfile, "rb"))) {
@@ -527,7 +528,7 @@ static void find_media(void)
*end = '\0';
tmp[count].name = strdup(buf);
tmp[count].type = DISK;
- tmp[count].model = "Compaq RAID logical disk";
+ tmp[count].model = cpq_descr;
log_message("CPQ: found %s", tmp[count].name);
tmp[count].bus = CPQ;
count++;