From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 25 Jul 2022 16:02:04 +0000 (+0000)
Subject: cups: Add link at /etc/cups pointing to configuration
X-Git-Tag: v2.27-core170~4^2~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71aba971c455ac695bef6a3d41ed8563a53f9a44;p=ipfire-2.x.git

cups: Add link at /etc/cups pointing to configuration

This is needed because cups-pdf is looking for its configuration file in
/etc/cups.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 18987be0e4..65ad4f418a 100644
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -1,3 +1,4 @@
+etc/cups
 etc/dbus-1/system.d/cups.conf
 etc/pam.d/cups
 etc/rc.d/init.d/cups
diff --git a/lfs/cups b/lfs/cups
index d333532e3a..312f165d8f 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 27
+PAK_VER    = 28
 
 DEPS       = avahi cups-filters dbus ghostscript
 
@@ -104,5 +104,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	$(call INSTALL_INITSCRIPTS,$(SERVICES))
 	cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
 
+	# Install convenience link
+	ln -svf /var/ipfire/cups /etc/cups
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)