From 8a71718789fb03e38b77cce54e88d2300b2f9f6a Mon Sep 17 00:00:00 2001 From: John Marino Date: Tue, 10 Mar 2015 15:08:52 +0100 Subject: [PATCH] make upgrade: Clear out installer files conditionally Installing DragonFly from an image installer will end up coping the installer itself to /usr/sbin. This is just cpdup doing what it's told. The other way these installers could get there is if it's intentionally built using the WANT_INSTALLER knob. So remove these files if the WANT_INSTALLER variable is not defined. suggested-by: swildner --- Makefile_upgrade.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 7ab2f3192c..6a7bc5f554 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2889,6 +2889,12 @@ TO_REMOVE+=/boot/kernel/ng_sync_ar.ko TO_REMOVE+=/boot/kernel/ng_sync_sr.ko .endif +.if !defined(WANT_INSTALLER) +TO_REMOVE+=/usr/sbin/dfuibe_installer +TO_REMOVE+=/usr/sbin/dfuife_curses +TO_REMOVE+=/usr/sbin/installer +.endif + # XXX Remove when pfsync(4) has been fixed TO_REMOVE+=/usr/share/man/cat4/pfsync.4.gz TO_REMOVE+=/usr/share/man/man4/pfsync.4.gz -- 2.41.0