This patch is needed in order to build Guix on a Btrfs file system. From da922703282b0d3b8837a99a9c7fdd32f1d20d49 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 9 Jan 2018 20:16:14 -0500 Subject: [PATCH] Remove nonportable check for files containing only zeroes. This check benefitted only one unlikely case (large files containing only zeroes, on systems that do not support SEEK_HOLE) and was based on an assumption about file system behavior that is not mandated by POSIX and no longer holds in practice, namely that for sufficiently large files, (st_blocks == 0) implies that the file contains only zeroes. Examples of file systems that violate this assumption include Linux's /proc file system and Btrfs. * src/sparse.c (sparse_scan_file_wholesparse): Remove this function. (sparse_scan_file_seek): Remove the initial check for files containing only zeroes. --- src/sparse.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/sparse.c b/src/sparse.c index d41c0ea..3de6560 100644 --- a/src/sparse.c +++ b/src/sparse.c @@ -261,26 +261,6 @@ sparse_scan_file_raw (struct tar_sparse_file *file) return tar_sparse_scan (file, scan_end, NULL); } -static bool -sparse_scan_file_wholesparse (struct tar_sparse_file *file) -{ - struct tar_stat_info *st = file->stat_info; - struct sp_array sp = {0, 0}; - - /* Note that this function is called only for truly sparse files of size >= 1 - block size (checked via ST_IS_SPARSE before). See the thread - http://www.mail-archive.com/bug-tar@gnu.org/msg04209.html for more info */ - if (ST_NBLOCKS (st->stat) == 0) - { - st->archive_file_size = 0; - sp.offset = st->stat.st_size; - sparse_add_map (st, &sp); - return true; - } - - return false; -} - #ifdef SEEK_HOLE /* Try to engage SEEK_HOLE/SEEK_DATA feature. */ static bool @@ -343,10 +323,6 @@ sparse_scan_file_seek (struct tar_sparse_file *file) static bool sparse_scan_file (struct tar_sparse_file *file) { - /* always check for completely sparse files */ - if (sparse_scan_file_wholesparse (file)) - return true; - switch (hole_detection) { case HOLE_DETECTION_DEFAULT: -- 2.15.1 ?id=e775f704c8da973ca42f7f0fe962f692cbf74652'>installer/tests.scm
AgeCommit message (Expand)Author
2022-09-24installer: tests: Fix typo....* gnu/installer/tests.scm (edit-configuration-file): Fix it. Mathieu Othacehe
2022-09-24installer: Fix configuration edition during testing....When the configuration is edited, it looks like there are some leftover fragments from the input configuration: Example content of config.scm after edition: #:imported-modules '((gnu services herd) (guix build utils) (guix combinators))) unted". The unique ;; file system identifiers there ("UUIDs") can be obtained ;; by running 'blkid' in a terminal. ... This is strange because call-with-output-file uses the O_TRUNC flag which resets the file size to zero. Remove the configuration file before writing it as a work-around. * gnu/installer/tests.scm (edit-configuration-file): Remove the configuration file before re-writing it. Mathieu Othacehe
2021-12-28installer: Recommend 'ntp-service-type' for non-graphical systems....We had several bug reports with a root cause of "the clock was incorrect" from users who used the installer to install a non-graphical Guix System. * gnu/installer/services.scm (%system-services): Add the ntp-service-type. * gnu/installer/newt/services.scm (run-system-administration-cbt-page): New variable. (run-services-page): Use run-system-administration-cbt-page when not installing a desktop. * gnu/installer/tests.scm (choose-services): Add and use a choose-misc-service? procedure. * gnu/tests/install.scm (installation-target-os-for-gui-tests)<services>: Add ntp-service-type. Leo Famulari
2021-12-28installer: Offer the CUPS printing service on a dedicated page....Currently, the installer page RUN-OTHER-SERVICES-CBT-PAGE offers to the user all installer services that are not of the types 'desktop', 'network-management', or 'networking'. Concretely, this means that it offers the CUPS printing service, because that is the only service of a different type defined in the installer. In later commits, we will add some services of a new type, and we only want them to be offered when the user is installing a non-graphical system. At least one of these new services (NTP) is part of %DESKTOP-SERVICES. If it was also offered on RUN-OTHER-SERVICES-CBT-PAGE, and the user had configured a system using %DESKTOP-SERVICES, the user could accidentally add NTP to their services twice, which is an error and would break installation. So, this commit makes the RUN-OTHER-SERVICES-CBT-PAGE be more specific about what services to offer. This makes it easier to discriminate between desktop and non-desktop installations, in terms of when a given service is offered. * gnu/installer/newt/services.scm (RUN-OTHER-SERVICES-CBT-PAGE): Rename to ... (RUN-PRINTING-SERVICES-CBT-PAGE): ... new variable, and select only 'document' services. (RUN-SERVICES-PAGE): Adjust accordingly. * gnu/installer/tests.scm (CHOOSE-SERVICES): Adjust accordingly. Leo Famulari