Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5b46079 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "init: use init's property expansion code for mount_all"

parents 3f1d7ebb 12df1e11
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -468,11 +468,17 @@ int do_mount_all(int nargs, char **args)
    int child_ret = -1;
    int status;
    struct fstab *fstab;
    char fstabfile[PROP_VALUE_MAX];

    if (nargs != 2) {
        return -1;
    }

    if (expand_props(fstabfile, args[1], sizeof(fstabfile)) == -1) {
        ERROR("mount_all: cannot expand '%s' \n", args[1]);
        return -EINVAL;
    }

    /*
     * Call fs_mgr_mount_all() to mount all filesystems.  We fork(2) and
     * do the call in the child to provide protection to the main init
@@ -496,7 +502,7 @@ int do_mount_all(int nargs, char **args)
    } else if (pid == 0) {
        /* child, call fs_mgr_mount_all() */
        klog_set_level(6);  /* So we can see what fs_mgr_mount_all() does */
        fstab = fs_mgr_read_fstab(args[1]);
        fstab = fs_mgr_read_fstab(fstabfile);
        child_ret = fs_mgr_mount_all(fstab);
        fs_mgr_free_fstab(fstab);
        if (child_ret == -1) {