commit 0aeba64fb26e4defa0842a942757144659c6e29f · pyrox.dev/nixpkgs

+1 -1

nixos/lib/make-squashfs.nix

···

       23
       23
        
       

     

       24
       24
        
             # Generate the squashfs image.

     

       25
       25
        
             mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \

     

       26
       26
       -
               -keep-as-directory -all-root -b 1048576 -comp ${comp}

     

       26
       26
       +
               -no-hardlinks -keep-as-directory -all-root -b 1048576 -comp ${comp}

     

       27
       27
        
           '';

     

       28
       28
        
       }

+76

pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch

···

       1
       1
       +
       From d925c9a11ee2e88ac8aac03f51892746f2bcf8cd Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Phillip Lougher <phillip@squashfs.org.uk>

     

       3
       3
       +
       Date: Thu, 25 Feb 2021 23:12:10 +0000

     

       4
       4
       +
       Subject: [PATCH] Mksquashfs: add -no-hardlinks option

     

       5
       5
       +
       

     

       6
       6
       +
       Normally Mksquashfs will detect hardlinks (multiple files with the

     

       7
       7
       +
       same inode) and hardlink them in the Squashfs image.

     

       8
       8
       +
       

     

       9
       9
       +
       But often hardlinks are used in the original filesystem

     

       10
       10
       +
       to save space, when files are discovered to be duplicate.

     

       11
       11
       +
       In this special case the only reason the files are

     

       12
       12
       +
       hardlinked is to save space, and where the filesystem

     

       13
       13
       +
       doesn't handle duplicate files (different inode, same

     

       14
       14
       +
       data).

     

       15
       15
       +
       

     

       16
       16
       +
       Squashfs does handle duplicate files, and so add

     

       17
       17
       +
       an option to ignore hardlinks and instead

     

       18
       18
       +
       store them as duplicates.

     

       19
       19
       +
       

     

       20
       20
       +
       Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>

     

       21
       21
       +
       ---

     

       22
       22
       +
        squashfs-tools/mksquashfs.c | 16 +++++++++++-----

     

       23
       23
       +
        1 file changed, 11 insertions(+), 5 deletions(-)

     

       24
       24
       +
       

     

       25
       25
       +
       diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c

     

       26
       26
       +
       index a45b77f..d4dc359 100644

     

       27
       27
       +
       --- a/squashfs-tools/mksquashfs.c

     

       28
       28
       +
       +++ b/squashfs-tools/mksquashfs.c

     

       29
       29
       +
       @@ -312,6 +312,9 @@ struct dir_info *root_dir;

     

       30
       30
       +
        FILE *log_fd;

     

       31
       31
       +
        int logging=FALSE;

     

       32
       32
       +
        

     

       33
       33
       +
       +/* Should Mksquashfs detect hardlinked files? */

     

       34
       34
       +
       +int no_hardlinks = FALSE;

     

       35
       35
       +
       +

     

       36
       36
       +
        static char *read_from_disk(long long start, unsigned int avail_bytes);

     

       37
       37
       +
        void add_old_root_entry(char *name, squashfs_inode inode, int inode_number,

     

       38
       38
       +
        	int type);

     

       39
       39
       +
       @@ -3093,11 +3096,11 @@ struct inode_info *lookup_inode3(struct stat *buf, int pseudo, int id,

     

       40
       40
       +
        

     

       41
       41
       +
        	/*

     

       42
       42
       +
        	 * Look-up inode in hash table, if it already exists we have a

     

       43
       43
       +
       -	 * hard-link, so increment the nlink count and return it.

     

       44
       44
       +
       -	 * Don't do the look-up for directories because we don't hard-link

     

       45
       45
       +
       -	 * directories.

     

       46
       46
       +
       +	 * hardlink, so increment the nlink count and return it.

     

       47
       47
       +
       +	 * Don't do the look-up for directories because Unix/Linux doesn't

     

       48
       48
       +
       +	 * allow hard-links to directories.

     

       49
       49
       +
        	 */

     

       50
       50
       +
       -	if ((buf->st_mode & S_IFMT) != S_IFDIR) {

     

       51
       51
       +
       +	if ((buf->st_mode & S_IFMT) != S_IFDIR && !no_hardlinks) {

     

       52
       52
       +
        		for(inode = inode_info[ino_hash]; inode; inode = inode->next) {

     

       53
       53
       +
        			if(memcmp(buf, &inode->buf, sizeof(struct stat)) == 0) {

     

       54
       54
       +
        				inode->nlink ++;

     

       55
       55
       +
       @@ -5447,7 +5450,9 @@ int main(int argc, char *argv[])

     

       56
       56
       +
        		comp = lookup_compressor(COMP_DEFAULT);

     

       57
       57
       +
        

     

       58
       58
       +
        	for(i = source + 2; i < argc; i++) {

     

       59
       59
       +
       -		if(strcmp(argv[i], "-mkfs-time") == 0 ||

     

       60
       60
       +
       +		if(strcmp(argv[i], "-no-hardlinks") == 0)

     

       61
       61
       +
       +			no_hardlinks = TRUE;

     

       62
       62
       +
       +		else if(strcmp(argv[i], "-mkfs-time") == 0 ||

     

       63
       63
       +
        				strcmp(argv[i], "-fstime") == 0) {

     

       64
       64
       +
        			if((++i == argc) || !parse_num_unsigned(argv[i], &mkfs_time)) {

     

       65
       65
       +
        				ERROR("%s: %s missing or invalid time value\n", argv[0], argv[i - 1]);

     

       66
       66
       +
       @@ -5893,6 +5898,7 @@ printOptions:

     

       67
       67
       +
        				"files larger than block size\n");

     

       68
       68
       +
        			ERROR("-no-duplicates\t\tdo not perform duplicate "

     

       69
       69
       +
        				"checking\n");

     

       70
       70
       +
       +			ERROR("-no-hardlinks\t\tdo not hardlink files, instead store duplicates\n");

     

       71
       71
       +
        			ERROR("-all-root\t\tmake all files owned by root\n");

     

       72
       72
       +
        			ERROR("-root-mode <mode>\tset root directory permissions to octal <mode>\n");

     

       73
       73
       +
        			ERROR("-force-uid <uid>\tset all file uids to <uid>\n");

     

       74
       74
       +
       -- 

     

       75
       75
       +
       2.30.0

     

       76
       76
       +

pkgs/tools/filesystems/squashfs/default.nix

···

       19
       19
        
           # This patch adds an option to pad filesystems (increasing size) in

     

       20
       20
        
           # exchange for better chunking / binary diff calculation.

     

       21
       21
        
           ./4k-align.patch

     

       22
       22
       +
           # Add -no-hardlinks option. This is a rebased version of

     

       23
       23
       +
           # c37bb4da4a5fa8c1cf114237ba364692dd522262, can be removed

     

       24
       24
       +
           # when upgrading to the next version after 4.4

     

       25
       25
       +
           ./0001-Mksquashfs-add-no-hardlinks-option.patch

     

       22
       26
        
         ] ++ lib.optional stdenv.isDarwin ./darwin.patch;

     

       23
       27
        
       

     

       24
       28
        
         buildInputs = [ zlib xz zstd lz4 ];