diff options
| author | ru <ru@FreeBSD.org> | 2003-08-07 19:12:06 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-08-07 19:12:06 +0000 |
| commit | afffda66089a716ac0541118548cfd843f4a887b (patch) | |
| tree | 5af79bebe699a1a1fd036dcfc6cdc1bd2463958d | |
| parent | fd49816cd7fc9272c7927b2ae400d95498c07b00 (diff) | |
| download | FreeBSD-src-afffda66089a716ac0541118548cfd843f4a887b.zip FreeBSD-src-afffda66089a716ac0541118548cfd843f4a887b.tar.gz | |
Fix logic in Makefile.i386,v 1.249: only back up ${DESTDIR}${KODIR}
to ${DESTDIR}${KODIR}.old if we have booted from ${DESTDIR}${KODIR},
and always keep kern.bootfile in a good shape.
| -rw-r--r-- | sys/conf/kern.post.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 0ad5c71..2ded9f0 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -178,7 +178,7 @@ kernel-install: fi .if exists(${DESTDIR}${KODIR}) -thiskernel=`sysctl -n kern.bootfile` ; \ - if [ "$$thiskernel" = ${DESTDIR}${KODIR}.old/${KERNEL_KO} ] ; then \ + if [ "`dirname "$$thiskernel"`" != ${DESTDIR}${KODIR} ] ; then \ chflags -R noschg ${DESTDIR}${KODIR} ; \ rm -rf ${DESTDIR}${KODIR} ; \ else \ @@ -187,9 +187,7 @@ kernel-install: rm -rf ${DESTDIR}${KODIR}.old ; \ fi ; \ mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \ - if [ "$$thiskernel" = ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ - sysctl kern.bootfile=${DESTDIR}${KODIR}.old/${KERNEL_KO} ; \ - fi; \ + sysctl kern.bootfile=${DESTDIR}${KODIR}.old/"`basename "$$thiskernel"`" ; \ fi .endif mkdir -p ${DESTDIR}${KODIR} |
