diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/cups/files | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/cups/files')
| -rw-r--r-- | package/cups/files/cups.conffiles | 4 | ||||
| -rw-r--r-- | package/cups/files/cups.postinst | 6 | ||||
| -rw-r--r-- | package/cups/files/cupsd.init | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/package/cups/files/cups.conffiles b/package/cups/files/cups.conffiles new file mode 100644 index 000000000..bed6faa3f --- /dev/null +++ b/package/cups/files/cups.conffiles @@ -0,0 +1,4 @@ +/etc/cups/classes.conf +/etc/cups/client.conf +/etc/cups/cupsd.conf +/etc/cups/printers.conf diff --git a/package/cups/files/cups.postinst b/package/cups/files/cups.postinst new file mode 100644 index 000000000..fa191bee7 --- /dev/null +++ b/package/cups/files/cups.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +gid=$(get_next_gid) +add_user cups $(get_next_uid) $gid /tmp +add_group cups $gid +add_rcconf cups cups NO diff --git a/package/cups/files/cupsd.init b/package/cups/files/cupsd.init index d22f55c96..03be3300f 100644 --- a/package/cups/files/cupsd.init +++ b/package/cups/files/cupsd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG cups +#INIT 60 . /etc/rc.conf case $1 in |