Updated vsftpd lfs & rootfile

diff --git a/config/rootfiles/packages/vsftpd b/config/rootfiles/packages/vsftpd
index 815405ff20712482888cdea3c1960219fd53d542..e0f59c3dac6947b96525be491b79b2fd65372404 100644 (file)
--- a/config/rootfiles/packages/vsftpd
+++ b/config/rootfiles/packages/vsftpd
@@ -1,5 +1,8 @@
 var/ipfire/backup/addons/includes/vsftpd
 etc/rc.d/init.d/vsftpd
+etc/rc.d/rc0.d/K35vsftpd
+etc/rc.d/rc6.d/K35vsftpd
+etc/rc.d/rc3.d/S65vsftpd
 etc/vsftpd.conf
 etc/vsftpd.user_list
 home/ftp

diff --git a/lfs/vsftpd b/lfs/vsftpd
index 0f326935e69b24c4aea249eadc26831c0fc9862c..e4cb67c4e55b4014e383b581d2a084f43126d845 100644 (file)
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -87,9 +87,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && install -v -m 644 vsftpd.conf.5 /usr/share/man/man5
        cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.conf /etc
        cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.user_list /etc
-       ln -s ../init.d/vsftpd /etc/rc.d/rc3.d/S65vsftpd
-       ln -s ../init.d/vsftpd /etc/rc.d/rc0.d/K35vsftpd
-       ln -s ../init.d/vsftpd /etc/rc.d/rc6.d/K35vsftpd
+       ln -sf ../init.d/vsftpd /etc/rc.d/rc3.d/S65vsftpd
+       ln -sf ../init.d/vsftpd /etc/rc.d/rc0.d/K35vsftpd
+       ln -sf ../init.d/vsftpd /etc/rc.d/rc6.d/K35vsftpd
        install -v -m 644 $(DIR_SRC)/config/backup/includes/vsftpd \
                        /var/ipfire/backup/addons/includes/vsftpd
        @rm -rf $(DIR_APP)

diff --git a/src/paks/vsftpd/install.sh b/src/paks/vsftpd/install.sh
index daa26ea3e7fe63767f1b546344c1dc94b17ad3ac..1366b40cd76952dc25896b5974abc8f2ec9e1425 100644 (file)
--- a/src/paks/vsftpd/install.sh
+++ b/src/paks/vsftpd/install.sh
@@ -24,7 +24,5 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 restore_backup ${NAME}
-start_service --background ${NAME}
-
 # Disable vsftpd by default due to lack of configuration file
 /usr/local/bin/addonctrl vsftpd disable

diff --git a/src/paks/vsftpd/update.sh b/src/paks/vsftpd/update.sh
index 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..e42310f20535ca954beb133f9863e1cd2e88a79d 100644 (file)
--- a/src/paks/vsftpd/update.sh
+++ b/src/paks/vsftpd/update.sh
@@ -23,4 +23,6 @@
 #
 . /opt/pakfire/lib/functions.sh
 ./uninstall.sh
-./install.sh
+extract_files
+restore_backup ${NAME}
+start_service --background ${NAME}