--- mcore-src/trunk/mcore-tools/daemon/client/include/printing.client.class 2012/08/13 09:47:50 2010 +++ mcore-src/trunk/mcore-tools/daemon/client/include/printing.client.class 2012/08/13 09:52:58 2011 @@ -29,7 +29,7 @@ [[ -z ${name} ]] && help_printing_printer && return 1 [[ -z ${port} ]] && help_printing_printer && return 1 - [[ ! -d /etc/printcap.d ]] && install -d /etc/printcap.d + [[ ! -d ${MROOT}/etc/printcap.d ]] && install -d ${MROOT}/etc/printcap.d case ${port} in lpt[0-9]*) port="/dev/lp$(( ${port/lpt/}-1 ))" ;; @@ -39,7 +39,7 @@ #socket) port="socket://${ip}:${share}" ;; esac - CONFIG="/etc/printcap.d/${name}.conf" + CONFIG="${MROOT}/etc/printcap.d/${name}.conf" clearconfig addconfig "${name}|${name}" addconfig " :lp=${port}" @@ -57,19 +57,19 @@ [[ -z ${name} ]] && help_printing_printer && return 1 - if [[ -f /etc/printcap.d/${name}.conf ]] + if [[ -f ${MROOT}/etc/printcap.d/${name}.conf ]] then - rm /etc/printcap.d/${name}.conf + rm ${MROOT}/etc/printcap.d/${name}.conf fi - if [[ -d /var/spool/lpd/${name} ]] + if [[ -d ${MROOT}/var/spool/lpd/${name} ]] then - rm -rf /var/spool/lpd/${name} + rm -rf ${MROOT}/var/spool/lpd/${name} fi - if [[ -d /var/log/lprng/${name} ]] + if [[ -d ${MROOT}/var/log/lprng/${name} ]] then - rm -rf /var/log/lprng/${name} + rm -rf ${MROOT}/var/log/lprng/${name} fi # regenerate printcap @@ -109,10 +109,10 @@ local i local prn - CONFIG="/etc/printcap" + CONFIG="${MROOT}/etc/printcap" clearconfig - for i in $(find /etc/printcap.d -type f -name \*.conf) + for i in $(find ${MROOT}/etc/printcap.d -type f -name \*.conf) do mecho "adding ${i}" addconfig "#--- added by mcored ---" @@ -123,12 +123,12 @@ prn=$(basename ${i} .conf) # install spooler directories - install -o lp -g lp -m0700 -d /var/spool/lpd/${prn} + install -o lp -g lp -m0700 -d ${MROOT}/var/spool/lpd/${prn} # create empty log files - install -d /var/log/lprng - touch /var/log/lprng/${prn} - chown lp:lp /var/log/lprng/${prn} - chmod 0600 /var/log/lprng/${prn} + install -d ${MROOT}/var/log/lprng + touch ${MROOT}/var/log/lprng/${prn} + chown lp:lp ${MROOT}/var/log/lprng/${prn} + chmod 0600 ${MROOT}/var/log/lprng/${prn} done }