View | Details | Raw Unified | Return to bug 198797 | Differences between
and this patch

Collapse All | Expand All

(-)usr.sbin/bsdinstall.new/scripts/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \
3
SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \
4
	 keymap mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 \
4
	 keymap mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 \
5
	 rootpass script services time umount wlanconfig zfsboot
5
	 rootpass script services time umount wlanconfig zfsboot bsdstats
6
BINDIR= /usr/libexec/bsdinstall
6
BINDIR= /usr/libexec/bsdinstall
7
7
8
MAN=
8
MAN=
(-)usr.sbin/bsdinstall.new/scripts/auto (-1 / +6 lines)
Lines 204-210 Link Here
204
		"Network" "Networking configuration" \
204
		"Network" "Networking configuration" \
205
		"Services" "Set daemons to run on startup" \
205
		"Services" "Set daemons to run on startup" \
206
		"Time Zone" "Set system timezone" \
206
		"Time Zone" "Set system timezone" \
207
		"Handbook" "Install FreeBSD Handbook (requires network)" 2>&1 1>&3)
207
		"Handbook" "Install FreeBSD Handbook (requires network)" \
208
		"BSDstats" "Install BSDstats to report system statistics" 2>&1 1>&3)
208
	exec 3>&-
209
	exec 3>&-
209
210
210
	case "$REVISIT" in
211
	case "$REVISIT" in
Lines 236-241 Link Here
236
		bsdinstall docsinstall
237
		bsdinstall docsinstall
237
		finalconfig
238
		finalconfig
238
		;;
239
		;;
240
	"BSDstats")
241
		bsdinstall bsdstats
242
		finalconfig
243
		;;
239
	esac
244
	esac
240
}
245
}
241
246
(-)usr.sbin/bsdinstall.new/scripts/bsdstats (+52 lines)
Line 0 Link Here
1
#!/bin/sh
2
#-
3
# Copyright (c) 2014 Yuri Victorovich
4
# All rights reserved.
5
#
6
# Redistribution and use in source and binary forms, with or without
7
# modification, are permitted provided that the following conditions
8
# are met:
9
# 1. Redistributions of source code must retain the above copyright
10
#    notice, this list of conditions and the following disclaimer.
11
# 2. Redistributions in binary form must reproduce the above copyright
12
#    notice, this list of conditions and the following disclaimer in the
13
#    documentation and/or other materials provided with the distribution.
14
#
15
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
16
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
18
# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25
# SUCH DAMAGE.
26
#
27
# $FreeBSD$
28
29
BSDCFG_SHARE="/usr/share/bsdconfig"
30
. $BSDCFG_SHARE/common.subr || exit 1
31
32
# Let pkg or port build process be able to use name servers
33
f_quietly cp -f $BSDINSTALL_TMPETC/resolv.conf $BSDINSTALL_CHROOT/etc/
34
35
echo ""
36
if [ -f $BSDINSTALL_CHROOT/usr/local/etc/periodic/monthly/300.statistics ]; then
37
	echo "BSDstats already installed"
38
elif [ -f $BSDINSTALL_CHROOT/usr/ports/sysutils/bsdstats/Makefile ]; then
39
	echo "Installing BSDstats from the port, this will take a while"
40
	# initialize the ldconfig hints, pkg build will need it
41
	[ -f $BSDINSTALL_CHROOT/var/run/ld-elf.so.hints ] ||
42
		f_quietly chroot $BSDINSTALL_CHROOT ldconfig /usr/lib /usr/lib/compat /usr/local/lib
43
	# build and install
44
	chroot $BSDINSTALL_CHROOT sh -c "(cd /usr/ports/sysutils/bsdstats && make install clean)" 2>&1
45
else
46
	echo "Installing BSDstats using the package"
47
	chroot $BSDINSTALL_CHROOT pkg install bsdstats 2>&1
48
fi
49
echo ""
50
51
# wait for user acknowledgement
52
read -p "Press any key..." key 2>&1

Return to bug 198797