diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2020-11-07 22:27:31 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2020-11-22 11:02:58 +0100 |
| commit | b1dfc64552265d66e60d11c2a1b6f4da549cd495 (patch) | |
| tree | 9886c1ffe289c7c2167af7ae2a32b5bb9ec904d0 | |
| parent | 464b1fffb0f08a452b4ee67ba23c87730d73568e (diff) | |
| download | guix-b1dfc64552265d66e60d11c2a1b6f4da549cd495.tar.gz guix-b1dfc64552265d66e60d11c2a1b6f4da549cd495.zip | |
linux-initrd: Handle 'block-special and 'char-special cpio headers as well.
* guix/cpio.scm (make-cpio-header): Handle size correctly for all file types.
(mode->type): Add 'block-special, 'char-special.
| -rw-r--r-- | guix/cpio.scm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/guix/cpio.scm b/guix/cpio.scm index e4692e2e9c..5d38573971 100644 --- a/guix/cpio.scm +++ b/guix/cpio.scm @@ -132,9 +132,10 @@ (%make-cpio-header MAGIC inode mode uid gid nlink mtime - (if (= C_ISDIR (logand mode C_FMT)) - 0 - size) + (if (or (= C_ISLNK (logand mode C_FMT)) + (= C_ISREG (logand mode C_FMT))) + size + 0) major minor rmajor rminor (+ name-size 1) ;include trailing zero 0))) ;checksum @@ -146,6 +147,8 @@ denotes, similar to 'stat:type'." (cond ((= C_ISREG fmt) 'regular) ((= C_ISDIR fmt) 'directory) ((= C_ISLNK fmt) 'symlink) + ((= C_ISBLK fmt) 'block-special) + ((= C_ISCHR fmt) 'char-special) (else (error "unsupported file type" mode))))) @@ -233,6 +236,10 @@ produces with the '-H newc' option." (put-string port target))) ((directory) #t) + ((block-special) + #t) + ((char-special) + #t) (else (error "file type not supported"))) |