Don't allow internals of PostgreSQL to trigger it's restart

4 files changed, 3 insertions, 103 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 81826d0..a7e412d 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -1,5 +1,5 @@
 AUX auto-download-packages 81 RMD160 05c97eeabe538cdc52dc55259dc77a75cdb1f65b SHA1 6990f34aaf209d5ad2504ed92ea8496125f0378f SHA256 0ec31222dc2d7b7dac658faffed8b971d9ee6710811c6eefe0145e4ed4c95792
-AUX auto-restart-services 247 RMD160 8dabc50278db05a7ec2d1dc85d6ede0e92534303 SHA1 eb96f48bc21cddb46200f95a5df1c5409ba5b5de SHA256 6bdaf5ff740577bb7a94b1f1320000c557234bffd60fa92dac2b625c895b9626
+AUX auto-restart-services 278 RMD160 5772b77158e406fa0f3f1c691a7ee1e0fe589482 SHA1 e159a256fc9f0efe71d4326e0a5a1f22d9b6b089 SHA256 5db6e30dcc5664ac8a4ef81225eac42d9bb6c33df815e07b250c210dcd252e80
 AUX auto-update-overlays 25 RMD160 7c8c5594cfd401e8b38b4ae4df07f17f4c4415a4 SHA1 89423a378ba04e2615ea8bdf04e201d730392e74 SHA256 98ce8786c0fb1612bb1778a2ee0aea88728b7d74929650a5b249bc0e05d3abdd
 AUX daily-av-update.cron 31 RMD160 17399a1386d96221b51960ec38c7059af01c609e SHA1 e4ef1c8f4d2195229da18b4d23b8a42e9b61afe8 SHA256 1b83ac59e56ffbc3ec1c0f42c3c43de2b0cf9485690292a7dcb3440d529d0f78
 AUX hourly-distclean-updatedb.cron 940 RMD160 f6f420a2da2588be0f5ba47c3c887a403002fce0 SHA1 f5626fcddd829d6bfa75bb132e2644162548f9d2 SHA256 ce2ec02cd3a9b1af3df6f7eba15dedb1b4ca8b224fc68431a9afc1a76702c0c6
@@ -52,5 +52,4 @@ AUX weekly-av-scan.cron 232 RMD160 1eb8c0e031fc10a8299f8d00cddf46aee7dc011a SHA1
 AUX weekly-distclean-exec-eclean.cron 40 RMD160 3c0f801ebbb3e575590aa7764e5020a820e5f5fe SHA1 a077c7c5265c3d9817fa4846dbbab8bc9addfeb5 SHA256 dbb37593b994102324c5a24b5d5d21597c215924a29d065d84b8c64af3049b38
 AUX weekly-distclean-exec.cron 664 RMD160 af55d070f6f442feedbfb7a324ccaa5ceff53037 SHA1 76f91d4eac90a44f3d9e636640279d1754f2739e SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141
 AUX write-new-updates 108 RMD160 1eccc342427d7c6523f23f8d7bd4bf2966638cb2 SHA1 8886bae7ac2c2f01c6cbd47ffcaa15ffcc210214 SHA256 b910f8d64a069e8038965c1c8af3bf05729f027e2da264cd6e0fa2ea627ec164
-EBUILD miller-base-7-r4.ebuild 3017 RMD160 0d6568da794e92b6f541194a44f1d654f7fd9de4 SHA1 9fcbe35f03ca0344fcc8c0b4421eb4aaf51f835f SHA256 a3d4868d450d1a0b54f0a79fb9e017aa6ca56ae70e93c453c659f4f1ca717ddc
-EBUILD miller-base-8-r9.ebuild 4084 RMD160 fc3f087a75a455b2c07dd5bf87793a95e797c891 SHA1 0f4c4b64427cb6d39ad9046472bfb12c26917606 SHA256 5d4c18ecd361fc7c306fb3228ef9e6fcd90b5664a2cb50a76738fca01f26fc99
+EBUILD miller-base-8-r10.ebuild 4084 RMD160 fc3f087a75a455b2c07dd5bf87793a95e797c891 SHA1 0f4c4b64427cb6d39ad9046472bfb12c26917606 SHA256 5d4c18ecd361fc7c306fb3228ef9e6fcd90b5664a2cb50a76738fca01f26fc99
diff --git a/virtual/miller-base/files/auto-restart-services b/virtual/miller-base/files/auto-restart-services
index 5c9c65f..82b497b 100755
--- a/virtual/miller-base/files/auto-restart-services
+++ b/virtual/miller-base/files/auto-restart-services
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-for f in `lsof -n +c0 | grep '\(DEL\|deleted\)' | grep -v /dev/zero  | grep -v /SYS | cut -d ' ' -f 1 | sort -u`; do
+for f in `lsof -n +c0 | grep '\(DEL\|deleted\)' | grep -v /dev/zero  | grep -v /SYS | grep -v /var/lib/postgresql/ | cut -d ' ' -f 1 | sort -u`; do
 	echo $f
 	sc=/usr/libexec/scripts/auto-restart/$f
 	if [ -x $sc ] ; then
diff --git a/virtual/miller-base/miller-base-7-r4.ebuild b/virtual/miller-base/miller-base-7-r4.ebuild
deleted file mode 100644
index cc087ce..0000000
--- a/virtual/miller-base/miller-base-7-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-DESCRIPTION="Virtual for Miller servers"
-
-EAPI="2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="cdr hardened nohourlyupdate fuse xfs bash-completion nomedia git
-minimal autoupdate autoshutdown autoservicerestart"
-
-DEPEND="
-	!minimal? ( www-servers/apache )
-	sys-cluster/glusterfs
-	sys-apps/inotail
-	sys-apps/ethtool
-	cdr? ( app-cdr/k3b )
-	!nomedia? ( media-tv/mythtv media-plugins/mythvideo )
-	sys-apps/hdparm
-	sys-apps/unscd
-	!minimal? ( net-dns/bind-tools )
-	fuse? ( sys-fs/sshfs-fuse )
-	!minimal? ( || ( net-fs/mount-cifs net-fs/samba-client ) )
-	xfs? ( sys-fs/xfsdump )
-	sys-fs/lvm2
-	>=app-portage/gentoolkit-0.2.1
-	sys-process/vixie-cron
-	!minimal? ( sys-apps/eject )
-	app-admin/sudo
-	mail-client/mailx
-	sys-apps/pciutils
-	!minimal? ( app-dicts/myspell-en )
-	net-misc/ntp
-	!minimal? ( net-analyzer/netcat )
-	!minimal? ( net-ftp/ncftp )
-	dev-vcs/cvs
-	!minimal? ( x11-apps/xauth )
-	sys-process/lsof
-	app-portage/layman[cvs]
-	app-admin/syslog-ng
-	app-admin/logrotate
-	!minimal? ( app-antivirus/clamav )
-	!hardened? ( sys-kernel/tuxonice-sources )
-	hardened? ( sys-kernel/hardened-sources )
-	!minimal? ( ||
-		( app-text/dos2unix <app-text/unix2dos-5 )
-		( >=app-text/dos2unix-5 !app-text/unix2dos ) )
-	app-misc/screen
-	sys-boot/grub
-	app-vim/gentoo-syntax
-	sys-apps/kexec-tools
-	sys-auth/pam_ldap
-	sys-auth/nss_ldap
-	app-editors/gvim
-	git? ( dev-vcs/git )
-	!minimal? ( dev-util/strace )
-	bash-completion? ( app-shells/bash-completion )
-	net-misc/wakeonlan
-	"
-
-src_install() {
-	exeinto /etc/cron.weekly
-	use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan
-
-	exeinto /etc/cron.daily
-	use !minimal && newexe "${FILESDIR}"/daily-av-update.cron av-update
-
-	if [ -n "${UPDATETIME}" ]; then
-		mkdir -p ${D}/etc/cron.d
-		echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
-		exeinto /sbin
-	else
-		use nohourlyupdate && exeinto /etc/cron.daily
-		use !nohourlyupdate && exeinto /etc/cron.hourly
-	fi
-	newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/sync-distclean-exec.cron 88-portage-distclean-exec
-	use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 89-auto-download-package
-	newexe "${FILESDIR}"/auto-update-overlays 10-auto-update-overlays
-	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates
-	if use autoupdate ; then
-		dosym /sbin/update-install /etc/portage/postsync.d/98-update-install
-		if use autoshutdown ; then
-			newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown
-		else
-			if use autoservicerestart ; then
-				exeinto /usr/libexec/scripts/auto-restart
-				for f in ${FILESDIR}/restart/* ; do
-					newexe ${FILESDIR}/restart/`basename $f` `basename $f`
-				done
-				exeinto /etc/portage/postsync.d/
-				newexe "${FILESDIR}"/auto-restart-services 99-auto-restart-services
-			fi
-		fi
-	fi
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install2 update-install
-	newexe "${FILESDIR}"/update-kernel update-kernel
-}
diff --git a/virtual/miller-base/miller-base-8-r9.ebuild b/virtual/miller-base/miller-base-8-r10.ebuild
index 24cdb2e..24cdb2e 100644
--- a/virtual/miller-base/miller-base-8-r9.ebuild
+++ b/virtual/miller-base/miller-base-8-r10.ebuild