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

Commit f67d6bd3 authored by Daniel Rosenberg's avatar Daniel Rosenberg
Browse files

Moved symlink back up. 



Moving the vendor symlink down was causing issues with some devices.
Moved it back up, and adjusted mount to remove symlinks if necessary.

Change-Id: I77126d77cfbef32250012bea3960c99b55db4cbb
Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
parent 064b562a

fs_mgr/fs_mgr.c

+8 −1
Original line number Diff line number Diff line
@@ -198,6 +198,13 @@ static int __mount(const char *source, const char *target, const struct fstab_re 
    int ret;

    int save_errno;



    /* We need this because sometimes we have legacy symlinks

     * that are lingering around and need cleaning up.

     */

    struct stat info;

    if (!lstat(target, &info))

        if ((info.st_mode & S_IFMT) == S_IFLNK)

            unlink(target);

    mkdir(target, 0755);

    ret = mount(source, target, rec->fs_type, mountflags, rec->fs_options);

    save_errno = errno;

rootdir/init.rc

+4 −4
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ on init 
    symlink /system/etc /etc

    symlink /sys/kernel/debug /d



    # Right now vendor lives on the same filesystem as system,

    # but someday that may change.

    symlink /system/vendor /vendor



    # Create cgroup mount point for cpu accounting

    mkdir /acct

    mount cgroup none /acct cpuacct
@@ -180,10 +184,6 @@ on late-init 
    trigger boot



on post-fs

    # Right now vendor lives on the same filesystem as system,

    # but someday that may change. If it has, this symlink will fail.

    symlink /system/vendor /vendor



    # once everything is setup, no need to modify /

    mount rootfs rootfs / ro remount

    # mount shared so changes propagate into child namespaces