This commit is contained in:
tianshaoshuai 2024-09-05 15:35:55 +08:00 committed by openkylin-cibot
parent 2985bd1e13
commit dcfe2109f3
2 changed files with 35 additions and 0 deletions

34
debian/patches/0024-111.patch vendored Normal file
View File

@ -0,0 +1,34 @@
From: tianshaoshuai <tianshaoshuai@kylinos.cn>
Date: Thu, 5 Sep 2024 15:35:55 +0800
Subject: 111
---
src/disk/libkydiskinfo.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/disk/libkydiskinfo.c b/src/disk/libkydiskinfo.c
index fb9622b..4a20a02 100644
--- a/src/disk/libkydiskinfo.c
+++ b/src/disk/libkydiskinfo.c
@@ -167,7 +167,7 @@ static int get_disk_identifier(int fd, kdk_diskinfo *di)
}
char *model = strndup((char*)&hd[27], 40);
- char *fwrev = strndup(&hd[23], 8); // 固件版本
+ char *fwrev = strndup((char*)&hd[23], 8); // 固件版本
char *serno = strndup((char*)&hd[10], 20);
di->serial = malloc(strlen(serno) + 1);
@@ -440,9 +440,9 @@ kdk_diskinfo *_kdk_get_diskinfo(const char *diskname)
char *dn = diskname + pos;
// klog_debug("%s\n", dn);
- const char *dev_PP = NULL;
- const char *serial = NULL;
- const char *dev_P = NULL;
+ struct udev_device *dev_PP = NULL;
+ struct udev_device *serial = NULL;
+ struct udev_device *dev_P = NULL;
const char *serial_val = NULL;
dev_block = udev_device_new_from_subsystem_sysname(udev,"block",dn);

View File

@ -21,3 +21,4 @@
0021-.patch
0022-update-changelog.patch
0023-.patch
0024-111.patch