diff options
| author | Albert Martin <albertmartin@google.com> | 2022-08-05 20:57:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-08-05 20:57:02 +0000 |
| commit | 95f121a817877701994489e86e66eee1ded511f4 (patch) | |
| tree | 2bfe188ee6c5ff1e112478f4bda2b4d8dea25b19 | |
| parent | f5da2e047cf7e80e542c5a26614e27e753bd4426 (diff) | |
| parent | 9f974da1a6ed02c9f37950b69f85ab5226810bc5 (diff) | |
| download | e2fsprogs-95f121a817877701994489e86e66eee1ded511f4.tar.gz | |
Merge "resize2fs: fix to respect the environment variable E2FSPROGS_FAKE_TIME"
| -rw-r--r-- | resize/resize2fs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/resize/resize2fs.c b/resize/resize2fs.c index a0d08e5b..b7967cf2 100644 --- a/resize/resize2fs.c +++ b/resize/resize2fs.c @@ -2173,7 +2173,8 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs) if (inode->i_flags & EXT4_EA_INODE_FL) update_ea_inode_refs = 1; else - inode->i_ctime = time(0); + inode->i_ctime = rfs->old_fs->now ? + rfs->old_fs->now : time(0); retval = ext2fs_write_inode_full(rfs->old_fs, new_inode, inode, inode_size); @@ -2326,7 +2327,8 @@ static int check_and_change_inodes(ext2_ino_t dir, /* Update the directory mtime and ctime */ retval = ext2fs_read_inode(is->rfs->old_fs, dir, &inode); if (retval == 0) { - inode.i_mtime = inode.i_ctime = time(0); + inode.i_mtime = inode.i_ctime = is->rfs->old_fs->now ? + is->rfs->old_fs->now : time(0); is->err = ext2fs_write_inode(is->rfs->old_fs, dir, &inode); if (is->err) return ret | DIRENT_ABORT; |