aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Whitehorn <nwhitehorn@FreeBSD.org>2021-03-22 14:08:55 +0000
committerNathan Whitehorn <nwhitehorn@FreeBSD.org>2021-04-12 13:58:49 +0000
commitc87050f027a4e1ebad365222ab3eb4969806a7db (patch)
tree659bf29e34693b9d7438c2a99461ac1d71de76f6
parente37df024e090daa1c3bf450b406cff4995f2401f (diff)
downloadsrc-c87050f027a4e1ebad365222ab3eb4969806a7db.tar.gz
src-c87050f027a4e1ebad365222ab3eb4969806a7db.zip
Improve example install scripts, making them simpler and more robust.
In particular: - There is no need to do anything with gpart (the installer does that for you). - There is no need to specify the network interface, since we have an option for defaults. (cherry picked from commit f91026bf462f9a636735cafafd29a1232b2a525b)
-rw-r--r--usr.sbin/bsdinstall/bsdinstall.85
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8
index ba261ce7301d..53bf25b3b070 100644
--- a/usr.sbin/bsdinstall/bsdinstall.8
+++ b/usr.sbin/bsdinstall/bsdinstall.8
@@ -458,8 +458,7 @@ PARTITIONS=ada0
DISTRIBUTIONS="kernel.txz base.txz"
#!/bin/sh
-gpart bootcode -b /boot/pmbr -p /boot/gptboot -i 1 ada0
-sysrc ifconfig_em0=DHCP
+sysrc ifconfig_DEFAULT=DHCP
sysrc sshd_enable=YES
pkg install puppet
.Ed
@@ -472,7 +471,7 @@ export ZFSBOOT_DISKS=ada0
export nonInteractive="YES"
#!/bin/sh
-echo "ifconfig_em0=DHCP" >> /etc/rc.conf
+echo "ifconfig_DEFAULT=DHCP" >> /etc/rc.conf
echo "sshd_enable=YES" >> /etc/rc.conf
pkg install puppet
.Ed