From 6ce8a39dbbb92ac7d400eaaa853f054e4ad5d0bd Mon Sep 17 00:00:00 2001 From: dteske Date: Tue, 3 Nov 2015 21:19:46 +0000 Subject: Fix typo in error message Differential Revision: https://reviews.freebsd.org/D3997 Submitted by: git_johnko.ca (John Ko) MFC after: 3 days X-MFC-to: stable/10 stable/9 --- usr.sbin/bsdinstall/distfetch/distfetch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr.sbin/bsdinstall') diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdinstall/distfetch/distfetch.c index 4e870c8..219847d 100644 --- a/usr.sbin/bsdinstall/distfetch/distfetch.c +++ b/usr.sbin/bsdinstall/distfetch/distfetch.c @@ -78,7 +78,7 @@ main(void) if (chdir(getenv("BSDINSTALL_DISTDIR")) != 0) { snprintf(error, sizeof(error), - "Could could change to directory %s: %s\n", + "Could not change to directory %s: %s\n", getenv("BSDINSTALL_DISTDIR"), strerror(errno)); dialog_msgbox("Error", error, 0, 0, TRUE); end_dialog(); -- cgit v1.1 From 104fd14e87864e72dd527dd579a126156588b9cc Mon Sep 17 00:00:00 2001 From: bdrewery Date: Thu, 26 Nov 2015 01:14:40 +0000 Subject: Use LIBEXECDIR for /usr/libexec. MFC after: 1 week Sponsored by: EMC / Isilon Storage Division --- usr.sbin/bsdinstall/distextract/Makefile | 2 +- usr.sbin/bsdinstall/distfetch/Makefile | 2 +- usr.sbin/bsdinstall/partedit/Makefile | 2 +- usr.sbin/bsdinstall/scripts/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'usr.sbin/bsdinstall') diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile index 313ec00..d3008f6 100644 --- a/usr.sbin/bsdinstall/distextract/Makefile +++ b/usr.sbin/bsdinstall/distextract/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distextract LIBADD= archive dpv figpar ncursesw dialog m diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile index 5c0f6e8..1620c9b 100644 --- a/usr.sbin/bsdinstall/distfetch/Makefile +++ b/usr.sbin/bsdinstall/distfetch/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distfetch LIBADD= fetch ncursesw dialog m diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile index d48f777..21d842e 100644 --- a/usr.sbin/bsdinstall/partedit/Makefile +++ b/usr.sbin/bsdinstall/partedit/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile index efe9700..c0d6ac2 100644 --- a/usr.sbin/bsdinstall/scripts/Makefile +++ b/usr.sbin/bsdinstall/scripts/Makefile @@ -3,7 +3,7 @@ SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \ keymap mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 \ rootpass script services time umount wlanconfig zfsboot -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall MAN= -- cgit v1.1 From 89ed7c325f5da55542cc3e261954ed9be69622d1 Mon Sep 17 00:00:00 2001 From: nwhitehorn Date: Sun, 6 Dec 2015 00:20:45 +0000 Subject: Adapt to new wireless scheme where base wlan interfaces do not show up in ifconfig anymore. --- usr.sbin/bsdinstall/scripts/netconfig | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'usr.sbin/bsdinstall') diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig index d5a14ce..f9913c3 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig +++ b/usr.sbin/bsdinstall/scripts/netconfig @@ -41,19 +41,24 @@ DIALOG_TAGS="" : ${DIALOG_ITEM_HELP=4} : ${DIALOG_ESC=255} -# Do a dirty check to see if this a wireless interface -- there should be a -# better way -is_wireless_if() { - ifconfig $1 | grep -q 'media: IEEE 802.11 Wireless' -} - for IF in `ifconfig -l`; do test "$IF" = "lo0" && continue (ifconfig -g wlan | egrep -wq $IF) && continue INTERFACES="$INTERFACES $IF" +done + +INTERFACES="$INTERFACES $(sysctl -in net.wlan.devices)" +is_wireless_if() { + for IF in $(sysctl -in net.wlan.devices); do + if [ $IF = $1 ]; then + return 0 + fi + done + return 1 +} + +for IF in $INTERFACES; do DESC=`sysctl -n dev.$(echo $IF | sed -E 's/([[:alpha:]]*)([[:digit:]]*)/\1.\2/g').%desc` - is_wireless_if $IF && echo $DESC | - grep -iqv wireless && DESC="Wireless $DESC" DIALOG_TAGS="$DIALOG_TAGS $IF \"$DESC\"" done -- cgit v1.1 From bd647f05b431df82cb8b33b8890e68a7e46c1c33 Mon Sep 17 00:00:00 2001 From: dteske Date: Mon, 28 Dec 2015 17:27:20 +0000 Subject: Explicitly set permissions on entropy files Differential Revision: https://reviews.freebsd.org/D3933 Submitted by: jmg Reviewed by: delphij, markm Approved by: secteam (delphij) MFC after: 3 days X-MFC-to: stable/10 stable/9 --- usr.sbin/bsdinstall/scripts/entropy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'usr.sbin/bsdinstall') diff --git a/usr.sbin/bsdinstall/scripts/entropy b/usr.sbin/bsdinstall/scripts/entropy index add6f30..d3938f1 100755 --- a/usr.sbin/bsdinstall/scripts/entropy +++ b/usr.sbin/bsdinstall/scripts/entropy @@ -26,4 +26,9 @@ # # $FreeBSD$ -dd if=/dev/random of=$BSDINSTALL_CHROOT/entropy bs=4096 count=1 +umask 077 +for i in /entropy /boot/entropy; do + i="$BSDINSTALL_CHROOT/$i" + dd if=/dev/random of="$i" bs=4096 count=1 + chown 0:0 "$i" +done -- cgit v1.1