diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-06-23 21:43:20 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-06-23 21:43:20 +0000 |
| commit | 21922ab8d0860ad9ed70dc951d3ad2b304597347 (patch) | |
| tree | e75dbda18277c07b22754124f42507657cd1995b /distrib/miniroot | |
| parent | 53ef7adb09e85e0a785aef306986cfd841a1d78f (diff) | |
Add a set siteXY-<hostname>.tgz and make it selected by default. This
allows host specific files to be trivially installed and makes
creating/maintaining large numbers of host specific configurations
much simpler.
Suggested by work being done by Alex Holst, brought to my attention by
mk@ during c2k6.
Name format suggested by henning@, tweaked by deraadt@.
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sh | 4 | ||||
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index c155124af5f..e7ed797fd96 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.152 2005/04/21 21:41:33 krw Exp $ +# $OpenBSD: install.sh,v 1.153 2006/06/23 21:43:19 krw Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback @@ -320,6 +320,8 @@ mount_fs "-o async" # one. This preserves any existing domain information in the hostname. ask_until "\nSystem hostname? (short form, e.g. 'foo')" "$(hostname -s)" [[ ${resp%%.*} != $(hostname -s) ]] && hostname $resp +THESETS="$THESETS site$VERSION-$(hostname -s).tgz" +DEFAULTSETS="$DEFAULTSETS site$VERSION-$(hostname -s).tgz" # Remove existing network configuration files in /tmp to ensure they don't leak # onto the installed system in the case of a restarted install. Any information diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index 4fe23e6e1c5..e43b7ae6447 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: upgrade.sh,v 1.62 2005/10/12 02:48:49 krw Exp $ +# $OpenBSD: upgrade.sh,v 1.63 2006/06/23 21:43:19 krw Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback @@ -83,6 +83,8 @@ for _file in fstab hosts myname; do cp /mnt/etc/$_file /tmp/$_file done hostname $(stripcom /tmp/myname) +THESETS="$THESETS site$VERSION-$(hostname -s).tgz" +DEFAULTSETS="$DEFAULTSETS site$VERSION-$(hostname -s).tgz" ask_yn "Enable network using configuration stored on root filesystem?" yes [[ $resp == y ]] && enable_network |