Page MenuHomeFreeBSD
Files F115959150

D41893.id127598.diff
No OneTemporary
Actions

D41893.id127598.diff
View Options

Index: usr.sbin/freebsd-update/freebsd-update.sh
===================================================================
--- usr.sbin/freebsd-update/freebsd-update.sh
+++ usr.sbin/freebsd-update/freebsd-update.sh
@@ -2907,6 +2907,14 @@
sort -k 1,1 -t '|' $1 |
tr '|' ' ' |
while read FPATH TYPE OWNER GROUP PERM FLAGS HASH LINK; do
+ # A file may change to a directory on upgrade (PR273661).
+ # If that happens rm the file first so that install can create
+ # the directory in its place.
+ if [ -e "${BASEDIR}/${FPATH}" ]; then
+ if [ ${TYPE} = d ] && ! [ -d "${BASEDIR}/${FPATH}" ]; then
+ rm -f ${BASEDIR}/${FPATH}
+ fi
+ fi
case ${TYPE} in
d)
# Create a directory

File Metadata

Mime Type
text/plain
Expires
Thu, May 1, 9:50 PM (17 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17891375
Default Alt Text
D41893.id127598.diff (700 B)

Event Timeline