diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch b/nixpkgs/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch new file mode 100644 index 000000000000..0d6804a647b2 --- /dev/null +++ b/nixpkgs/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch @@ -0,0 +1,76 @@ +From d925c9a11ee2e88ac8aac03f51892746f2bcf8cd Mon Sep 17 00:00:00 2001 +From: Phillip Lougher <phillip@squashfs.org.uk> +Date: Thu, 25 Feb 2021 23:12:10 +0000 +Subject: [PATCH] Mksquashfs: add -no-hardlinks option + +Normally Mksquashfs will detect hardlinks (multiple files with the +same inode) and hardlink them in the Squashfs image. + +But often hardlinks are used in the original filesystem +to save space, when files are discovered to be duplicate. +In this special case the only reason the files are +hardlinked is to save space, and where the filesystem +doesn't handle duplicate files (different inode, same +data). + +Squashfs does handle duplicate files, and so add +an option to ignore hardlinks and instead +store them as duplicates. + +Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk> +--- + squashfs-tools/mksquashfs.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index a45b77f..d4dc359 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -312,6 +312,9 @@ struct dir_info *root_dir; + FILE *log_fd; + int logging=FALSE; + ++/* Should Mksquashfs detect hardlinked files? */ ++int no_hardlinks = FALSE; ++ + static char *read_from_disk(long long start, unsigned int avail_bytes); + void add_old_root_entry(char *name, squashfs_inode inode, int inode_number, + int type); +@@ -3093,11 +3096,11 @@ struct inode_info *lookup_inode3(struct stat *buf, int pseudo, int id, + + /* + * Look-up inode in hash table, if it already exists we have a +- * hard-link, so increment the nlink count and return it. +- * Don't do the look-up for directories because we don't hard-link +- * directories. ++ * hardlink, so increment the nlink count and return it. ++ * Don't do the look-up for directories because Unix/Linux doesn't ++ * allow hard-links to directories. + */ +- if ((buf->st_mode & S_IFMT) != S_IFDIR) { ++ if ((buf->st_mode & S_IFMT) != S_IFDIR && !no_hardlinks) { + for(inode = inode_info[ino_hash]; inode; inode = inode->next) { + if(memcmp(buf, &inode->buf, sizeof(struct stat)) == 0) { + inode->nlink ++; +@@ -5447,7 +5450,9 @@ int main(int argc, char *argv[]) + comp = lookup_compressor(COMP_DEFAULT); + + for(i = source + 2; i < argc; i++) { +- if(strcmp(argv[i], "-mkfs-time") == 0 || ++ if(strcmp(argv[i], "-no-hardlinks") == 0) ++ no_hardlinks = TRUE; ++ else if(strcmp(argv[i], "-mkfs-time") == 0 || + strcmp(argv[i], "-fstime") == 0) { + if((++i == argc) || !parse_num_unsigned(argv[i], &mkfs_time)) { + ERROR("%s: %s missing or invalid time value\n", argv[0], argv[i - 1]); +@@ -5893,6 +5898,7 @@ printOptions: + "files larger than block size\n"); + ERROR("-no-duplicates\t\tdo not perform duplicate " + "checking\n"); ++ ERROR("-no-hardlinks\t\tdo not hardlink files, instead store duplicates\n"); + ERROR("-all-root\t\tmake all files owned by root\n"); + ERROR("-root-mode <mode>\tset root directory permissions to octal <mode>\n"); + ERROR("-force-uid <uid>\tset all file uids to <uid>\n"); +-- +2.30.0 + |