From d63e50f936d4d33a29af56ebefc2d1ae197d030f Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 17 Sep 2013 13:23:57 +0200
Subject: [PATCH] Fix fetchmail symlinks.

When postfix is installed, there are invalid fetchmail symlinks in rc.d.
---
 config/rootfiles/core/73/update.sh | 5 +++++
 src/paks/fetchmail/install.sh      | 4 ++++
 src/paks/fetchmail/uninstall.sh    | 2 ++
 src/paks/postfix/install.sh        | 8 +++++---
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/config/rootfiles/core/73/update.sh b/config/rootfiles/core/73/update.sh
index 6afca9fc5..1fb3ac642 100644
--- a/config/rootfiles/core/73/update.sh
+++ b/config/rootfiles/core/73/update.sh
@@ -53,6 +53,11 @@ extract_files
 #Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+# Remove invalid fetchmail symlinks when postfix is installed.
+if [ ! -e "/etc/rc.d/init.d/fetchmail" ]; then
+	rm -f /etc/rc.d/rc*.d/*fetchmail
+fi
+
 sync
 
 # This update need a reboot...
diff --git a/src/paks/fetchmail/install.sh b/src/paks/fetchmail/install.sh
index 31c5fecae..b379c0cdf 100644
--- a/src/paks/fetchmail/install.sh
+++ b/src/paks/fetchmail/install.sh
@@ -25,3 +25,7 @@
 extract_files
 restore_backup ${NAME}
 start_service --background ${NAME}
+
+ln -sf  ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail
+ln -sf  ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail
+ln -sf  ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail
diff --git a/src/paks/fetchmail/uninstall.sh b/src/paks/fetchmail/uninstall.sh
index a7b8a5370..2d2606f99 100644
--- a/src/paks/fetchmail/uninstall.sh
+++ b/src/paks/fetchmail/uninstall.sh
@@ -25,3 +25,5 @@
 stop_service ${NAME}
 make_backup ${NAME}
 remove_files
+
+rm -f /etc/rc.d/rc*.d/*fetchmail
diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh
index b8b18098a..56c23e2c2 100644
--- a/src/paks/postfix/install.sh
+++ b/src/paks/postfix/install.sh
@@ -27,6 +27,8 @@ postalias /etc/aliases
 # Set postfix's hostname
 postconf -e "myhostname=$(hostname -f)"
 /etc/init.d/postfix start
-ln -sf  ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail
-ln -sf  ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail
-ln -sf  ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail
+
+# Enable autostart for postfix
+ln -sf  ../init.d/postfix /etc/rc.d/rc0.d/K25postfix
+ln -sf  ../init.d/postfix /etc/rc.d/rc3.d/S35postfix
+ln -sf  ../init.d/postfix /etc/rc.d/rc6.d/K25postfix
-- 
2.39.2