[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.97 and 1.98

version 1.97, 2017/12/11 00:52:41 version 1.98, 2017/12/11 01:35:44
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.96 2017/12/10 21:20:53 andrew Exp $  # $AFresh1: update_openbsd,v 1.97 2017/12/11 00:52:41 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 79 
Line 79 
         echo $_v          echo $_v
 }  }
   
 set_boot_partition() {  set_boot_device() {
         BOOT_PARTITION=$( df -nP /bsd | sed -ne 's! .*/$!!p' )          BOOT_DEVICE=$( df -nP /bsd | sed -ne 's! .*/$!!p' )
   
         root_disk=$( echo $BOOT_PARTITION |          root_disk=$( echo $BOOT_DEVICE |
             sed -e 's,/dev/\([a-z]*[0-9]\)[a-z].*,\1,' )              sed -e 's,/dev/\([a-z]*[0-9]\)[a-z].*,\1,' )
         msdos_partition=$(          msdos_partition=$(
             fdisk $root_disk | grep -q '^*.*FAT32' \              fdisk $root_disk | grep -q '^*.*FAT32' \
Line 91 
Line 91 
         )          )
   
         [ "$msdos_partition" ] &&          [ "$msdos_partition" ] &&
             BOOT_PARTITION="/dev/$root_disk$msdos_partition"              BOOT_DEVICE="/dev/$root_disk$msdos_partition"
 }  }
   
 set_version() {  set_version() {
Line 377 
Line 377 
   
     if [ ! "$_d" ]; then      if [ ! "$_d" ]; then
         boot_mount=$( mount |          boot_mount=$( mount |
             sed -ne "s!^$BOOT_PARTITION on \([^ ]*\).*!\1!p" )              sed -ne "s!^$BOOT_DEVICE on \([^ ]*\).*!\1!p" )
   
         local _ik="$INSTALL_KERNELS"          local _ik="$INSTALL_KERNELS"
         INSTALL_KERNELS="${BOOT_KERNEL#/} bsd.rd"          INSTALL_KERNELS="${BOOT_KERNEL#/} bsd.rd"
   
         if [ ! "$boot_mount" ]; then          if [ ! "$boot_mount" ]; then
                 mount $BOOT_PARTITION /mnt                  mount $BOOT_DEVICE /mnt
                 install_kernels /mnt/                  install_kernels /mnt/
                 umount $BOOT_PARTITION                  umount $BOOT_DEVICE
         elif [ "$boot_mount" != "$default_mount" ]; then          elif [ "$boot_mount" != "$default_mount" ]; then
                 install_kernels $boot_mount/                  install_kernels $boot_mount/
         fi          fi
Line 567 
Line 567 
 export PKG_PATH TRUSTED_PKG_PATH  export PKG_PATH TRUSTED_PKG_PATH
   
 set_version  set_version
 [ -z "$BOOT_PARTITION" ] && set_boot_partition  [ -z "$BOOT_DEVICE" ] && set_boot_device
   
 TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all}  TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all}
 if [ "$FORCE_DIR" = "No" ]; then  if [ "$FORCE_DIR" = "No" ]; then
Line 592 
Line 592 
 echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"  echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"
 echo "      RELEASEDIR: $RELEASEDIR"  echo "      RELEASEDIR: $RELEASEDIR"
 echo "         DESTDIR: $DESTDIR"  echo "         DESTDIR: $DESTDIR"
 echo "  BOOT_PARTITION: $BOOT_PARTITION"  echo "     BOOT_DEVICE: $BOOT_DEVICE"
 echo "     BOOT_KERNEL: $BOOT_KERNEL"  echo "     BOOT_KERNEL: $BOOT_KERNEL"
 echo " INSTALL_KERNELS: $INSTALL_KERNELS"  echo " INSTALL_KERNELS: $INSTALL_KERNELS"
 echo "  INSTALLED_SETS: $INSTALLED_SETS"  echo "  INSTALLED_SETS: $INSTALLED_SETS"
Legend:
Removed from v.1.97  
changed lines
  Added in v.1.98
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>