diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-07-31 11:26:59 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-07-31 11:26:59 +0000 |
| commit | c0a8ad9b4d0dc619b0a1fa0b99ccb2bee7be70fe (patch) | |
| tree | ecd4107710aa35863a0dc166bc19405a08ee0428 | |
| parent | dd6fa0794461e2eb525eca612bca228bab1902e5 (diff) | |
Remove the sysmerge(8) glue from the installer -- it's never been used
and something else is in the work.
ok halex@ sthen@ deraadt@ kettenis@ phessler@
| -rw-r--r-- | distrib/miniroot/install.sub | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index fb97f481149..9d44b0bbb58 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.682 2013/07/21 22:06:51 halex Exp $ +# $OpenBSD: install.sub,v 1.683 2013/07/31 11:26:58 ajacoutot Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1130,16 +1130,6 @@ install_files() { DEFAULTSETS=$(rmel $_f $DEFAULTSETS) GOTSETS="$GOTSETS $_f" fi - - # get sets and save arguments for sysmerge(8) - [[ $_f == base$VERSION.tgz ]] && - ftp -Vmo /mnt/tmp/etc$VERSION.tgz \ - "$_src/etc$VERSION.tgz" >/dev/null 2>&1 && - SM_ARGS="-s /tmp/etc$VERSION.tgz" - [[ $_f == xbase$VERSION.tgz ]] && - ftp -Vmo /mnt/tmp/xetc$VERSION.tgz \ - "$_src/xetc$VERSION.tgz" >/dev/null 2>&1 && - SM_ARGSX="-x /tmp/xetc$VERSION.tgz" done } @@ -1579,16 +1569,6 @@ install_sets() { done } -run_sysmerge() { - echo "After rebooting, run sysmerge(8) to update your /etc configuration." - #if [[ -n "$SM_ARGS" || -n "$SM_ARGSX" ]]; then - # ask_yn "Merge the new etc/xetc install sets using sysmerge(8)?" no - # if [[ $resp == y ]]; then - # /mnt/usr/sbin/chroot /mnt /usr/sbin/sysmerge $SM_ARGS $SM_ARGSX - # fi - #fi -} - update_firmware() { echo "/usr/sbin/fw_update -v" >> /mnt/etc/rc.firsttime } @@ -1932,7 +1912,8 @@ finish_up() { mv /mnt/bsd.mp /mnt/bsd fi - [[ "$MODE" == upgrade ]] && run_sysmerge + [[ "$MODE" == upgrade ]] && \ + echo "After rebooting, run sysmerge(8) to update your system configuration." update_firmware |