[26684] in Source-Commits
Re: /svn/athena r25690 - in trunk/debathena/config:
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Thu Aug 2 19:00:18 2012
Date: Thu, 2 Aug 2012 19:00:15 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201208022113.q72LDVmS018922@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1208021900120.22690@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK.
-Ben
On Thu, 2 Aug 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-08-02 17:13:31 -0400 (Thu, 02 Aug 2012)
> New Revision: 25690
>
> Added:
> trunk/debathena/config/athinfod-cluster-config/debian/debathena-athinfod-cluster-config.defs
> trunk/debathena/config/auto-update/debian/debathena-auto-update.defs
> Removed:
> trunk/debathena/config/athinfod-cluster-config/debian/transform_athinfo.defs.debathena
> Modified:
> trunk/debathena/config/athinfod-cluster-config/debian/changelog
> trunk/debathena/config/athinfod-cluster-config/debian/control.in
> trunk/debathena/config/athinfod-cluster-config/debian/debathena-athinfod-cluster-config.install
> trunk/debathena/config/athinfod-cluster-config/debian/rules
> trunk/debathena/config/auto-update/debian/changelog
> trunk/debathena/config/auto-update/debian/control.in
> trunk/debathena/config/auto-update/debian/debathena-auto-update.install
> Log:
> In athinfod-cluster-config:
> * Depend on new athinfod with query snippet support and stop diverting
> the conffile
> * Bump Standards-Version
> In auto-update:
> * Depend on the new athinfod with query snippet support and add some
> queries ourselves
> * Separate out the update-schedule from the upgrade-schedule when
> querying via athinfo
>
>
> Modified: trunk/debathena/config/athinfod-cluster-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/athinfod-cluster-config/debian/changelog 2012-08-02 21:01:42 UTC (rev 25689)
> +++ trunk/debathena/config/athinfod-cluster-config/debian/changelog 2012-08-02 21:13:31 UTC (rev 25690)
> @@ -1,8 +1,11 @@
> -debathena-athinfod-cluster-config (1.6) UNRELEASED; urgency=low
> +debathena-athinfod-cluster-config (1.6) unstable; urgency=low
>
> * Bump debian/compat to 6
> + * Depend on new athinfod with query snippet support and stop diverting
> + the conffile
> + * Bump Standards-Version
>
> - -- Jonathan Reed <jdreed@mit.edu> Sun, 01 Jul 2012 12:21:39 -0400
> + -- Jonathan Reed <jdreed@mit.edu> Thu, 02 Aug 2012 17:10:25 -0400
>
> debathena-athinfod-cluster-config (1.5) unstable; urgency=low
>
>
> Modified: trunk/debathena/config/athinfod-cluster-config/debian/control.in
> ===================================================================
> --- trunk/debathena/config/athinfod-cluster-config/debian/control.in 2012-08-02 21:01:42 UTC (rev 25689)
> +++ trunk/debathena/config/athinfod-cluster-config/debian/control.in 2012-08-02 21:13:31 UTC (rev 25690)
> @@ -3,11 +3,11 @@
> Priority: extra
> Maintainer: Debathena Project <debathena@mit.edu>
> Build-Depends: @cdbs@, debathena-athinfod
> -Standards-Version: 3.8.4
> +Standards-Version: 3.9.1
>
> Package: debathena-athinfod-cluster-config
> Architecture: all
> -Depends: debathena-athinfod (>= 10.0.0-0debathena16~), debathena-machtype, python-usb, ${misc:Depends}
> +Depends: debathena-athinfod (>= 10.1-0debathena1~), debathena-machtype, python-usb, ${misc:Depends}
> Provides: ${diverted-files}
> Conflicts: ${diverted-files}
> Description: Athinfod configuration for Debathena
>
> Copied: trunk/debathena/config/athinfod-cluster-config/debian/debathena-athinfod-cluster-config.defs (from rev 25590, trunk/debathena/config/athinfod-cluster-config/debian/transform_athinfo.defs.debathena)
> ===================================================================
> --- trunk/debathena/config/athinfod-cluster-config/debian/debathena-athinfod-cluster-config.defs (rev 0)
> +++ trunk/debathena/config/athinfod-cluster-config/debian/debathena-athinfod-cluster-config.defs 2012-08-02 21:13:31 UTC (rev 25690)
> @@ -0,0 +1,8 @@
> +# Added by debathena-athinfod-cluster-config
> +update.log /usr/lib/athinfod/is_cluster && cat /var/log/athena-update
> +upgrade.log /usr/lib/athinfod/is_cluster && cat /var/log/athena-upgrade
> +in-use /usr/lib/athinfod/is_cluster && (test `pgrep -c larvnet-wrapper` -gt 0 && echo "yes" || echo "no") || echo "n/a"
> +install.log /usr/lib/athinfod/is_cluster && cat /var/log/athena-install.log
> +usb-hid /usr/share/debathena-athinfod-cluster-config/usb-hid.py
> +lsusb /usr/lib/athinfod/is_cluster && lsusb
> +dmesg /usr/lib/athinfod/is_cluster && dmesg
>
> Modified: trunk/debathena/config/athinfod-cluster-config/debian/debathena-athinfod-cluster-config.install
> ===================================================================
> --- trunk/debathena/config/athinfod-cluster-config/debian/debathena-athinfod-cluster-config.install 2012-08-02 21:01:42 UTC (rev 25689)
> +++ trunk/debathena/config/athinfod-cluster-config/debian/debathena-athinfod-cluster-config.install 2012-08-02 21:13:31 UTC (rev 25690)
> @@ -1 +1,2 @@
> debian/usb-hid.py usr/share/debathena-athinfod-cluster-config
> +debian/debathena-athinfod-cluster-config.defs etc/athena/athinfo.defs.d
>
> Modified: trunk/debathena/config/athinfod-cluster-config/debian/rules
> ===================================================================
> --- trunk/debathena/config/athinfod-cluster-config/debian/rules 2012-08-02 21:01:42 UTC (rev 25689)
> +++ trunk/debathena/config/athinfod-cluster-config/debian/rules 2012-08-02 21:13:31 UTC (rev 25690)
> @@ -1,7 +1,7 @@
> #!/usr/bin/make -f
>
> DEB_DIVERT_EXTENSION = .debathena
> -DEB_TRANSFORM_FILES_debathena-athinfod-cluster-config += \
> +DEB_UNDIVERT_FILES_debathena-athinfod-cluster-config += \
> /etc/athena/athinfo.defs.debathena
>
> include /usr/share/cdbs/1/rules/debhelper.mk
>
> Modified: trunk/debathena/config/auto-update/debian/changelog
> ===================================================================
> --- trunk/debathena/config/auto-update/debian/changelog 2012-08-02 21:01:42 UTC (rev 25689)
> +++ trunk/debathena/config/auto-update/debian/changelog 2012-08-02 21:13:31 UTC (rev 25690)
> @@ -1,3 +1,12 @@
> +debathena-auto-update (1.38) unstable; urgency=low
> +
> + * Depend on the new athinfod with query snippet support and add some
> + queries ourselves
> + * Separate out the update-schedule from the upgrade-schedule when
> + querying via athinfo
> +
> + -- Jonathan Reed <jdreed@mit.edu> Thu, 02 Aug 2012 17:08:15 -0400
> +
> debathena-auto-update (1.37) unstable; urgency=low
>
> * Bump debian/compat to 6
>
> Modified: trunk/debathena/config/auto-update/debian/control.in
> ===================================================================
> --- trunk/debathena/config/auto-update/debian/control.in 2012-08-02 21:01:42 UTC (rev 25689)
> +++ trunk/debathena/config/auto-update/debian/control.in 2012-08-02 21:13:31 UTC (rev 25690)
> @@ -7,7 +7,7 @@
>
> Package: debathena-auto-update
> Architecture: all
> -Depends: ${misc:Depends}, bsdutils, debathena-desync, cron, aptitude, apt-file, kexec-tools, bc, debathena-license-config
> +Depends: ${misc:Depends}, bsdutils, debathena-desync, cron, aptitude, apt-file, kexec-tools, bc, debathena-license-config, debathena-athinfod (>= 10.1-0debathena1~)
> Breaks: debathena-reactivate (<< 2.0~)
> Description: Performs automatic updates for Athena machines.
> This package performs automatic updates for Athena machines.
>
> Added: trunk/debathena/config/auto-update/debian/debathena-auto-update.defs
> ===================================================================
> --- trunk/debathena/config/auto-update/debian/debathena-auto-update.defs (rev 0)
> +++ trunk/debathena/config/auto-update/debian/debathena-auto-update.defs 2012-08-02 21:13:31 UTC (rev 25690)
> @@ -0,0 +1,3 @@
> +update-schedule cat /etc/cron.d/athena-auto-update
> +upgrade-schedule cat /etc/cron.d/athena-auto-upgrade
> +update-status cat /var/lib/athena-update-status
>
> Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.install
> ===================================================================
> --- trunk/debathena/config/auto-update/debian/debathena-auto-update.install 2012-08-02 21:01:42 UTC (rev 25689)
> +++ trunk/debathena/config/auto-update/debian/debathena-auto-update.install 2012-08-02 21:13:31 UTC (rev 25690)
> @@ -3,3 +3,4 @@
> debian/athena-auto-upgrade usr/sbin
> debian/athena-auto-upgrade.8 usr/share/man/man8
> debian/mitCA.crt usr/share/debathena-auto-update
> +debian/debathena-auto-update.defs etc/athena/athinfo.defs.d
>
>
