webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

RAID-Erkennung von Sven Nierlein - Danke.

Browse Source 
(Den altbekannten IP-Conntrack-Patch wieder eingebaut.)


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@604 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-06-02 22:00:37 +00:00
parent a56b5be417
commit 56b548f146
5 changed files with 102 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/install+setup/install/main.c
View File

@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
char *shortlangnames[] = { "de", "en", NULL };
char **langtrs[] = { de_tr, en_tr, NULL };
char hdletter;
char harddrive[5], sourcedrive[5]; /* Device holder. */
char harddrive[11], sourcedrive[5]; /* Device holder. */
struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
int cdmounted = 0; /* Loop flag for inserting a cd. */
int rc = 0;
@@ -101,6 +101,7 @@ int main(int argc, char *argv[])
char title[STRING_SIZE];
int allok = 0;
int allok_fastexit=0;
int raid_disk = 0;
struct keyvalue *ethernetkv = initkeyvalues();
FILE *handle, *cmdfile;
char line[STRING_SIZE];
@@ -258,10 +259,17 @@ int main(int argc, char *argv[])
switch (mysystem("/bin/mountdest.sh") % 255) {
case 0: // Found IDE disk
scsi_disk = 0;
raid_disk = 0;
found = 1;
break;
case 1: // Found SCSI disk
scsi_disk = 1;
raid_disk = 0;
found = 1;
break;
case 2: // Found RAID disk
scsi_disk = 0;
raid_disk= 1;
found = 1;
break;
case 10: // No harddisk found
@@ -321,7 +329,7 @@ int main(int argc, char *argv[])
errorbox(ctr[TR_NO_HARDDISK]);
goto EXIT;
}
fgets(harddrive, 5, handle);
fgets(harddrive, 11, handle);
fclose(handle);
/* load unattended configuration */

17
src/install+setup/install/mountdest.sh
View File

@@ -36,4 +36,21 @@ for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2
fi
done
# scan RAID devices
echo "--> RAID"
for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2 | sort | uniq); do
echo -n "---> $DEVICE"
mount /dev/${DEVICE}p1 /harddisk 2> /dev/null
if [ -e /harddisk/ipfire-*.tbz2 ]; then
umount /harddisk 2> /dev/null
echo " is source drive"
continue
else
umount /harddisk 2> /dev/null
echo -n "$DEVICE" > /tmp/dest_device
echo " - yes, it is our destination"
exit 2
fi
done
exit 10 # Nothing found