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

diff --git a/gen/cups-lpd.pc b/gen/cups-lpd.pc
index 7f43a2f4c697684ca2c463c9ec58aaf56d27b255..dd4a42a672f40a91b62bf2f2843c6d191a9d6e46 100644 (file)
--- 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 89476d527ba2af64aa655d4b4e854493ce17dce0..40edd995a2ff94e3dcb1f0a03772c9e62e525c02 100755 (executable)
--- 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