svn commit: r198351 - head/share/zoneinfo

[Ben Kaduk]

On Wed, Oct 21, 2009 at 4:59 PM, Edwin Groothuis <edwin at freebsd.org> wrote:
> Author: edwin
> Date: Wed Oct 21 20:59:12 2009
> New Revision: 198351
> URL: http://svn.freebsd.org/changeset/base/198351
>
> Log:
>  After the installation of the /usr/share/zoneinfo, run tzsetup if
>  /var/db/zoneinfo exists.
>
>  MFC after:    1 week
>
> Modified:
>  head/share/zoneinfo/Makefile
>
> Modified: head/share/zoneinfo/Makefile
> ==============================================================================
> --- head/share/zoneinfo/Makefile        Wed Oct 21 20:55:04 2009        (r198350)
> +++ head/share/zoneinfo/Makefile        Wed Oct 21 20:59:12 2009        (r198351)
> @@ -54,4 +54,24 @@ beforeinstall:
>        ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
>            ${.CURDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
>
> +afterinstall:
> +       @#
> +       @# If the file /var/db/zoneinfo exists, and it is owned by root:wheel,
> +       @# and the contents of it exists in /usr/share/zoneinfo, then reinstall
> +       @# it.
> +       @#
> +       @if [ -f ${DESTDIR}/var/db/zoneinfo -a -O ${DESTDIR}/var/db/zoneinfo \
> +           -a -G ${DESTDIR}/var/db/zoneinfo ]; then \
> +               zf=$$(cat ${DESTDIR}/var/db/zoneinfo); \
> +               if [ -f ${DESTDIR}/usr/share/zoneinfo/$${zf} ]; then \
> +                       if [ ! -z "${DESTDIR}" ]; then \
> +                               optC="-C ${DESTDIR}"; \
> +                       fi; \
> +                       echo "Updating /etc/localtime"; \
> +                       tzsetup ${optC} -r; \


This breaks installworld for me.  Replacing tzsetup with a hardcoded
/usr/sbin/tzsetup allowed installworld to finish.


The end of the installworld log is up at
http://stuff.mit.edu/afs/sipb.mit.edu/user/kaduk/freebsd/iw.txt


-Ben Kaduk


> +               fi; \
> +       else \
> +               echo "Run tzsetup(8) manually to update /etc/localtime."; \
> +       fi
> +
>  .include <bsd.prog.mk>
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"
>