#include <syslog.h>
#include <libgen.h>
#include <glob.h>
+#include <dirent.h>
+#include <stdarg.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/types.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
-#define ERROR(fmt, ...) do { \
- syslog(LOG_ERR, fmt, ## __VA_ARGS__); \
- fprintf(stderr, "block: "fmt, ## __VA_ARGS__); \
- } while (0)
-
enum {
TYPE_MOUNT,
TYPE_SWAP,
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)
{
}
-static int config_load(char *cfg)
+static struct uci_package * config_try_load(struct uci_context *ctx, char *path)
{
- struct uci_context *ctx;
+ char *file = basename(path);
+ char *dir = dirname(path);
+ char *err;
struct uci_package *pkg;
+
+ uci_set_confdir(ctx, dir);
+ ULOG_INFO("attempting to load %s/%s\n", dir, file);
+
+ if (uci_load(ctx, file, &pkg)) {
+ uci_get_errorstr(ctx, &err, file);
+ ULOG_ERR("unable to load configuration (%s)\n", err);
+
+ free(err);
+ return NULL;
+ }
+
+ return pkg;
+}
+
+static int config_load(char *cfg)
+{
+ struct uci_context *ctx = uci_alloc_context();
+ struct uci_package *pkg = NULL;
struct uci_element *e;
+ char path[64];
vlist_init(&mounts, avl_strcmp, mounts_update);
- ctx = uci_alloc_context();
if (cfg) {
- char path[32];
- snprintf(path, 32, "%s/etc/config", cfg);
- uci_set_confdir(ctx, path);
+ snprintf(path, sizeof(path), "%s/upper/etc/config/fstab", cfg);
+ pkg = config_try_load(ctx, path);
+
+ if (!pkg) {
+ snprintf(path, sizeof(path), "%s/etc/config/fstab", cfg);
+ pkg = config_try_load(ctx, path);
+ }
}
- if (uci_load(ctx, "fstab", &pkg))
- {
- char *err;
- uci_get_errorstr(ctx, &err, "fstab");
- ERROR("extroot: failed to load %s/etc/config/%s\n",
- cfg ? cfg : "", err);
- free(err);
+ if (!pkg) {
+ snprintf(path, sizeof(path), "/etc/config/fstab");
+ pkg = config_try_load(ctx, path);
+ }
+
+ if (!pkg) {
+ ULOG_ERR("no usable configuration\n");
return -1;
}
struct stat statbuf;
char *e2fsck = "/usr/sbin/e2fsck";
+ /* 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);
+ 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);
+ ULOG_ERR("check_filesystem: %s not found\n", e2fsck);
return;
}
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", e2fsck, WEXITSTATUS(status));
}
}
return -1;
if (find_mount_point(pr->dev)) {
- ERROR("%s is already mounted\n", pr->dev);
+ ULOG_ERR("%s is already mounted\n", pr->dev);
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;
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);
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));
return 0;
} else if (strcmp(action, "add")) {
- ERROR("Unkown action %s\n", action);
+ ULOG_ERR("Unkown action %s\n", action);
return -1;
}
return err;
}
+
+#else
+
+static int find_root_dev(char *buf, int len)
+{
+ DIR *d;
+ dev_t root;
+ struct stat s;
+ struct dirent *e;
+
+ if (stat("/", &s))
+ return -1;
+
+ if (!(d = opendir("/dev")))
+ return -1;
+
+ root = s.st_dev;
+
+ while ((e = readdir(d)) != NULL) {
+ snprintf(buf, len, "/dev/%s", e->d_name);
+
+ if (stat(buf, &s) || s.st_rdev != root)
+ continue;
+
+ closedir(d);
+ return 0;
+ }
+
+ closedir(d);
+ return -1;
+}
+
#endif
+static int test_fs_support(const char *name)
+{
+ char line[128], *p;
+ int rv = -1;
+ FILE *f;
+
+ if ((f = fopen("/proc/filesystems", "r")) != NULL) {
+ while (fgets(line, sizeof(line), f)) {
+ p = strtok(line, "\t\n");
+
+ if (p && !strcmp(p, "nodev"))
+ p = strtok(NULL, "\t\n");
+
+ if (p && !strcmp(p, name)) {
+ rv = 0;
+ break;
+ }
+ }
+ fclose(f);
+ }
+
+ return rv;
+}
+
static int check_extroot(char *path)
{
struct blkid_struct_probe *pr = NULL;
- char fs[32];
+ char devpath[32];
#ifdef UBIFS_EXTROOT
- if (find_block_mtd("rootfs", fs, sizeof(fs))) {
+ if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
int err = -1;
libubi_t libubi;
libubi = libubi_open();
- err = find_block_ubi_RO(libubi, "rootfs", fs, sizeof(fs));
+ err = find_block_ubi_RO(libubi, "rootfs", devpath, sizeof(devpath));
libubi_close(libubi);
if (err)
return -1;
}
#else
- if (find_block_mtd("rootfs", fs, sizeof(fs)))
- return -1;
+ if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
+ if (find_root_dev(devpath, sizeof(devpath))) {
+ ULOG_ERR("extroot: unable to determine root device\n");
+ return -1;
+ }
+ }
#endif
list_for_each_entry(pr, &devices, list) {
- if (!strcmp(pr->dev, fs)) {
+ if (!strcmp(pr->dev, devpath)) {
struct stat s;
FILE *fp = NULL;
char tag[64];
char uuid[64] = { 0 };
+ snprintf(tag, sizeof(tag), "%s/etc", path);
+ if (stat(tag, &s))
+ mkdir_p(tag);
+
snprintf(tag, sizeof(tag), "%s/etc/.extroot-uuid", path);
if (stat(tag, &s)) {
fp = fopen(tag, "w+");
if (!fp) {
- ERROR("extroot: failed to write uuid tag file\n");
+ 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 open uuid tag file\n");
+ 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 tag does not match rom uuid\n");
+
+ ULOG_ERR("extroot: UUID mismatch (root: %s, %s: %s)\n",
+ pr->uuid, basename(path), uuid);
+ return -1;
}
}
+
+ ULOG_ERR("extroot: unable to lookup root device %s\n", devpath);
return -1;
}
if (!m || !m->extroot)
{
- ERROR("extroot: no root or overlay mount defined\n");
+ ULOG_INFO("extroot: not configured\n");
return -1;
}
pr = find_block_info(m->uuid, m->label, m->device);
if (!pr && delay_root){
- ERROR("extroot: is not ready yet, 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);
pr = find_block_info(m->uuid, m->label, m->device);
}
if (pr) {
- if (strncmp(pr->id->name, "ext", 3)) {
- ERROR("extroot: %s is not supported, try ext4\n", pr->id->name);
+ if (strncmp(pr->id->name, "ext", 3) &&
+ strncmp(pr->id->name, "ubifs", 5)) {
+ ULOG_ERR("extroot: unsupported filesystem %s, try ext4\n", pr->id->name);
return -1;
}
+
+ if (test_fs_support(pr->id->name)) {
+ ULOG_ERR("extroot: filesystem %s not supported by kernel\n", pr->id->name);
+ return -1;
+ }
+
if (m->overlay)
path = overlay;
mkdir_p(path);
err = mount(pr->dev, path, pr->id->name, 0, (m->options) ? (m->options) : (""));
if (err) {
- ERROR("mounting %s (%s) as %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 block device\n");
+ 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;
static int main_extroot(int argc, char **argv)
{
struct blkid_struct_probe *pr;
- char fs[32] = { 0 };
char blkdev_path[32] = { 0 };
int err = -1;
#ifdef UBIFS_EXTROOT
return -1;
if (argc != 2) {
- fprintf(stderr, "Usage: block extroot mountpoint\n");
+ ULOG_ERR("Usage: block extroot\n");
return -1;
}
mkblkdev();
cache_load(1);
- /*
- * Make sure there is "rootfs" MTD partition or UBI volume.
- * TODO: What for?
- */
- find_block_mtd("rootfs", fs, sizeof(fs));
- if (!fs[0]) {
-#ifdef UBIFS_EXTROOT
- libubi = libubi_open();
- find_block_ubi_RO(libubi, "rootfs", fs, sizeof(fs));
- libubi_close(libubi);
- if (!fs[0]) {
- ERROR("extroot: unable to locate rootfs mtdblock / ubiblock\n");
- return -2;
- }
-#else
- ERROR("extroot: unable to locate rootfs mtdblock\n");
- return -2;
-#endif
- }
-
- pr = find_block_info(NULL, NULL, fs);
- if (!pr) {
- ERROR("extroot: unable to retrieve rootfs information\n");
- return -3;
- }
+ /* enable LOG_INFO messages */
+ ulog_threshold(LOG_INFO);
/*
* Look for "rootfs_data". We will want to mount it and check for
*/
/* 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]);
+ 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);
return main_umount(argc, argv);
}
- 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