From 6b8a26e2a91661b74c4082dcc0d43de60b121803 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 2 Jul 2009 23:52:49 +0200 Subject: [PATCH] installer: Move the 'chflags nohistory ...' commands behind the cpdups. This works around the issue that cpdup resets the flags if changed before. Reported-by: corecode Dragonfly-bug: --- usr.sbin/installer/dfuibe_installer/fn_install.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/usr.sbin/installer/dfuibe_installer/fn_install.c b/usr.sbin/installer/dfuibe_installer/fn_install.c index cbc31f0e02..a752549200 100644 --- a/usr.sbin/installer/dfuibe_installer/fn_install.c +++ b/usr.sbin/installer/dfuibe_installer/fn_install.c @@ -101,10 +101,6 @@ handle_pfs(struct i_fn_args *a, struct commands *cmds) a->os_root, dirname(pfs_mountpt[j]), basename(pfs_mountpt[j]), a->os_root, pfs_mountpt[j]); - if (pfs_nohistory[j] == 1) - command_add(cmds, "%s%s nohistory %smnt%s", - a->os_root, cmd_name(a, "CHFLAGS"), - a->os_root, pfs_mountpt[j]); } else { command_add(cmds, "%s%s pfs-master %smnt/pfs%s", a->os_root, cmd_name(a, "HAMMER"), @@ -630,6 +626,13 @@ fn_install_os(struct i_fn_args *a) slice_get_device_name(storage_get_selected_slice(a->s))); } + /* 'chflags nohistory' as needed */ + for (j = 0; pfs_mountpt[j] != NULL; j++) + if (pfs_nohistory[j] == 1) + command_add(cmds, "%s%s -R nohistory %smnt%s", + a->os_root, cmd_name(a, "CHFLAGS"), + a->os_root, pfs_mountpt[j]); + command_add(cmds, "%s%s %sinstall.log %smnt/var/log/install.log", a->os_root, cmd_name(a, "CP"), a->tmp, a->os_root); -- 2.41.0