[Oval-commits] r279 - in trunk/oval-agent: . debian

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-10-30 17:06:11 +0000 (Tue, 30 Oct 2007)
New Revision: 279

Modified:
   trunk/oval-agent/BUGS
   trunk/oval-agent/debian/oval-agent.init
   trunk/oval-agent/debian/postrm
Log:
Use separate user oval-agent for this package.

Modified: trunk/oval-agent/BUGS
===================================================================
--- trunk/oval-agent/BUGS	2007-10-30 17:04:06 UTC (rev 278)
+++ trunk/oval-agent/BUGS	2007-10-30 17:06:11 UTC (rev 279)
@@ -10,5 +10,3 @@
   fails.
   To reproduce: mv /etc/hosts to /etc/hosts.BREAK in a chroot, ovaldi
   fails to work (does not resolv the local host name)  in this situation
-
-- Uses the same user as the server, should be different

Modified: trunk/oval-agent/debian/oval-agent.init
===================================================================
--- trunk/oval-agent/debian/oval-agent.init	2007-10-30 17:04:06 UTC (rev 278)
+++ trunk/oval-agent/debian/oval-agent.init	2007-10-30 17:06:11 UTC (rev 279)
@@ -22,7 +22,7 @@
 PIDFILE=/var/run/oval-agent.pid
 
 OVALAGENT_ENABLE=false
-OVALAGENT_USER=oval
+OVALAGENT_USER=oval-agent
 OVALAGENT_CONFIG_FILE=/etc/oval/agent.conf
 OVALAGENT_LOG_DIR=/var/log/oval
 

Modified: trunk/oval-agent/debian/postrm
===================================================================
--- trunk/oval-agent/debian/postrm	2007-10-30 17:04:06 UTC (rev 278)
+++ trunk/oval-agent/debian/postrm	2007-10-30 17:06:11 UTC (rev 279)
@@ -18,32 +18,20 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-
-# (jfs) BUG: Dpkg should not be invoked from within a postrm script
-OVALSERVER=`dpkg -l | grep oval-server | awk '{print $1}'`
-
 case "$1" in
     purge)
    	rm -rf /var/cache/oval-agent
     ;;
 
     remove)
-        # (jfs) BUG: No need to remove the directory, dpkg will 
-        # remove it if empty, just remove the log file...
-	if [ "$OVALSERVER" != "ii" ]; then
-		rm -rf /var/log/oval
-	else
-		rm -rf /var/log/oval/oval-agent.log
-	fi
+	rm -rf /var/log/oval/oval-agent.log
 	
         # (jfs) BUG: This check should be more strict, this user
         # might have been created by the user but not by the package
         # also, it makes more sense to have an oval-agent and oval-server
         # users so that they do not overlap
-	if [ "$OVALSERVER" != "ii" ]; then
-		if id oval >/dev/null; then
-			deluser oval
-		fi
+	if id oval-agent >/dev/null; then
+		deluser oval-agent
 	fi
     ;;