From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id cHiXNGsRp1/mTgAA0tVLHw (envelope-from ) for ; Sat, 07 Nov 2020 21:28:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id sOyMMGsRp18icQAA1q6Kng (envelope-from ) for ; Sat, 07 Nov 2020 21:28:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 827E0940538 for ; Sat, 7 Nov 2020 21:28:11 +0000 (UTC) Received: from localhost ([::1]:47670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbVkn-00070f-9i for larch@yhetil.org; Sat, 07 Nov 2020 16:28:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbVkg-00070L-9E for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kbVkf-0004Aa-VZ for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kbVkf-00014q-Ra for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44507] [PATCH 1/3] linux-initrd: Handle 'block-special and 'char-special cpio headers as well. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Nov 2020 21:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44507 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44507@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 44507-submit@debbugs.gnu.org id=B44507.16047844584095 (code B ref 44507); Sat, 07 Nov 2020 21:28:01 +0000 Received: (at 44507) by debbugs.gnu.org; 7 Nov 2020 21:27:38 +0000 Received: from localhost ([127.0.0.1]:59346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbVkH-00013y-Qu for submit@debbugs.gnu.org; Sat, 07 Nov 2020 16:27:38 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:53758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbVkG-00013c-AS for 44507@debbugs.gnu.org; Sat, 07 Nov 2020 16:27:36 -0500 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 9BAD933604BC; Sat, 7 Nov 2020 22:27:34 +0100 (CET) From: Danny Milosavljevic Date: Sat, 7 Nov 2020 22:27:31 +0100 Message-Id: <20201107212733.22326-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201107204718.21824-1-dannym@scratchpost.org> References: <20201107204718.21824-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: ie4Dzg/cEPuK * guix/cpio.scm (make-cpio-header): Handle size correctly for all file types. (mode->type): Add 'block-special, 'char-special. --- guix/cpio.scm | 13 ++++++++++--- 1 file 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")))