diff options
| author | cperciva <cperciva@FreeBSD.org> | 2007-05-16 15:20:51 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2007-05-16 15:20:51 +0000 |
| commit | 48978a06b6fe9452d50438ecc2208d7cc7815d93 (patch) | |
| tree | 211541160635795b5146db37b1318b752efb6dce /usr.sbin/freebsd-update | |
| parent | bdc8f5bc7f73d6adf68c8dc4fe852d96521536ee (diff) | |
| download | FreeBSD-src-48978a06b6fe9452d50438ecc2208d7cc7815d93.zip FreeBSD-src-48978a06b6fe9452d50438ecc2208d7cc7815d93.tar.gz | |
Add some missing '${BASEDIR}/'s. Prior to this commit, FreeBSD Update
operating with the "-b basedir" option would not correctly update files
which had flags set or were hardlinked.
Submitted by: Karsten Schmidt
Pointy hat to: cperciva
MFC after: 1 week
Diffstat (limited to 'usr.sbin/freebsd-update')
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index faf8c33..552057e 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1710,11 +1710,11 @@ install_unschg () { # Remove flags while read F; do - if ! [ -e ${F} ]; then + if ! [ -e ${BASEDIR}/${F} ]; then continue fi - chflags noschg ${F} || return 1 + chflags noschg ${BASEDIR}/${F} || return 1 done < filelist # Clean up @@ -1743,7 +1743,7 @@ install_from_index () { rm ${HASH} else # Create a hard link. - ln -f ${LINK} ${BASEDIR}/${FPATH} + ln -f ${BASEDIR}/${LINK} ${BASEDIR}/${FPATH} fi ;; L) |
