From owner-freebsd-bugs@FreeBSD.ORG Mon Nov 26 08:20:00 2012 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A3D49231 for ; Mon, 26 Nov 2012 08:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 7A01E8FC17 for ; Mon, 26 Nov 2012 08:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQ8K0gY011314 for ; Mon, 26 Nov 2012 08:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qAQ8K060011313; Mon, 26 Nov 2012 08:20:00 GMT (envelope-from gnats) Resent-Date: Mon, 26 Nov 2012 08:20:00 GMT Resent-Message-Id: <201211260820.qAQ8K060011313@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Garrett Cooper Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 32C00E70 for ; Mon, 26 Nov 2012 08:12:55 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 19F308FC08 for ; Mon, 26 Nov 2012 08:12:55 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQ8CsBS059796 for ; Mon, 26 Nov 2012 08:12:54 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qAQ8CsYf059795; Mon, 26 Nov 2012 08:12:54 GMT (envelope-from nobody) Message-Id: <201211260812.qAQ8CsYf059795@red.freebsd.org> Date: Mon, 26 Nov 2012 08:12:54 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: bin/173931: [patch] make pc-sysinstall optional X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2012 08:20:00 -0000 >Number: 173931 >Category: bin >Synopsis: [patch] make pc-sysinstall optional >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Nov 26 08:20:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: 9-STABLE >Organization: EMC Isilon >Environment: FreeBSD bayonetta.local 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240836M: Sat Sep 22 12:30:11 PDT 2012 gcooper@bayonetta.local:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA amd64 >Description: The attached patch makes pc-sysinstall optional via the option, WITH[OUT]_PC_SYSINSTALL and adds the required metadata to delete the scripts via make-delete-old. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: share/mk/bsd.own.mk =================================================================== --- share/mk/bsd.own.mk (revision 242903) +++ share/mk/bsd.own.mk (working copy) @@ -386,6 +386,7 @@ OPENSSH \ OPENSSL \ PAM \ + PC_SYSINSTALL \ PF \ PKGBOOTSTRAP \ PKGTOOLS \ Index: tools/build/mk/OptionalObsoleteFiles.inc =================================================================== --- tools/build/mk/OptionalObsoleteFiles.inc (revision 242903) +++ tools/build/mk/OptionalObsoleteFiles.inc (working copy) @@ -3649,6 +3649,95 @@ # to be filled in #.endif +.if ${MK_PC_SYSINSTALL} == no +# backend-partmanager +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-partmanager/create-part.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-partmanager/delete-part.sh +# backend-query +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/detect-emulation.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/detect-laptop.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/detect-nics.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/disk-info.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/disk-list.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/disk-part.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/enable-net.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/get-packages.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/list-components.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/list-config.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/list-mirrors.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/list-packages.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/list-rsync-backups.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/list-tzones.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/query-langs.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/send-logs.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/setup-ssh-keys.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/set-mirror.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/sys-mem.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/test-live.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/test-netup.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/update-part-list.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/xkeyboard-layouts.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/xkeyboard-models.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend-query/xkeyboard-variants.sh +# backend +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-bsdlabel.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-cleanup.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-disk.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-extractimage.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-ftp.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-installcomponents.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-installpackages.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-localize.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-mountdisk.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-mountoptical.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-networking.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-newfs.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-parse.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-packages.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-runcommands.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-unmount.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-upgrade.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions-users.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/functions.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/installimage.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/parseconfig.sh +OLD_FILES+=${SHAREDIR}/pc-sysinstall/backend/startautoinstall.sh +# conf +OLD_FILES+=${SHAREDIR}/pc-sysinstall/conf/avail-langs +OLD_FILES+=${SHAREDIR}/pc-sysinstall/conf/exclude-from-upgrade +OLD_FILES+=${SHAREDIR}/pc-sysinstall/conf/license/bsd-en.txt +OLD_FILES+=${SHAREDIR}/pc-sysinstall/conf/license/intel-en.txt +OLD_FILES+=${SHAREDIR}/pc-sysinstall/conf/license/nvidia-en.txt +OLD_FILES+=${SHAREDIR}/pc-sysinstall/conf/pc-sysinstall.conf +# doc +OLD_FILES+=${SHAREDIR}/pc-sysinstall/doc/help-disk-list +OLD_FILES+=${SHAREDIR}/pc-sysinstall/doc/help-disk-size +OLD_FILES+=${SHAREDIR}/pc-sysinstall/doc/help-index +OLD_FILES+=${SHAREDIR}/pc-sysinstall/doc/help-start-autoinstall +# examples +OLD_FILES+=${SHAREDIR}/examples/pc-sysinstall/README +OLD_FILES+=${SHAREDIR}/examples/pc-sysinstall/pc-autoinstall.conf +OLD_FILES+=${SHAREDIR}/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall +OLD_FILES+=${SHAREDIR}/examples/pc-sysinstall/pcinstall.cfg.geli +OLD_FILES+=${SHAREDIR}/examples/pc-sysinstall/pcinstall.cfg.gmirror +OLD_FILES+=${SHAREDIR}/examples/pc-sysinstall/pcinstall.cfg.netinstall +OLD_FILES+=${SHAREDIR}/examples/pc-sysinstall/pcinstall.cfg.restore +OLD_FILES+=${SHAREDIR}/examples/pc-sysinstall/pcinstall.cfg.rsync +OLD_FILES+=${SHAREDIR}/examples/pc-sysinstall/pcinstall.cfg.upgrade +OLD_FILES+=${SHAREDIR}/examples/pc-sysinstall/pcinstall.cfg.zfs +# pc-sysinstall +OLD_FILES+=usr/sbin/pc-sysinstall +OLD_FILES+=${MANDIR}8/pc-sysinstall.8.gz +OLD_DIRS+=${SHAREDIR}/pc-sysinstall/backend +OLD_DIRS+=${SHAREDIR}/pc-sysinstall/backend-partmanager +OLD_DIRS+=${SHAREDIR}/pc-sysinstall/backend-query +OLD_DIRS+=${SHAREDIR}/pc-sysinstall/conf/license +OLD_DIRS+=${SHAREDIR}/pc-sysinstall/conf +OLD_DIRS+=${SHAREDIR}/pc-sysinstall/doc +OLD_DIRS+=${SHAREDIR}/pc-sysinstall +OLD_DIRS+=${SHAREDIR}/examples/pc-sysinstall +.endif + .if ${MK_PF} == no OLD_FILES+=etc/periodic/security/520.pfdenied OLD_FILES+=etc/pf.os Index: tools/build/options/WITHOUT_PC_SYSINSTALL =================================================================== --- tools/build/options/WITHOUT_PC_SYSINSTALL (revision 0) +++ tools/build/options/WITHOUT_PC_SYSINSTALL (working copy) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr pc-sysinstall 8 +and related programs. Index: usr.sbin/Makefile =================================================================== --- usr.sbin/Makefile (revision 242903) +++ usr.sbin/Makefile (working copy) @@ -56,7 +56,7 @@ nfsrevoke \ nfsuserd \ nologin \ - pc-sysinstall \ + ${_pc_sysinstall} \ pciconf \ periodic \ powerd \ @@ -261,6 +261,10 @@ SUBDIR+= keyserv .endif +.if ${MK_PC_SYSINSTALL} != "no" +_pc_sysinstall= pc-sysinstall +.endif + .if ${MK_PF} != "no" SUBDIR+= ftp-proxy .endif >Release-Note: >Audit-Trail: >Unformatted: