#include <sys/mount.h>
#include <sys/wait.h>
+#include <linux/fs.h>
+
#include <uci.h>
#include <uci_blob.h>
+#include <libubox/ulog.h>
#include <libubox/list.h>
#include <libubox/vlist.h>
#include <libubox/blobmsg_json.h>
#include "libubi/libubi.h"
#endif
-static int kmsg = 0;
-
-static void klog(int prio, const char *fmt, ...)
-{
- va_list ap;
- FILE *f = fopen("/dev/kmsg", "w");
-
- if (f) {
- fprintf(f, "<%d>", prio);
-
- va_start(ap, fmt);
- vfprintf(f, fmt, ap);
- va_end(ap);
-
- fclose(f);
- }
-}
-
-#define KINFO(fmt, ...) do { \
- if (kmsg) klog(LOG_INFO, "block: " fmt, ## __VA_ARGS__); \
- } while (0)
-
-#define ERROR(fmt, ...) do { \
- if (kmsg) \
- klog(LOG_ERR, "block: " fmt, ## __VA_ARGS__); \
- else { \
- syslog(LOG_ERR, fmt, ## __VA_ARGS__); \
- fprintf(stderr, "block: "fmt, ## __VA_ARGS__); \
- } \
- } while (0)
-
enum {
TYPE_MOUNT,
TYPE_SWAP,
int32_t flag;
};
-#ifndef MS_DIRSYNC
-# define MS_DIRSYNC (1 << 7)
-#endif
-
-#ifndef MS_RELATIME
-# define MS_RELATIME (1 << 21)
-#endif
-
-#ifndef MS_STRICTATIME
-# define MS_STRICTATIME (1 << 24)
-#endif
-
static const struct mount_flag mount_flags[] = {
{ "sync", MS_SYNCHRONOUS },
{ "async", ~MS_SYNCHRONOUS },
{ "relatime", MS_RELATIME },
{ "norelatime", ~MS_RELATIME },
{ "strictatime", MS_STRICTATIME },
+ { "acl", MS_POSIXACL },
+ { "noacl", ~MS_POSIXACL },
+ { "nouser_xattr", MS_NOUSER },
+ { "user_xattr", ~MS_NOUSER },
};
static char *blobmsg_get_strdup(struct blob_attr *attr)
if (m->target && !strcmp(m->target, "/overlay"))
m->extroot = m->overlay = 1;
+ if (m->target && *m->target != '/') {
+ ULOG_WARN("ignoring mount section %s due to invalid target '%s'\n",
+ s->e.name, m->target);
+ free(m);
+ return -1;
+ }
+
if (m->uuid)
vlist_add(&mounts, &m->node, m->uuid);
else if (m->label)
struct uci_package *pkg;
uci_set_confdir(ctx, dir);
- KINFO("attempting to load %s/%s\n", dir, file);
+ ULOG_INFO("attempting to load %s/%s\n", dir, file);
if (uci_load(ctx, file, &pkg)) {
uci_get_errorstr(ctx, &err, file);
- ERROR("unable to load configuration (%s)\n", err);
+ ULOG_ERR("unable to load configuration (%s)\n", err);
free(err);
return NULL;
}
if (!pkg) {
- ERROR("no usable configuration\n");
+ ULOG_ERR("no usable configuration\n");
return -1;
}
static struct blkid_struct_probe* _probe_path(char *path)
{
struct blkid_struct_probe *pr;
+ char tmppath[64];
+
+ /* skip ubi device if ubiblock device is present */
+ if (path[5] == 'u' && path[6] == 'b' && path[7] == 'i' &&
+ path[8] >= '0' && path[8] <= '9' ) {
+ snprintf(tmppath, sizeof(tmppath), "/dev/ubiblock%s", path + 8);
+ list_for_each_entry(pr, &devices, list)
+ if (!strcasecmp(pr->dev, tmppath))
+ return NULL;
+ }
pr = malloc(sizeof(*pr));
if (mtd) {
_cache_load("/dev/mtdblock*");
_cache_load("/dev/ubiblock*");
- _cache_load("/dev/ubi?*_?*");
+ _cache_load("/dev/ubi[0-9]*");
}
+ _cache_load("/dev/loop*");
_cache_load("/dev/mmcblk*");
_cache_load("/dev/sd*");
_cache_load("/dev/hd*");
_cache_load("/dev/mapper/*");
}
-static int print_block_info(struct blkid_struct_probe *pr)
-{
- printf("%s:", pr->dev);
- if (pr->uuid[0])
- printf(" UUID=\"%s\"", pr->uuid);
-
- if (pr->label[0])
- printf(" LABEL=\"%s\"", pr->label);
-
- if (pr->name[0])
- printf(" NAME=\"%s\"", pr->name);
-
- if (pr->version[0])
- printf(" VERSION=\"%s\"", pr->version);
-
- printf(" TYPE=\"%s\"\n", pr->id->name);
-
- return 0;
-}
static int print_block_uci(struct blkid_struct_probe *pr)
{
static char* find_mount_point(char *block)
{
- FILE *fp = fopen("/proc/mounts", "r");
+ FILE *fp = fopen("/proc/self/mountinfo", "r");
static char line[256];
int len = strlen(block);
- char *point = NULL;
+ char *point = NULL, *pos, *tmp, *cpoint, *devname;
+ struct stat s;
+ int rstat;
+ unsigned int minor, major;
- if(!fp)
+ if (!fp)
return NULL;
+ rstat = stat(block, &s);
+
while (fgets(line, sizeof(line), fp)) {
- if (!strncmp(line, block, len)) {
- char *p = &line[len + 1];
- char *t = strstr(p, " ");
+ pos = strchr(line, ' ');
+ if (!pos)
+ continue;
- if (!t) {
- fclose(fp);
- return NULL;
- }
- *t = '\0';
- point = p;
+ pos = strchr(pos + 1, ' ');
+ if (!pos)
+ continue;
+
+ tmp = ++pos;
+ pos = strchr(pos, ':');
+ if (!pos)
+ continue;
+
+ *pos = '\0';
+ major = atoi(tmp);
+ tmp = ++pos;
+ pos = strchr(pos, ' ');
+ if (!pos)
+ continue;
+
+ *pos = '\0';
+ minor = atoi(tmp);
+ pos = strchr(pos + 1, ' ');
+ if (!pos)
+ continue;
+ tmp = ++pos;
+
+ pos = strchr(pos, ' ');
+ if (!pos)
+ continue;
+ *pos = '\0';
+ cpoint = tmp;
+
+ pos = strchr(pos + 1, ' ');
+ if (!pos)
+ continue;
+
+ pos = strchr(pos + 1, ' ');
+ if (!pos)
+ continue;
+
+ pos = strchr(pos + 1, ' ');
+ if (!pos)
+ continue;
+
+ tmp = ++pos;
+ pos = strchr(pos, ' ');
+ if (!pos)
+ continue;
+
+ *pos = '\0';
+ devname = tmp;
+ if (!strncmp(block, devname, len)) {
+ point = strdup(cpoint);
+ break;
+ }
+
+ if (rstat)
+ continue;
+
+ if (!S_ISBLK(s.st_mode))
+ continue;
+
+ if (major == major(s.st_rdev) &&
+ minor == minor(s.st_rdev)) {
+ point = strdup(cpoint);
break;
}
}
return point;
}
+static int print_block_info(struct blkid_struct_probe *pr)
+{
+ static char *mp;
+
+ mp = find_mount_point(pr->dev);
+ printf("%s:", pr->dev);
+ if (pr->uuid[0])
+ printf(" UUID=\"%s\"", pr->uuid);
+
+ if (pr->label[0])
+ printf(" LABEL=\"%s\"", pr->label);
+
+ if (pr->name[0])
+ printf(" NAME=\"%s\"", pr->name);
+
+ if (pr->version[0])
+ printf(" VERSION=\"%s\"", pr->version);
+
+ if (mp) {
+ printf(" MOUNT=\"%s\"", mp);
+ free(mp);
+ }
+
+ printf(" TYPE=\"%s\"\n", pr->id->name);
+
+ return 0;
+}
+
static void mkdir_p(char *dir)
{
char *l = strrchr(dir, '/');
{
pid_t pid;
struct stat statbuf;
- char *e2fsck = "/usr/sbin/e2fsck";
+ const char *e2fsck = "/usr/sbin/e2fsck";
+ const char *dosfsck = "/usr/sbin/dosfsck";
+ const char *ckfs;
/* UBIFS does not need stuff like fsck */
if (!strncmp(pr->id->name, "ubifs", 5))
return;
- if (strncmp(pr->id->name, "ext", 3)) {
- ERROR("check_filesystem: %s is not supported\n", pr->id->name);
+ if (!strncmp(pr->id->name, "vfat", 4)) {
+ ckfs = dosfsck;
+ } else if (!strncmp(pr->id->name, "ext", 3)) {
+ ckfs = e2fsck;
+ } else {
+ ULOG_ERR("check_filesystem: %s is not supported\n", pr->id->name);
return;
}
- if (stat(e2fsck, &statbuf) < 0) {
- ERROR("check_filesystem: %s not found\n", e2fsck);
+ if (stat(ckfs, &statbuf) < 0) {
+ ULOG_ERR("check_filesystem: %s not found\n", ckfs);
return;
}
pid = fork();
if (!pid) {
- execl(e2fsck, e2fsck, "-p", pr->dev, NULL);
+ execl(ckfs, ckfs, "-p", pr->dev, NULL);
exit(-1);
} else if (pid > 0) {
int status;
waitpid(pid, &status, 0);
if (WEXITSTATUS(status))
- ERROR("check_filesystem: %s returned %d\n", e2fsck, WEXITSTATUS(status));
+ ULOG_ERR("check_filesystem: %s returned %d\n", ckfs, WEXITSTATUS(status));
}
}
{
struct mount *m;
char *device;
+ char *mp;
if (!pr)
return -1;
if (hotplug && !auto_mount)
return -1;
- if (find_mount_point(pr->dev)) {
- ERROR("%s is already mounted\n", pr->dev);
+ mp = find_mount_point(pr->dev);
+ if (mp) {
+ ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
+ free(mp);
return -1;
}
err = mount(pr->dev, target, pr->id->name, m->flags,
(m->options) ? (m->options) : (""));
if (err)
- ERROR("mounting %s (%s) as %s failed (%d) - %s\n",
- pr->dev, pr->id->name, target, err, strerror(err));
+ ULOG_ERR("mounting %s (%s) as %s failed (%d) - %s\n",
+ pr->dev, pr->id->name, target, err, strerror(err));
else
handle_swapfiles(true);
return err;
}
if (anon_mount) {
- char target[] = "/mnt/mmcblk123";
+ char target[32];
int err = 0;
snprintf(target, sizeof(target), "/mnt/%s", device);
err = mount(pr->dev, target, pr->id->name, 0, "");
if (err)
- ERROR("mounting %s (%s) as %s failed (%d) - %s\n",
- pr->dev, pr->id->name, target, err, strerror(err));
+ ULOG_ERR("mounting %s (%s) as %s failed (%d) - %s\n",
+ pr->dev, pr->id->name, target, err, strerror(err));
else
handle_swapfiles(true);
return err;
err = umount2(mp, MNT_DETACH);
if (err)
- ERROR("unmounting %s (%s) failed (%d) - %s\n",
- pr->dev, mp, err, strerror(err));
+ ULOG_ERR("unmounting %s (%s) failed (%d) - %s\n",
+ pr->dev, mp, err, strerror(err));
else
- ERROR("unmounted %s (%s)\n",
- pr->dev, mp);
+ ULOG_INFO("unmounted %s (%s)\n",
+ pr->dev, mp);
+ free(mp);
return err;
}
err = umount2(mount_point, MNT_DETACH);
if (err)
- ERROR("umount of %s failed (%d) - %s\n",
- mount_point, err, strerror(err));
+ ULOG_ERR("umount of %s failed (%d) - %s\n",
+ mount_point, err, strerror(err));
+ free(mount_point);
return 0;
} else if (strcmp(action, "add")) {
- ERROR("Unkown action %s\n", action);
+ ULOG_ERR("Unkown action %s\n", action);
return -1;
}
char devpath[32];
#ifdef UBIFS_EXTROOT
- if (find_block_mtd("rootfs", devpath, sizeof(devpath))) {
+ if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
int err = -1;
libubi_t libubi;
return -1;
}
#else
- if (find_block_mtd("rootfs", devpath, sizeof(devpath))) {
+ if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
if (find_root_dev(devpath, sizeof(devpath))) {
- ERROR("extroot: unable to determine root device\n");
+ ULOG_ERR("extroot: unable to determine root device\n");
return -1;
}
}
if (stat(tag, &s)) {
fp = fopen(tag, "w+");
if (!fp) {
- ERROR("extroot: failed to write UUID to %s: %d (%s)\n",
- tag, errno, strerror(errno));
+ ULOG_ERR("extroot: failed to write UUID to %s: %d (%s)\n",
+ tag, errno, strerror(errno));
/* return 0 to continue boot regardless of error */
return 0;
}
fp = fopen(tag, "r");
if (!fp) {
- ERROR("extroot: failed to read UUID from %s: %d (%s)\n",
- tag, errno, strerror(errno));
+ ULOG_ERR("extroot: failed to read UUID from %s: %d (%s)\n",
+ tag, errno, strerror(errno));
return -1;
}
- fgets(uuid, sizeof(uuid), fp);
+ if (!fgets(uuid, sizeof(uuid), fp))
+ ULOG_ERR("extroot: failed to read UUID from %s: %d (%s)\n",
+ tag, errno, strerror(errno));
fclose(fp);
- if (!strcasecmp(uuid, pr->uuid))
+ if (*uuid && !strcasecmp(uuid, pr->uuid))
return 0;
- ERROR("extroot: UUID mismatch (root: %s, %s: %s)\n",
- pr->uuid, basename(path), uuid);
+ ULOG_ERR("extroot: UUID mismatch (root: %s, %s: %s)\n",
+ pr->uuid, basename(path), uuid);
return -1;
}
}
- ERROR("extroot: unable to lookup root device %s\n", devpath);
+ ULOG_ERR("extroot: unable to lookup root device %s\n", devpath);
return -1;
}
if (!m || !m->extroot)
{
- KINFO("extroot: not configured\n");
+ ULOG_INFO("extroot: not configured\n");
return -1;
}
pr = find_block_info(m->uuid, m->label, m->device);
if (!pr && delay_root){
- KINFO("extroot: device not present, retrying in %u seconds\n", delay_root);
+ ULOG_INFO("extroot: device not present, retrying in %u seconds\n", delay_root);
sleep(delay_root);
mkblkdev();
cache_load(0);
if (pr) {
if (strncmp(pr->id->name, "ext", 3) &&
strncmp(pr->id->name, "ubifs", 5)) {
- ERROR("extroot: unsupported filesystem %s, try ext4\n", pr->id->name);
+ ULOG_ERR("extroot: unsupported filesystem %s, try ext4\n", pr->id->name);
return -1;
}
if (test_fs_support(pr->id->name)) {
- ERROR("extroot: filesystem %s not supported by kernel\n", pr->id->name);
+ ULOG_ERR("extroot: filesystem %s not supported by kernel\n", pr->id->name);
return -1;
}
if (check_fs)
check_filesystem(pr);
- err = mount(pr->dev, path, pr->id->name, 0, (m->options) ? (m->options) : (""));
+ err = mount(pr->dev, path, pr->id->name, m->flags,
+ (m->options) ? (m->options) : (""));
if (err) {
- ERROR("extroot: mounting %s (%s) on %s failed: %d (%s)\n",
- pr->dev, pr->id->name, path, err, strerror(err));
+ ULOG_ERR("extroot: mounting %s (%s) on %s failed: %d (%s)\n",
+ pr->dev, pr->id->name, path, err, strerror(err));
} else if (m->overlay) {
err = check_extroot(path);
if (err)
umount(path);
}
} else {
- ERROR("extroot: cannot find device %s%s\n",
- (m->uuid ? "with UUID " : (m->label ? "with label " : "")),
- (m->uuid ? m->uuid : (m->label ? m->label : m->device)));
+ ULOG_ERR("extroot: cannot find device %s%s\n",
+ (m->uuid ? "with UUID " : (m->label ? "with label " : "")),
+ (m->uuid ? m->uuid : (m->label ? m->label : m->device)));
}
return err;
return -1;
if (argc != 2) {
- fprintf(stderr, "Usage: block extroot\n");
+ ULOG_ERR("Usage: block extroot\n");
return -1;
}
- kmsg = 1;
-
mkblkdev();
cache_load(1);
+ /* enable LOG_INFO messages */
+ ulog_threshold(LOG_INFO);
+
/*
* Look for "rootfs_data". We will want to mount it and check for
* extroot configuration.
*/
/* Start with looking for MTD partition */
- find_block_mtd("rootfs_data", blkdev_path, sizeof(blkdev_path));
+ find_block_mtd("\"rootfs_data\"", blkdev_path, sizeof(blkdev_path));
if (blkdev_path[0]) {
pr = find_block_info(NULL, NULL, blkdev_path);
if (pr && !strcmp(pr->id->name, "jffs2")) {
struct stat s;
if (stat(argv[i], &s)) {
- ERROR("failed to stat %s\n", argv[i]);
+ ULOG_ERR("failed to stat %s\n", argv[i]);
continue;
}
- if (!S_ISBLK(s.st_mode)) {
- ERROR("%s is not a block device\n", argv[i]);
+ if (!S_ISBLK(s.st_mode) && !(S_ISCHR(s.st_mode) && major(s.st_rdev) == 250)) {
+ ULOG_ERR("%s is not a block device\n", argv[i]);
continue;
}
pr = find_block_info(NULL, NULL, argv[i]);
lineptr = NULL;
if (!fp) {
- ERROR("failed to open /proc/swaps\n");
+ ULOG_ERR("failed to open /proc/swaps\n");
return -1;
}
while (getline(&lineptr, &s, fp) > 0)
- printf(lineptr);
+ printf("%s", lineptr);
if (lineptr)
free(lineptr);
fclose(fp);
if (strcmp(pr->id->name, "swap"))
continue;
if (swapon(pr->dev, 0))
- ERROR("failed to swapon %s\n", pr->dev);
+ ULOG_ERR("failed to swapon %s\n", pr->dev);
}
return 0;
case 'p':
return swapon_usage();
if (stat(argv[optind], &st) || (!S_ISBLK(st.st_mode) && !S_ISREG(st.st_mode))) {
- ERROR("%s is not a block device or file\n", argv[optind]);
+ ULOG_ERR("%s is not a block device or file\n", argv[optind]);
return -1;
}
err = swapon(argv[optind], flags);
if (err) {
- ERROR("failed to swapon %s (%d)\n", argv[optind], err);
+ ULOG_ERR("failed to swapon %s (%d)\n", argv[optind], err);
return err;
}
static int main_swapoff(int argc, char **argv)
{
if (argc != 2) {
- ERROR("Usage: swapoff [-a] [DEVICE]\n\n"
+ ULOG_ERR("Usage: swapoff [-a] [DEVICE]\n\n"
"\tStop swapping on DEVICE\n"
" -a\tStop swapping on all swap devices\n");
return -1;
char line[256];
if (!fp) {
- ERROR("failed to open /proc/swaps\n");
+ ULOG_ERR("failed to open /proc/swaps\n");
return -1;
}
- fgets(line, sizeof(line), fp);
- while (fgets(line, sizeof(line), fp)) {
- char *end = strchr(line, ' ');
- int err;
+ if (fgets(line, sizeof(line), fp))
+ while (fgets(line, sizeof(line), fp)) {
+ char *end = strchr(line, ' ');
+ int err;
- if (!end)
- continue;
- *end = '\0';
- err = swapoff(line);
- if (err)
- ERROR("failed to swapoff %s (%d)\n", line, err);
- }
+ if (!end)
+ continue;
+ *end = '\0';
+ err = swapoff(line);
+ if (err)
+ ULOG_ERR("failed to swapoff %s (%d)\n", line, err);
+ }
fclose(fp);
} else {
struct stat s;
int err;
if (stat(argv[1], &s) || (!S_ISBLK(s.st_mode) && !S_ISREG(s.st_mode))) {
- ERROR("%s is not a block device or file\n", argv[1]);
+ ULOG_ERR("%s is not a block device or file\n", argv[1]);
return -1;
}
err = swapoff(argv[1]);
if (err) {
- ERROR("fsiled to swapoff %s (%d)\n", argv[1], err);
+ ULOG_ERR("failed to swapoff %s (%d)\n", argv[1], err);
return err;
}
}
umask(0);
+ ulog_open(-1, -1, "block");
+ ulog_threshold(LOG_NOTICE);
+
if (!strcmp(base, "swapon"))
return main_swapon(argc, argv);
if (!strcmp(argv[1], "umount"))
return main_umount(argc, argv);
+
+ if (!strcmp(argv[1], "remount")) {
+ int ret = main_umount(argc, argv);
+
+ if (!ret)
+ ret = main_mount(argc, argv);
+ return ret;
+ }
}
- fprintf(stderr, "Usage: block <info|mount|umount|detect>\n");
+ ULOG_ERR("Usage: block <info|mount|umount|detect>\n");
return -1;
}
projects / project / fstools.git / blobdiff