From e9d2e11d05a3a095bf49a2b4d882c7fe3e29482a Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 21 Oct 2009 20:36:56 +0200
Subject: [PATCH] Updated vsftpd lfs & rootfile

---
 config/rootfiles/packages/vsftpd | 3 +++
 lfs/vsftpd                       | 8 ++++----
 src/paks/vsftpd/install.sh       | 2 --
 src/paks/vsftpd/update.sh        | 4 +++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/config/rootfiles/packages/vsftpd b/config/rootfiles/packages/vsftpd
index 815405ff20..e0f59c3dac 100644
--- 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 0f326935e6..e4cb67c4e5 100644
--- 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 daa26ea3e7..1366b40cd7 100644
--- 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 89c40d0d7c..e42310f205 100644
--- 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}
-- 
2.39.2