clearlinux/hyperstart
2
0
Fork 0
mirror of https://github.com/clearlinux/hyperstart.git synced 2026-09-03 12:11:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove prefix from hyper_find_sd()

Browse Source 
we always use the intial /sys, so we don't need prefix

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
This commit is contained in:
Lai Jiangshan
2016-04-03 22:47:09 +08:00
parent 09c0a1b41b
commit bc28dfedf8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/container.c
+2 -2
View File
@@ -60,7 +60,7 @@ static int container_setup_volume(struct hyper_container *container)
vol = &container->vols[i];
if (vol->scsiaddr)
hyper_find_sd("", vol->scsiaddr, &vol->device);
hyper_find_sd(vol->scsiaddr, &vol->device);
sprintf(dev, "/dev/%s", vol->device);
sprintf(path, "/tmp/%s", vol->mountpoint);
@@ -407,7 +407,7 @@ static int hyper_container_init(void *data)
char dev[128];
if (container->scsiaddr)
hyper_find_sd("", container->scsiaddr, &container->image);
hyper_find_sd(container->scsiaddr, &container->image);
sprintf(dev, "/dev/%s", container->image);
fprintf(stdout, "device %s\n", dev);
src/util.c
+2 -2
View File
@@ -99,13 +99,13 @@ int hyper_copy_dir(char *src, char *dest) {
return 0;
}
int hyper_find_sd(char *prefix, char *addr, char **dev) {
int hyper_find_sd(char *addr, char **dev) {
struct dirent **list;
struct dirent *dir;
char path[512];
int i, num;
sprintf(path, "%s/sys/class/scsi_disk/0:0:%s/device/block/", prefix, addr);
sprintf(path, "/sys/class/scsi_disk/0:0:%s/device/block/", addr);
fprintf(stdout, "orig dev %s, scan path %s\n", *dev, path);
num = scandir(path, &list, NULL, NULL);
src/util.h
+1 -1
View File
@@ -16,7 +16,7 @@ struct env;
char *read_cmdline(void);
int hyper_setup_env(struct env *envs, int num);
int hyper_find_sd(char *prefix, char *addr, char **dev);
int hyper_find_sd(char *addr, char **dev);
int hyper_list_dir(char *path);
int hyper_copy_dir(char *src, char *dst);
void online_cpu(void);