From: Evan Broder Date: Sun, 7 Dec 2008 15:21:31 +0000 (-0500) Subject: Merge invirt-console-server into invirt-console (LP: #305681) X-Git-Tag: 0.2.0^0 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-console.git/commitdiff_plain/ea990341e40f67e1998fed6a1e6a8455782db73c Merge invirt-console-server into invirt-console (LP: #305681) svn path=/trunk/packages/invirt-console/; revision=1815 --- ea990341e40f67e1998fed6a1e6a8455782db73c diff --cc debian/changelog index 262bc4b,d0f3ce7..0d439ce --- a/debian/changelog +++ b/debian/changelog @@@ -1,118 -1,69 +1,119 @@@ -invirt-console-host (0.0.10) unstable; urgency=low +invirt-console (0.2.0) unstable; urgency=low - * Clean up the old sudoers block in the postinst before we add it back + * Rename source package in preparation for merging invirt-console-server + with invirt-console-host ++ * Merge invirt-console-host into invirt-console (LP: #305681) - -- Evan Broder Sun, 07 Dec 2008 10:10:36 -0500 - -- Evan Broder Tue, 25 Nov 2008 08:13:32 -0500 ++ -- Evan Broder Sun, 07 Dec 2008 10:17:06 -0500 -invirt-console-host (0.0.9) unstable; urgency=low +invirt-console-server (0.1.3) unstable; urgency=low - * Add cron dependency + * Fix a gen_config -> gen_files - -- Evan Broder Thu, 20 Nov 2008 11:01:03 -0500 + -- Greg Price Sat, 22 Nov 2008 19:27:59 -0500 -invirt-console-host (0.0.8) unstable; urgency=low +invirt-console-server (0.1.2) unstable; urgency=low - * Specify a full path to invoke-rc.d for when this gets run as a cron - job + * Use gen-files.sh instead of rolling out own - -- Evan Broder Thu, 06 Nov 2008 18:57:02 -0500 + -- Evan Broder Sat, 22 Nov 2008 05:45:25 -0500 -invirt-console-host (0.0.7) unstable; urgency=low +invirt-console-server (0.1.1) unstable; urgency=low - * Use invoke-rc.d instead of calling init scripts directly + * Clean up the init script with some ideas from debathena-pyhesiodfs. + * Switch to using std-init. - -- Evan Broder Fri, 31 Oct 2008 06:29:20 -0400 + -- Evan Broder Sat, 22 Nov 2008 05:26:22 -0500 -invirt-console-host (0.0.6) unstable; urgency=low +invirt-console-server (0.1.0) unstable; urgency=low - * sipb-xen-base -> invirt-base + * Add real caching to consolefs + * Now that we're really caching, cache for a shorter period of time + + -- Evan Broder Mon, 17 Nov 2008 13:16:37 -0500 + +invirt-console-server (0.0.13) unstable; urgency=low + + * Actually get the password fields right for libnss-pgsql + + -- Evan Broder Mon, 10 Nov 2008 22:57:49 -0500 + +invirt-console-server (0.0.12) unstable; urgency=low + + * Fix the libnss-pgsql config - don't suggest that the password should + be in /etc/shadow + + -- Evan Broder Mon, 10 Nov 2008 20:34:14 -0500 + +invirt-console-server (0.0.11) unstable; urgency=low + + * Don't depend on invirt-mail-config + + -- Evan Broder Thu, 06 Nov 2008 22:47:47 -0500 + +invirt-console-server (0.0.10) unstable; urgency=low + + * Fix some uncaught bugs with the libnss-pgsql config + + -- Evan Broder Thu, 06 Nov 2008 22:21:12 -0500 + +invirt-console-server (0.0.9) unstable; urgency=low - -- Evan Broder Tue, 28 Oct 2008 04:23:12 -0400 + * Depend on invirt-mail-config -invirt-console-host (0.0.5) unstable; urgency=low + -- Evan Broder Thu, 06 Nov 2008 21:48:34 -0500 - * invirt-console-host doesn't use the database anymore, so don't connect - to it +invirt-console-server (0.0.8) unstable; urgency=low - -- Evan Broder Sat, 25 Oct 2008 14:09:03 -0400 + * The ACL file for remctl moved, but the reference to it didn't -invirt-console-host (0.0.4) unstable; urgency=low + -- Evan Broder Thu, 06 Nov 2008 03:35:48 -0500 - * Kill DEB_AUTO_UPDATE_DEBIAN_CONTROL +invirt-console-server (0.0.7) unstable; urgency=low - -- Evan Broder Fri, 24 Oct 2008 13:46:46 -0400 + * Apparently remctl scripts run without a PATH -invirt-console-host (0.0.3) unstable; urgency=low + -- Evan Broder Sun, 02 Nov 2008 17:08:35 -0500 - * make initscript even shorter, with code now provided by sipb-xen-base +invirt-console-server (0.0.6) unstable; urgency=low - -- Greg Price Fri, 24 Oct 2008 07:07:46 -0400 + * Use invoke-rc.d instead of calling init scripts directly + + -- Evan Broder Fri, 31 Oct 2008 06:32:17 -0400 + +invirt-console-server (0.0.5) unstable; urgency=low + + * sipb-xen-base -> invirt-base + + -- Evan Broder Tue, 28 Oct 2008 04:23:16 -0400 + +invirt-console-server (0.0.4) unstable; urgency=low + + * sipb-xen-database-common -> invirt-database -invirt-console-host (0.0.2) unstable; urgency=low + -- Evan Broder Sat, 25 Oct 2008 21:04:39 -0400 - * make initscript start conserver on start/restart, not just reload - * drastically shorten initscript to current Invirt best practice, - in hopes that such dumb bugs can't hide so easily +invirt-console-server (0.0.3) unstable; urgency=low - -- Greg Price Fri, 24 Oct 2008 03:33:32 -0400 + * Remove dependency on sipb-xen-chrony-config - we need to take care of + the clock, but not through that package -invirt-console-host (0.0.1) unstable; urgency=low + -- Evan Broder Sat, 25 Oct 2008 19:18:06 -0400 + +invirt-console-server (0.0.2) unstable; urgency=low + + * Standardize on "Invirt project" + + -- Evan Broder Fri, 24 Oct 2008 13:32:17 -0400 + +invirt-console-server (0.0.1) unstable; urgency=low * sipb-xen -> invirt - * -server -> -host while we're at it + * -> -server while we're at it - -- Greg Price Fri, 24 Oct 2008 01:23:56 -0400 + -- Greg Price Fri, 24 Oct 2008 03:54:40 -0400 -sipb-xen-console-server (2.8) unstable; urgency=low +sipb-xen-console (8.4) unstable; urgency=low * Create a dummy console entry that exists by default so that conserver won't quit if no consoles are defined. diff --cc debian/control index b4767da,28deb16..4969f5c --- a/debian/control +++ b/debian/control @@@ -1,17 -1,14 +1,25 @@@ -Source: invirt-console-host +Source: invirt-console Section: servers -Priority: important -Maintainer: invirt@mit.edu -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~) +Priority: extra +Maintainer: Invirt project +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~), nscd, openssh-server, debathena-ssh-server-config, initscripts Standards-Version: 3.7.2 +Package: invirt-console-server +Architecture: all +Provides: ${diverted-files} +Conflicts: ${diverted-files} +Depends: invirt-base, ${shlibs:Depends}, ${misc:Depends}, + conserver-client, daemon, debathena-kerberos-config, fuse-utils, + libnss-pgsql1, nscd, openssh-server, python, python-routefs, + invirt-database, remctl-server, debathena-ssh-server-config +Description: Invirt serial-console proxy server + This is the software for the serial-console proxy server. ++ + Package: invirt-console-host + Architecture: all + Provides: ${diverted-files} + Conflicts: ${diverted-files} + Depends: ${shlibs:Depends}, ${misc:Depends}, conserver-server, remctl-client, invirt-base, cron + Description: SIPB Xen serial console server server + This configures the VMM for the server-side of the console server diff --cc debian/invirt-console-host.install index 0000000,9da31b3..260c50b mode 000000,100644..100644 --- a/debian/invirt-console-host.install +++ b/debian/invirt-console-host.install @@@ -1,0 -1,1 +1,1 @@@ -files/* . ++host/* . diff --cc debian/rules index 47cbab2,bfba7f2..b1b8d2b --- a/debian/rules +++ b/debian/rules @@@ -1,21 -1,9 +1,24 @@@ #!/usr/bin/make -f DEB_DIVERT_EXTENSION = .invirt +DEB_TRANSFORM_FILES_invirt-console-server += \ + /etc/init.d/bootmisc.sh.invirt \ + /etc/nsswitch.conf.invirt \ + /etc/nscd.conf.invirt \ + /etc/pam.d/sshd.invirt \ + /etc/ssh/sshd_config.debathena.invirt + +ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),) + DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.invirt = \ + /usr/share/base-files/nsswitch.conf +endif + +DEB_DIVERT_FILES_invirt-console-server += \ + /etc/conserver/conserver.cf.invirt \ + /etc/motd.invirt + DEB_DIVERT_FILES_invirt-console-host += \ + /etc/conserver/conserver.cf.invirt \ + /etc/conserver/server.conf.invirt include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/config-package.mk diff --cc host/etc/conserver/conserver.cf.invirt index 0000000,1b92380..1b92380 mode 000000,100644..100644 --- a/host/etc/conserver/conserver.cf.invirt +++ b/host/etc/conserver/conserver.cf.invirt diff --cc host/etc/conserver/invirt-consoles.cf index 0000000,e69de29..e69de29 mode 000000,100644..100644 --- a/host/etc/conserver/invirt-consoles.cf +++ b/host/etc/conserver/invirt-consoles.cf diff --cc host/etc/conserver/invirt-genconfig.cf.mako index 0000000,94c3f94..94c3f94 mode 000000,100644..100644 --- a/host/etc/conserver/invirt-genconfig.cf.mako +++ b/host/etc/conserver/invirt-genconfig.cf.mako diff --cc host/etc/conserver/server.conf.invirt index 0000000,9081b3b..9081b3b mode 000000,100644..100644 --- a/host/etc/conserver/server.conf.invirt +++ b/host/etc/conserver/server.conf.invirt diff --cc host/usr/sbin/invirt-update-conserver index 0000000,9a7fd3c..9a7fd3c mode 000000,100755..100755 --- a/host/usr/sbin/invirt-update-conserver +++ b/host/usr/sbin/invirt-update-conserver