[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.107 and 1.110

version 1.107, 2018/02/08 18:46:46 version 1.110, 2018/10/01 00:31:27
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.106 2017/12/11 03:12:34 andrew Exp $  # $AFresh1: update_openbsd,v 1.109 2018/02/08 19:08:01 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 101 
Line 101 
 boot_device_mounted=""  boot_device_mounted=""
 mount_boot_device() {  mount_boot_device() {
     [ "$boot_device_mounted" ] && return      [ "$boot_device_mounted" ] && return
       [ "$BOOT_DEVICE" ] || return
   
     local default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )      local default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )
     local boot_mount=$( mount |      local boot_mount=$( mount |
Line 423 
Line 424 
   
   
 install_kernels() {  install_kernels() {
     local _d=$1      local _d="$1"
     local default_mount      local default_mount
     local boot_mount      local boot_mount
     local mount_is_msdos      local mount_is_msdos
   
     if [ ! "$_d" ]; then      if [ "$_d" ]; then
         _d=$( readlink -nf "$_d" )
       else
         default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )          default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )
         mount_boot_device          mount_boot_device
   
Line 455 
Line 458 
     fi      fi
   
     [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1      [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1
       [ $_d != / ] && $_d=$_d/
   
     if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then      if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
         echo "===> Backing up $BOOT_KERNEL to ${_d}obsd"          echo "===> Backing up $BOOT_KERNEL to ${_d}obsd"
Line 609 
Line 613 
     . ${HOME}/.update_openbsdrc      . ${HOME}/.update_openbsdrc
 fi  fi
   
 MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD}  MIRROR=${MIRROR:=http://cdn.openbsd.org/pub/OpenBSD}
 FTP_CMD=${FTP_CMD:=ftp -V}  FTP_CMD=${FTP_CMD:=ftp -V}
   
 DESTDIR=${DESTDIR:=/}  DESTDIR=${DESTDIR:=/}

Legend:
Removed from v.1.107  
changed lines
  Added in v.1.110

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