cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it detect scsi disks properly (off by one).

Browse Source 
while here also detect vnd devices.

"groovy" landry@
This commit is contained in:
steven 2010-07-30 22:49:27 +00:00
parent 5707bdb750
commit a55c3089fb
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/testdisk/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2010/04/03 11:54:19 kili Exp $
# $OpenBSD: Makefile,v 1.6 2010/07/30 22:49:27 steven Exp $
COMMENT = data recovery software
VERSION = 6.11.3
DISTNAME = testdisk-${VERSION}
PKGNAME = ${DISTNAME}p0
REVISION = 1
CATEGORIES = sysutils
HOMEPAGE = http://www.cgsecurity.org/

33
sysutils/testdisk/patches/patch-src_hdaccess_c Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-src_hdaccess_c,v 1.1 2010/07/30 22:49:27 steven Exp $
--- src/hdaccess.c.orig Fri Jul 30 21:07:49 2010
+++ src/hdaccess.c Fri Jul 30 21:10:40 2010
@@ -366,6 +366,7 @@ list_disk_t *hd_parse(list_disk_t *list_disk, const in
char device_ide_hd[]="/dev/ad0";
char device_scsi_hd[]="/dev/da0";
char device_cd[]="/dev/acd0";
+ char device_vnd[]="/dev/rsvnd0c";
/* wd da */
/* Disk IDE */
for(i=0;i<8;i++)
@@ -401,7 +402,7 @@ list_disk_t *hd_parse(list_disk_t *list_disk, const in
}
for(i=0;i<8;i++)
{
- device_scsi2[strlen(device_scsi2)-1]='0'+i;
+ device_scsi2[strlen(device_scsi2)-2]='0'+i;
list_disk=insert_new_disk(list_disk,file_test_availability(device_scsi2,verbose,arch,testdisk_mode));
}
for(i=0;i<8;i++)
@@ -420,6 +421,12 @@ list_disk_t *hd_parse(list_disk_t *list_disk, const in
{
device_cd[strlen(device_cd)-1]='0'+i;
list_disk=insert_new_disk(list_disk,file_test_availability(device_cd,verbose,arch,testdisk_mode));
+ }
+ /* VND */
+ for(i=0;i<4;i++)
+ {
+ device_vnd[strlen(device_vnd)-2]='0'+i;
+ list_disk=insert_new_disk(list_disk,file_test_availability(device_vnd,verbose,arch,testdisk_mode));
}
}
#endif