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

Commit c2971353 authored by Vincent Donnefort's avatar Vincent Donnefort
Browse files

mkbootfs: Add support for dev nodes

Add the ability of packaging dev nodes in the CPIO.

Change-Id: Id1c83c8bcd3724de03214788c9af592f9817285f
parent 7f01774a
Loading
Loading
Loading
Loading
+10 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@

#include <sys/types.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
#include <dirent.h>

#include <stdarg.h>
@@ -22,7 +23,6 @@
**   an explanation of this file format
** - dotfiles are ignored
** - directories named 'root' are ignored
** - device notes, pipes, etc are not supported (error)
*/

static void die(const char* why, ...) {
@@ -87,6 +87,10 @@ static void fix_stat(const char *path, struct stat *s)
        fs_config(path, is_dir, target_out_path, &s->st_uid, &s->st_gid, &st_mode, &capabilities);
        s->st_mode = (typeof(s->st_mode)) st_mode;
    }

    if (S_ISREG(s->st_mode) || S_ISDIR(s->st_mode) || S_ISLNK(s->st_mode)) {
        s->st_rdev = 0;
    }
}

static void _eject(struct stat *s, char *out, int olen, char *data, unsigned datasize)
@@ -116,8 +120,8 @@ static void _eject(struct stat *s, char *out, int olen, char *data, unsigned dat
           datasize,
           0, // volmajor
           0, // volminor
           0, // devmajor
           0, // devminor,
           major(s->st_rdev),
           minor(s->st_rdev),
           olen + 1,
           0,
           out,
@@ -268,6 +272,9 @@ static void _archive(char *in, char *out, int ilen, int olen)
        size = readlink(in, buf, 1024);
        if(size < 0) die("cannot read symlink '%s'", in);
        _eject(&s, out, olen, buf, size);
    } else if(S_ISBLK(s.st_mode) || S_ISCHR(s.st_mode) ||
              S_ISFIFO(s.st_mode) || S_ISSOCK(s.st_mode)) {
        _eject(&s, out, olen, NULL, 0);
    } else {
        die("Unknown '%s' (mode %d)?\n", in, s.st_mode);
    }