kmodloader: support loading modules from a different prefix

[project/ubox.git] / block.c

diff --git a/block.c b/block.c
index 409365847998cdd084db1ad40dd4d60fb812135a..b5bc4941cafe5b363801f363085f6853edabf73b 100644 (file)
--- a/block.c
+++ b/block.c
@@ -513,7 +513,7 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug)
 
        if (m) {
                char *target = m->target;
-               char _target[] = "/mnt/mmcblk123";
+               char _target[32];
                int err = 0;
 
                if (!target) {
@@ -804,7 +804,7 @@ static int main_mount(int argc, char **argv)
        if (config_load(NULL))
                return -1;
 
-       cache_load(0);
+       cache_load(1);
        list_for_each_entry(pr, &devices, list)
                mount_device(pr, 0);
 
@@ -910,8 +910,8 @@ static int main_swapon(int argc, char **argv)
                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);
@@ -927,7 +927,7 @@ static int main_swapon(int argc, char **argv)
 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;
        }
 
@@ -956,8 +956,8 @@ static int main_swapoff(int argc, char **argv)
                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]);