pyrox.dev
make-ext4-fs: Fix modification timestamps in image
Use '-f' to make timestamp calls to always return the same time. Also
Nix uses the timestamp of '1' instead of epoch directly.
+2
-2
nixos/lib/make-ext4-fs.nix
+2
-2
nixos/lib/make-ext4-fs.nix
···
33
33
echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)"
34
34
35
35
truncate -s $bytes $out
36
-
faketime "1970-01-01 00:00:00" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out
36
+
faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out
37
37
38
38
# Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs.
39
39
# For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep:
···
76
76
77
77
echo sif $file gid 30000 # chgrp to nixbld
78
78
done
79
-
) | faketime "1970-01-01 00:00:00" debugfs -w $out -f /dev/stdin > errorlog 2>&1
79
+
) | faketime -f "1970-01-01 00:00:01" debugfs -w $out -f /dev/stdin > errorlog 2>&1
80
80
81
81
# The debugfs tool doesn't terminate on error nor exit with a non-zero status. Check manually.
82
82
if egrep -q 'Could not allocate|File not found' errorlog; then