Make sure we don't enter interactive mode in rc_post by using 'mv -f'.
Fix shutdown/reboot issues reported by Tomas Bodzar.
This commit is contained in:
parent
397e66739a
commit
3e0b97eefc
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.98 2011/03/09 13:05:20 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.99 2011/03/24 15:17:28 ajacoutot Exp $
|
||||
|
||||
COMMENT= Common Unix Printing System
|
||||
|
||||
@ -6,7 +6,7 @@ VERSION= 1.4.6
|
||||
DISTNAME= cups-${VERSION}-source
|
||||
PKGNAME= cups-${VERSION}
|
||||
|
||||
REVISION= 3
|
||||
REVISION= 4
|
||||
|
||||
# Allow both ulpt(4) and libusb based backends to work together.
|
||||
# See http://www.cups.org/str.php?L3357
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: cupsd.rc,v 1.7 2011/01/11 12:13:59 ajacoutot Exp $
|
||||
# $OpenBSD: cupsd.rc,v 1.8 2011/03/24 15:17:28 ajacoutot Exp $
|
||||
|
||||
daemon="${TRUEPREFIX}/sbin/cupsd"
|
||||
|
||||
@ -52,7 +52,7 @@ rc_post() {
|
||||
else
|
||||
for i in ${_lpfiles} /etc/printcap; do
|
||||
if [ -e $i.pre-cups ]; then
|
||||
mv $i.pre-cups $i
|
||||
mv -f $i.pre-cups $i
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user