shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Remove hard-coding and create device-mapper directory if required

Browse Source
This commit is contained in:
Alasdair Kergon 2001-11-12 17:21:25 +00:00
parent ac61645c2d
commit cf4a4a1fa8
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/activate/activate.c
View File

@ -148,7 +148,7 @@ int _load(struct logical_volume *lv, int task)
*/ */
while (le < lv->le_count) { while (le < lv->le_count) {
if (!_emit_target(dmt, lv, &le)) { if (!_emit_target(dmt, lv, &le)) {
log_err("unable to activate logical volume '%s'", log_error("Unable to activate logical volume '%s'",
lv->name); lv->name);
goto out; goto out;
} }

23
lib/activate/fs.c
View File

@ -15,6 +15,8 @@
#include "fs.h" #include "fs.h"
#include "log.h" #include "log.h"
#include <devmapper/libdevmapper.h>
/* /*
* FIXME: copied straight from LVM1. * FIXME: copied straight from LVM1.
* *
@ -54,8 +56,8 @@ static int _check_devfs(const char *dev_prefix)
void _build_lv_path(char *buffer, size_t len, struct logical_volume *lv) void _build_lv_path(char *buffer, size_t len, struct logical_volume *lv)
{ {
snprintf(buffer, len, "%s/device-mapper/%s-%s", snprintf(buffer, len, "%s%s/%s-%s",
lv->vg->cmd->dev_dir, lv->vg->name, lv->name); lv->vg->cmd->dev_dir, dm_dir(), lv->vg->name, lv->name);
} }
void _build_vg_path(char *buffer, size_t len, struct volume_group *vg) void _build_vg_path(char *buffer, size_t len, struct volume_group *vg)
@ -72,16 +74,23 @@ void _build_link_path(char *buffer, size_t len, struct logical_volume *lv)
static int _mk_node(struct logical_volume *lv) static int _mk_node(struct logical_volume *lv)
{ {
char lv_path[PATH_MAX]; char lv_path[PATH_MAX];
char dm_path[PATH_MAX];
dev_t dev; dev_t dev;
const char *dev_dir = lv->vg->cmd->dev_dir; const char *dev_dir = lv->vg->cmd->dev_dir;
if (_check_devfs(dev_dir)) if (_check_devfs(dev_dir))
return 1; return 1;
_build_lv_path(lv_path, sizeof(lv_path), lv); snprintf(dm_path, PATH_MAX, "%s%s", dev_dir, dm_dir());
if (mkdir(dm_path, 0555) && errno != EEXIST) {
log_sys_error("mkdir", dm_path);
return 0;
}
_build_lv_path(lv_path, sizeof(lv_path), lv);
if (mknod(lv_path, S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP, dev) < 0) { if (mknod(lv_path, S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP, dev) < 0) {
log_sys_error("mknod", "creating lv device node"); log_sys_error("mknod", lv_path);
return 0; return 0;
} }
@ -99,7 +108,7 @@ static int _rm_node(struct logical_volume *lv)
_build_lv_path(lv_path, sizeof(lv_path), lv); _build_lv_path(lv_path, sizeof(lv_path), lv);
if (unlink(lv_path) < 0) { if (unlink(lv_path) < 0) {
log_sys_error("unlink", "removing lv device node"); log_sys_error("unlink", lv_path);
return 0; return 0;
} }
@ -137,7 +146,7 @@ static int _mk_link(struct logical_volume *lv)
_build_link_path(link_path, sizeof(link_path), lv); _build_link_path(link_path, sizeof(link_path), lv);
if (symlink(lv_path, link_path) < 0) { if (symlink(lv_path, link_path) < 0) {
log_sys_error("symlink", "creating lv symlink"); log_sys_error("symlink", link_path);
return 0; return 0;
} }
@ -151,7 +160,7 @@ static int _rm_link(struct logical_volume *lv)
_build_link_path(link_path, sizeof(link_path), lv); _build_link_path(link_path, sizeof(link_path), lv);
if (unlink(link_path) < 0) { if (unlink(link_path) < 0) {
log_sys_error("unlink", "unlink lv symlink"); log_sys_error("unlink", link_path);
return 0; return 0;
} }