Fix installation of vsftpd package.

diff --git a/lfs/vsftpd b/lfs/vsftpd
index e4c0c475133b572c6891c49339997dd146e3c5bc..0f326935e69b24c4aea249eadc26831c0fc9862c 100644 (file)
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -90,7 +90,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
-       /usr/local/bin/addonctrl vsftpd disable 
        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 31c5fecae2e3f1a09e312e3e2bbbcc0e7e03c373..daa26ea3e7fe63767f1b546344c1dc94b17ad3ac 100644 (file)
--- a/src/paks/vsftpd/install.sh
+++ b/src/paks/vsftpd/install.sh
@@ -25,3 +25,6 @@
 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