[arch-dev-public] [arch-commits] Commit in util-linux/trunk (PKGBUILD util-linux.install)

[Allan McRae]

On 12/07/12 08:11, Tom Gundersen wrote:
>     Date: Wednesday, July 11, 2012 @ 18:11:46
>   Author: tomegun
> Revision: 163378
> 
> upgpkg: util-linux 2.21.2-4
> 
> move adjtime from /var to /etc
> 
> This will allow some cleanup of initscripts, and is assumed by systemd already.
> 
> Added:
>   util-linux/trunk/util-linux.install
> Modified:
>   util-linux/trunk/PKGBUILD
> 
> --------------------+
>  PKGBUILD           |    1 +
>  util-linux.install |    8 ++++++++
>  2 files changed, 9 insertions(+)
> 
> Modified: PKGBUILD
> ===================================================================
> --- PKGBUILD	2012-07-11 22:11:15 UTC (rev 163377)
> +++ PKGBUILD	2012-07-11 22:11:46 UTC (rev 163378)
> @@ -18,6 +18,7 @@
>          pam-login
>          pam-common)
>  backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login)
> +install=util-linux.install
>  
>  build() {
>    cd "${srcdir}/${pkgname}-${pkgver}"
> 
> Added: util-linux.install
> ===================================================================
> --- util-linux.install	                        (rev 0)
> +++ util-linux.install	2012-07-11 22:11:46 UTC (rev 163378)
> @@ -0,0 +1,8 @@
> +post_upgrade() {
> +  if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then
> +    if [ -f /var/lib/hwclock/adjtime ]; then
> +      mv /var/lib/hwclock/adjtime /etc/adjtime
> +    fi
> +    rmdir /var/lib/hwclock

I have seen this not removed because it was not there in chroots.  Not
sure if it can happen on a real system...  but if so, it needs an "if [[
-d ..."

> +  fi
> +}
> 
> 
>