[BACK]Return to update_openbsd CVS log [TXT][DIR] Up to [local] / openbsd / update_openbsd

Diff for /openbsd/update_openbsd/update_openbsd between version 1.79 and 1.82

version 1.79, 2015/11/03 03:56:53 version 1.82, 2016/05/10 02:58:12
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.78 2015/10/11 23:35:14 andrew Exp $  # $AFresh1: update_openbsd,v 1.81 2015/11/27 22:39:14 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 471 
Line 471 
     local _v=$FILE_VER      local _v=$FILE_VER
     local _args=""      local _args=""
   
     if [ ! -e /usr/share/sysmerge/etc.tgz ]; then      if [ ! -e /var/sysmerge/etc.tgz ]; then
         if [ X"" == X"$RELEASEDIR" ]; then          if [ X"" == X"$RELEASEDIR" ]; then
             echo "ERROR: no source for etc!" >&2              echo "ERROR: no source for etc!" >&2
             exit 1              exit 1
Line 611 
Line 611 
     fi      fi
     update_etc      update_etc
   
     OPENUP=$( which openup )      OPENUP=$( which openup 2>/dev/null )
     if [ -n "$OPENUP" ]; then      if [ -n "$OPENUP" ]; then
         echo "==> UPDATING WITH $OPENUP"          echo "==> UPDATING WITH $OPENUP"
         $OPENUP          $OPENUP
Line 624 
Line 624 
     fw_update      fw_update
   
 else  else
       grep -q $SYSMERGE /etc/rc.sysmerge ||
           echo "$SYSMERGE -b" >>/etc/rc.sysmerge &&
           echo "==> RUNNING $SYSMERGE -b ON REBOOT"
   
     echo Instructions for updating to the new version available from      echo Instructions for updating to the new version available from
     if [ X"snapshots" == X"$FORCE_DIR" ]; then      if [ X"snapshots" == X"$FORCE_DIR" ]; then
         echo "  http://www.openbsd.org/faq/current.html"          echo "  http://www.openbsd.org/faq/current.html"

Legend:
Removed from v.1.79  
changed lines
  Added in v.1.82

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>