* GNU General Public License for more details.
*/
+#define _GNU_SOURCE
#include <stdio.h>
#include <unistd.h>
#include <syslog.h>
#include <sys/types.h>
#include <sys/swap.h>
#include <sys/mount.h>
+#include <sys/wait.h>
#include <uci.h>
#include <uci_blob.h>
static struct vlist_tree mounts;
static struct blob_buf b;
static LIST_HEAD(devices);
-static int anon_mount, anon_swap;
+static int anon_mount, anon_swap, auto_mount, auto_swap, check_fs;
+static unsigned int delay_root;
enum {
CFG_ANON_MOUNT,
CFG_ANON_SWAP,
+ CFG_AUTO_MOUNT,
+ CFG_AUTO_SWAP,
+ CFG_DELAY_ROOT,
+ CFG_CHECK_FS,
__CFG_MAX
};
static const struct blobmsg_policy config_policy[__CFG_MAX] = {
[CFG_ANON_SWAP] = { .name = "anon_swap", .type = BLOBMSG_TYPE_INT32 },
[CFG_ANON_MOUNT] = { .name = "anon_mount", .type = BLOBMSG_TYPE_INT32 },
+ [CFG_AUTO_SWAP] = { .name = "auto_swap", .type = BLOBMSG_TYPE_INT32 },
+ [CFG_AUTO_MOUNT] = { .name = "auto_mount", .type = BLOBMSG_TYPE_INT32 },
+ [CFG_DELAY_ROOT] = { .name = "delay_root", .type = BLOBMSG_TYPE_INT32 },
+ [CFG_CHECK_FS] = { .name = "check_fs", .type = BLOBMSG_TYPE_INT32 },
};
enum {
return strdup(blobmsg_get_string(attr));
}
+static char *blobmsg_get_basename(struct blob_attr *attr)
+{
+ if (!attr)
+ return NULL;
+
+ return strdup(basename(blobmsg_get_string(attr)));
+}
+
static int mount_add(struct uci_section *s)
{
struct blob_attr *tb[__MOUNT_MAX] = { 0 };
m->label = blobmsg_get_strdup(tb[MOUNT_LABEL]);
m->target = blobmsg_get_strdup(tb[MOUNT_TARGET]);
m->options = blobmsg_get_strdup(tb[MOUNT_OPTIONS]);
- m->device = blobmsg_get_strdup(tb[MOUNT_DEVICE]);
+ m->device = blobmsg_get_basename(tb[MOUNT_DEVICE]);
m->overlay = m->extroot = 0;
if (m->target && !strcmp(m->target, "/"))
m->extroot = 1;
memset(m, 0, sizeof(struct mount));
m->type = TYPE_SWAP;
m->uuid = blobmsg_get_strdup(tb[SWAP_UUID]);
- m->device = blobmsg_get_strdup(tb[SWAP_DEVICE]);
+ m->device = blobmsg_get_basename(tb[SWAP_DEVICE]);
if (tb[SWAP_PRIO])
m->prio = blobmsg_get_u32(tb[SWAP_PRIO]);
if (m->prio)
if ((tb[CFG_ANON_SWAP]) && blobmsg_get_u32(tb[CFG_ANON_SWAP]))
anon_swap = 1;
+ if ((tb[CFG_AUTO_MOUNT]) && blobmsg_get_u32(tb[CFG_AUTO_MOUNT]))
+ auto_mount = 1;
+ if ((tb[CFG_AUTO_SWAP]) && blobmsg_get_u32(tb[CFG_AUTO_SWAP]))
+ auto_swap = 1;
+
+ if (tb[CFG_DELAY_ROOT])
+ delay_root = blobmsg_get_u32(tb[CFG_DELAY_ROOT]);
+
+ if ((tb[CFG_CHECK_FS]) && blobmsg_get_u32(tb[CFG_CHECK_FS]))
+ check_fs = 1;
+
return 0;
}
struct blkid_struct_probe *pr = malloc(sizeof(struct blkid_struct_probe));
memset(pr, 0, sizeof(struct blkid_struct_probe));
probe_block(gl.gl_pathv[j], pr);
- if (pr->err)
+ if (pr->err || !pr->id)
free(pr);
else
list_add_tail(&pr->list, &devices);
_cache_load("/dev/mtdblock*");
_cache_load("/dev/mmcblk*");
_cache_load("/dev/sd*");
+ _cache_load("/dev/sdc*");
+ _cache_load("/dev/hd*");
+ _cache_load("/dev/md*");
+ _cache_load("/dev/mapper/*");
}
static int print_block_info(struct blkid_struct_probe *pr)
if (pr->uuid[0])
printf("\toption\tuuid\t'%s'\n", pr->uuid);
else
- printf("\toption\tdevice\t'%s'\n", basename(pr->dev));
+ printf("\toption\tdevice\t'%s'\n", pr->dev);
printf("\toption\tenabled\t'0'\n\n");
return 0;
}
}
-static int main_hotplug(int argc, char **argv)
+static void check_filesystem(struct blkid_struct_probe *pr)
{
- struct mount *m;
- char path[256];
- char *action, *device, *mount_point;
- struct blkid_struct_probe *pr;
+ pid_t pid;
+ struct stat statbuf;
+ char *e2fsck = "/usr/sbin/e2fsck";
- action = getenv("ACTION");
- device = getenv("DEVNAME");
-
- if (!action || !device)
- return -1;
- snprintf(path, sizeof(path), "/dev/%s", device);
-
- if (!strcmp(action, "remove")) {
- int err = 0;
- mount_point = find_mount_point(path);
- if (mount_point)
- err = umount2(mount_point, MNT_DETACH);
+ if (strncmp(pr->id->name, "ext", 3)) {
+ fprintf(stderr, "check_filesystem: %s is not supported\n", pr->id->name);
+ return;
+ }
- if (err)
- fprintf(stderr, "unmount of %s failed (%d) - %s\n",
- mount_point, err, strerror(err));
+ if (stat(e2fsck, &statbuf) < 0) {
+ fprintf(stderr, "check_filesystem: %s not found\n", e2fsck);
+ return;
+ }
- return 0;
- } else if (strcmp(action, "add")) {
- fprintf(stderr, "Unkown action %s\n", action);
+ pid = fork();
+ if (!pid) {
+ execl(e2fsck, e2fsck, "-p", pr->dev, NULL);
+ exit(-1);
+ } else if (pid > 0) {
+ int status;
- return -1;
+ waitpid(pid, &status, 0);
+ if (WEXITSTATUS(status))
+ fprintf(stderr, "check_filesystem: %s returned %d\n", e2fsck, WEXITSTATUS(status));
}
+}
- if (config_load(NULL))
- return -1;
- cache_load(0);
+static int mount_device(struct blkid_struct_probe *pr, int hotplug)
+{
+ struct mount *m;
+ char *device;
- pr = find_block_info(NULL, NULL, path);
- if (!pr) {
- fprintf(stderr, "failed to read blockinfo for %s\n", path);
+ if (!pr)
return -1;
- }
+
+ device = basename(pr->dev);
if (!strcmp(pr->id->name, "swap")) {
+ if (hotplug && !auto_swap)
+ return -1;
m = find_swap(pr->uuid, device);
- if (m || anon_swap) {
- if (!strcmp(action, "add"))
- swapon(path, (m) ? (m->prio) : (0));
- else
- swapoff(path);
- }
+ if (m || anon_swap)
+ swapon(pr->dev, (m) ? (m->prio) : (0));
+
return 0;
}
+ if (hotplug && !auto_mount)
+ return -1;
+
+ if (find_mount_point(pr->dev)) {
+ fprintf(stderr, "%s is already mounted\n", pr->dev);
+ return -1;
+ }
+
m = find_block(pr->uuid, pr->label, device, NULL);
- if (m && !m->extroot) {
+ if (m && m->extroot)
+ return -1;
+
+ if (m) {
char *target = m->target;
- char _target[] = "/mnt/mmcblk123";
+ char _target[32];
int err = 0;
if (!target) {
target = _target;
}
mkdir_p(target);
- err = mount(path, target, pr->id->name, 0, (m->options) ? (m->options) : (""));
+
+ if (check_fs)
+ check_filesystem(pr);
+
+ err = mount(pr->dev, target, pr->id->name, 0, (m->options) ? (m->options) : (""));
if (err)
fprintf(stderr, "mounting %s (%s) as %s failed (%d) - %s\n",
- path, pr->id->name, target, err, strerror(err));
+ pr->dev, pr->id->name, target, err, strerror(err));
return err;
}
snprintf(target, sizeof(target), "/mnt/%s", device);
mkdir_p(target);
- err = mount(path, target, pr->id->name, 0, "");
+
+ if (check_fs)
+ check_filesystem(pr);
+
+ err = mount(pr->dev, target, pr->id->name, 0, "");
if (err)
fprintf(stderr, "mounting %s (%s) as %s failed (%d) - %s\n",
- path, pr->id->name, target, err, strerror(err));
+ pr->dev, pr->id->name, target, err, strerror(err));
return err;
}
return 0;
}
+static int umount_device(struct blkid_struct_probe *pr)
+{
+ struct mount *m;
+ char *device = basename(pr->dev);
+ char *mp;
+ int err;
+
+ if (!pr)
+ return -1;
+
+ if (!strcmp(pr->id->name, "swap"))
+ return -1;
+
+ mp = find_mount_point(pr->dev);
+ if (!mp)
+ return -1;
+
+ m = find_block(pr->uuid, pr->label, device, NULL);
+ if (m && m->extroot)
+ return -1;
+
+ err = umount2(mp, MNT_DETACH);
+ if (err)
+ fprintf(stderr, "unmounting %s (%s) failed (%d) - %s\n",
+ pr->dev, mp, err, strerror(err));
+ else
+ fprintf(stderr, "unmounted %s (%s)\n",
+ pr->dev, mp);
+
+ return err;
+}
+
+static int main_hotplug(int argc, char **argv)
+{
+ char path[32];
+ char *action, *device, *mount_point;
+
+ action = getenv("ACTION");
+ device = getenv("DEVNAME");
+
+ if (!action || !device)
+ return -1;
+ snprintf(path, sizeof(path), "/dev/%s", device);
+
+ if (!strcmp(action, "remove")) {
+ int err = 0;
+ mount_point = find_mount_point(path);
+ if (mount_point)
+ err = umount2(mount_point, MNT_DETACH);
+
+ if (err)
+ fprintf(stderr, "umount of %s failed (%d) - %s\n",
+ mount_point, err, strerror(err));
+
+ return 0;
+ } else if (strcmp(action, "add")) {
+ fprintf(stderr, "Unkown action %s\n", action);
+
+ return -1;
+ }
+
+ if (config_load(NULL))
+ return -1;
+ cache_load(0);
+
+ return mount_device(find_block_info(NULL, NULL, path), 1);
+}
+
static int find_block_mtd(char *name, char *part, int plen)
{
FILE *fp = fopen("/proc/mtd", "r");
if (!strcmp(pr->dev, fs)) {
struct stat s;
FILE *fp = NULL;
- char tag[32];
+ char tag[64];
char uuid[32] = { 0 };
snprintf(tag, sizeof(tag), "%s/etc/.extroot-uuid", path);
static int mount_extroot(char *cfg)
{
- char overlay[] = "/tmp/overlay";
- char mnt[] = "/tmp/mnt";
+ char overlay[] = "/tmp/extroot/overlay";
+ char mnt[] = "/tmp/extroot/mnt";
char *path = mnt;
struct blkid_struct_probe *pr;
struct mount *m;
return -1;
pr = find_block_info(m->uuid, m->label, NULL);
+
+ if (!pr && delay_root){
+ fprintf(stderr, "extroot: is not ready yet, retrying in %ui seconds\n", delay_root);
+ sleep(delay_root);
+ mkblkdev();
+ cache_load(0);
+ pr = find_block_info(m->uuid, m->label, NULL);
+ }
if (pr) {
if (strncmp(pr->id->name, "ext", 3)) {
fprintf(stderr, "extroot: %s is not supported, try ext4\n", pr->id->name);
path = overlay;
mkdir_p(path);
+ if (check_fs)
+ check_filesystem(pr);
+
err = mount(pr->dev, path, pr->id->name, 0, (m->options) ? (m->options) : (""));
if (err) {
return mount_extroot(NULL);
}
+static int main_mount(int argc, char **argv)
+{
+ struct blkid_struct_probe *pr;
+
+ if (config_load(NULL))
+ return -1;
+
+ cache_load(1);
+ list_for_each_entry(pr, &devices, list)
+ mount_device(pr, 0);
+
+ return 0;
+}
+
+static int main_umount(int argc, char **argv)
+{
+ struct blkid_struct_probe *pr;
+
+ if (config_load(NULL))
+ return -1;
+
+ cache_load(0);
+ list_for_each_entry(pr, &devices, list)
+ umount_device(pr);
+
+ return 0;
+}
+
static int main_detect(int argc, char **argv)
{
struct blkid_struct_probe *pr;
cache_load(0);
+ printf("config 'global'\n");
+ printf("\toption\tanon_swap\t'0'\n");
+ printf("\toption\tanon_mount\t'0'\n");
+ printf("\toption\tauto_swap\t'1'\n");
+ printf("\toption\tauto_mount\t'1'\n");
+ printf("\toption\tdelay_root\t'0'\n");
+ printf("\toption\tcheck_fs\t'0'\n\n");
list_for_each_entry(pr, &devices, list)
print_block_uci(pr);
static int main_swapon(int argc, char **argv)
{
if (argc != 2) {
- fprintf(stderr, "Usage: swapoff [-a] [DEVICE]\n\nStop swapping on DEVICE\n\n\t-a Stop swapping on all swap devices\n");
+ fprintf(stderr, "Usage: swapon <-s> <-a> [DEVICE]\n\n\tStart swapping on [DEVICE]\n -a\tStart swapping on all swap devices\n -s\tShow summary\n");
return -1;
}
- if (!strcmp(argv[1], "-a")) {
+ if (!strcmp(argv[1], "-s")) {
+ FILE *fp = fopen("/proc/swaps", "r");
+ char *lineptr = NULL;
+ size_t s;
+
+ if (!fp) {
+ fprintf(stderr, "failed to open /proc/swaps\n");
+ return -1;
+ }
+ while (getline(&lineptr, &s, fp) > 0)
+ printf(lineptr);
+ if (lineptr)
+ free(lineptr);
+ fclose(fp);
+ } else if (!strcmp(argv[1], "-a")) {
struct blkid_struct_probe *pr;
cache_load(0);
struct stat s;
int err;
- if (stat(argv[1], &s) || !S_ISBLK(s.st_mode)) {
- fprintf(stderr, "%s is not a block device\n", argv[1]);
+ if (stat(argv[1], &s) || (!S_ISBLK(s.st_mode) && !S_ISREG(s.st_mode))) {
+ fprintf(stderr, "%s is not a block device or file\n", argv[1]);
return -1;
}
err = swapon(argv[1], 0);
static int main_swapoff(int argc, char **argv)
{
if (argc != 2) {
- fprintf(stderr, "Usage: swapoff [-a] [DEVICE]\n\nStop swapping on DEVICE\n\n\t-a Stop swapping on all swap devices\n");
+ fprintf(stderr, "Usage: swapoff [-a] [DEVICE]\n\n\tStop swapping on DEVICE\n -a\tStop swapping on all swap devices\n");
return -1;
}
struct stat s;
int err;
- if (stat(argv[1], &s) || !S_ISBLK(s.st_mode)) {
- fprintf(stderr, "%s is not a block device\n", argv[1]);
+ if (stat(argv[1], &s) || (!S_ISBLK(s.st_mode) && !S_ISREG(s.st_mode))) {
+ fprintf(stderr, "%s is not a block device or file\n", argv[1]);
return -1;
}
err = swapoff(argv[1]);
if (!strcmp(argv[1], "extroot"))
return main_extroot(argc, argv);
+
+ if (!strcmp(argv[1], "mount"))
+ return main_mount(argc, argv);
+
+ if (!strcmp(argv[1], "umount"))
+ return main_umount(argc, argv);
}
- fprintf(stderr, "Usage: block <info|detect>\n");
+ fprintf(stderr, "Usage: block <info|mount|umount|detect>\n");
return -1;
}
projects / project / ubox.git / blobdiff