diff options
| author | jacobs <none@none> | 2007-02-23 12:59:39 -0800 |
|---|---|---|
| committer | jacobs <none@none> | 2007-02-23 12:59:39 -0800 |
| commit | c74d5d46b91a456f2ccf1a2416478fad8d1b3b11 (patch) | |
| tree | 3565250c80a95b4ba7bd5344922c8e816ebf6854 /usr/src/cmd/print | |
| parent | a42f8dd7c1182d5a324a70721b3032e3e4c6365e (diff) | |
| download | illumos-gate-c74d5d46b91a456f2ccf1a2416478fad8d1b3b11.tar.gz | |
6525048 HAL doesn't completely detect MFP devices
6525102 lpadmin pauses creating local queues
Diffstat (limited to 'usr/src/cmd/print')
| -rw-r--r-- | usr/src/cmd/print/scripts/lpadmin | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/usr/src/cmd/print/scripts/lpadmin b/usr/src/cmd/print/scripts/lpadmin index 4d7703c32c..6b6aadbe61 100644 --- a/usr/src/cmd/print/scripts/lpadmin +++ b/usr/src/cmd/print/scripts/lpadmin @@ -257,19 +257,6 @@ case "${server}" in ;; esac -if [[ -n "${server}" ]] ; then - # if we need a uri, find the "best" one. - if [[ -z "${uri}" ]] ; then - uri="ipp://${server}/printers/${rem_printer}" - ${LPSTAT} -p ${uri} >/dev/null 2>&1 - if [[ $? -ne 0 ]] ; then - uri="lpd://${server}/printers/${rem_printer}#Solaris" - fi - fi - # set the bsdaddr - bsdaddr="${server},${rem_printer},Solaris" -fi - # if there is a "device" or LP configuration, it's local if [[ -n "${device}" || -f /etc/lp/printers/${printer}/configuration || \ -f /etc/lp/classes/${printer} ]] ; then @@ -328,6 +315,17 @@ if [[ -n "${delete}" ]] ; then exit_code=$? fi elif [[ -z "${local}" ]] ; then + # if we need a uri, find the "best" one. + if [[ -z "${uri}" ]] ; then + uri="ipp://${server}/printers/${rem_printer}" + ${LPSTAT} -p ${uri} >/dev/null 2>&1 + if [[ $? -ne 0 ]] ; then + uri="lpd://${server}/printers/${rem_printer}#Solaris" + fi + fi + # set the bsdaddr + bsdaddr="${server},${rem_printer},Solaris" + if [[ -n "${printer}" ]] ; then ${LPSET} -n system \ -a "printer-uri-supported=${uri}" \ |