[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.32 and 1.38

version 1.32, 2009/12/10 19:34:39 version 1.38, 2012/04/19 05:03:47
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $RedRiver: update_openbsd,v 1.31 2009/12/10 19:23:11 andrew Exp $  # $AFresh1: update_openbsd,v 1.37 2010/06/17 22:39:09 andrew Exp $
   
 installed_sets() {  installed_sets() {
     local misc=/usr/share/doc/README      local misc=/usr/share/doc/README
Line 24 
Line 24 
         fi          fi
     done      done
   
     sendmail -d0.1 -bt < /dev/null | grep -q SASL      sendmail -d0.1 --badoption </dev/null 2>/dev/null | grep -q SASL
     if [ $? == 0 ]; then      if [ $? == 0 ]; then
         echo -n ' sendmail-smtp_auth'          echo -n ' sendmail-smtp_auth'
     fi      fi
Line 193 
Line 193 
   
 follow_symlink () {  follow_symlink () {
     local _file=$1      local _file=$1
     local _next=$( file $_file |      # This could go circular, but I dunno how to fix that.
         grep 'symbolic link' |      if [ -h $_file ]; then
         sed -e s/^.*\\\`// -e s/\\\'\$// )          follow_symlink $( file $_file |
     if [ -h $_next ]; then              grep 'symbolic link' |
         follow_symlink $_next              sed -e s/^.*\\\`// -e s/\\\'\$// )
     else      else
         echo $_next          echo $_file
     fi      fi
 }  }
   
Line 335 
Line 335 
     done      done
   
     if [ ! -h /bsd ]; then      if [ ! -h /bsd ]; then
           cd /
         if [ -e /bsd.mp ]; then          if [ -e /bsd.mp ]; then
             echo linking /bsd.mp to /bsd              echo linking /bsd.mp to /bsd
             $SUDO ln -sf /bsd.mp /bsd              $SUDO ln -sf /bsd.mp bsd
         else          else
             echo linking /bsd.sp to /bsd              echo linking /bsd.sp to /bsd
             $SUDO ln -sf /bsd.sp /bsd              $SUDO ln -sf /bsd.sp bsd
         fi          fi
         if [ $? -ne 0 ]; then          if [ $? -ne 0 ]; then
             echo ERROR: Could not symlink new kernel! >&2              echo ERROR: Could not symlink new kernel! >&2
             exit 1              exit 1
         fi          fi
           cd $OLDPWD
     fi      fi
   
     if [ -z $_installed_new_bsd ]; then      if [ -z $_installed_new_bsd ]; then
Line 540 
Line 542 
   
 else  else
     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"
     else      else
         echo "  http://www.openbsd.org/faq/upgrade${FILE_VER}.html"          echo "  http://www.openbsd.org/faq/upgrade${FILE_VER}.html"
Legend:
Removed from v.1.32  
changed lines
  Added in v.1.38
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>