From: zacheiss <zacheiss>
Date: Fri, 16 Oct 2009 16:34:11 +0000 (+0000)
Subject: Add rp to generated file; don't use "restart" init option.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/f0ce8752af6b6aa13ed7fdc827b2a2cd8150b4d2

Add rp to generated file; don't use "restart" init option.
---

diff --git a/gen/cups-lpd.pc b/gen/cups-lpd.pc
index 7f43a2f4..dd4a42a6 100644
--- a/gen/cups-lpd.pc
+++ b/gen/cups-lpd.pc
@@ -147,7 +147,7 @@ void do_host(char *host)
       for (p = duplexname;*p;p++)
 	*p = tolower(*p);
 
-      fprintf(out, "%s|%s|%s|%s|%s|%s\n", name,duplexname,hostname,location,hwtype,prtype);
+      fprintf(out, "%s|%s|%s|%s|%s|%s|%s\n", name,duplexname,hostname,location,hwtype,prtype,rp);
     }
   EXEC SQL CLOSE csr_lprng;
   tarfile_end(tf);
diff --git a/gen/cups-lpd.sh b/gen/cups-lpd.sh
index 89476d52..40edd995 100755
--- a/gen/cups-lpd.sh
+++ b/gen/cups-lpd.sh
@@ -29,7 +29,8 @@ tar xf $TARFILE || exit $MR_TARERR
 /etc/cups/bin/sync_lpd_ldap.pl 2>/dev/null
 /etc/cups/bin/gen-ppd.pl 2>/dev/null
 
-/etc/init.d/cups restart
+/etc/init.d/cups stop
+/etc/init.d/cups start
 
 # if Samba-enabled, then restart it too to have it pick up
 # new definitions