[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d63e50f936d4d33a29af56ebefc2d1ae197d030f

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d63e50f936d4d33a29af56ebefc2d1ae197d030f

[git]

[-- Attachment #1: Type: text/plain, Size: 3248 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  d63e50f936d4d33a29af56ebefc2d1ae197d030f (commit)
      from  d9949d4dd18789f18c21867cc3b7c6bbe3ba2801 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d63e50f936d4d33a29af56ebefc2d1ae197d030f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Sep 17 13:23:57 2013 +0200

    Fix fetchmail symlinks.
    
    When postfix is installed, there are invalid fetchmail symlinks in rc.d.

-----------------------------------------------------------------------

Summary of changes:
 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(-)

Difference in files:
diff --git a/config/rootfiles/core/73/update.sh b/config/rootfiles/core/73/update.sh
index 6afca9f..1fb3ac6 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 31c5fec..b379c0c 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 a7b8a53..2d2606f 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 b8b1809..56c23e2 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


hooks/post-receive
--
IPFire 2.x development tree