diff options
| author | delphij <delphij@FreeBSD.org> | 2015-06-29 18:44:15 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-06-29 18:44:15 +0000 |
| commit | affd7b417626ccb8d0ffe4f888fd323d856e594c (patch) | |
| tree | d1298a68bf6f0710b07e904ddcc328b270655e80 /usr.sbin | |
| parent | 1dfaa82c6ba618bc42304795b4fd4588a8f5c6dd (diff) | |
| download | FreeBSD-src-affd7b417626ccb8d0ffe4f888fd323d856e594c.zip FreeBSD-src-affd7b417626ccb8d0ffe4f888fd323d856e594c.tar.gz | |
MFC r284425:
Skip src component if /usr/src is empty.
Submitted by: kczekirda
Reviewed by: cperciva, delphij, nwhitehorn, allanjude
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 5a66f0a..47588a1 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -216,7 +216,15 @@ config_KeepModifiedMetadata () { # Add to the list of components which should be kept updated. config_Components () { for C in $@; do - COMPONENTS="${COMPONENTS} ${C}" + if [ "$C" = "src" ]; then + if [ -e /usr/src/COPYRIGHT ]; then + COMPONENTS="${COMPONENTS} ${C}" + else + echo "src component not installed, skipped" + fi + else + COMPONENTS="${COMPONENTS} ${C}" + fi done } @@ -2634,10 +2642,10 @@ install_unschg () { while read F; do if ! [ -e ${BASEDIR}/${F} ]; then continue + else + echo ${BASEDIR}/${F} fi - - chflags noschg ${BASEDIR}/${F} || return 1 - done < filelist + done < filelist | xargs chflags noschg || return 1 # Clean up rm filelist |
