From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 20 Oct 2009 09:21:59 +0000 (+0200)
Subject: Fix installation of vsftpd package.
X-Git-Tag: v2.9-beta1~674
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14023c5c73bcb3f3d2f1ad65dfd17350f257b935;p=people%2Fpmueller%2Fipfire-2.x.git

Fix installation of vsftpd package.
---

diff --git a/lfs/vsftpd b/lfs/vsftpd
index e4c0c47513..0f326935e6 100644
--- 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 31c5fecae2..daa26ea3e7 100644
--- 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