Fixed a bug in the lfs/vdradmin file Merge branch 'master' of

git://git.ipfire.org/ipfire-2.x

Conflicts:
	config/rootfiles/packages/vdradmin
	lfs/vdradmin
	src/initscripts/init.d/vdradmin

diff --git a/config/rootfiles/packages/perl-gettext-1.05 b/config/rootfiles/packages/perl-gettext-1.05
new file mode 100644 (file)
index 0000000..26eead6
--- /dev/null
+++ b/config/rootfiles/packages/perl-gettext-1.05
@@ -0,0 +1,7 @@
+/usr/lib/perl5/site_perl/5.8.8/i586-linux/Locale
+/usr/lib/perl5/site_perl/5.8.8/i586-linux/Locale/gettext.pm
+/usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Locale
+/usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Locale/gettext
+/usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Locale/gettext/.packlist
+/usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Locale/gettext/gettext.bs
+/usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Locale/gettext/gettext.so

diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin
index 19ba6d89c33ad414a2a5f84fec28b601d7fcec61..ed14f20964c05b98d5f59e2f93167a0ff7ecbe69 100644 (file)
--- a/config/rootfiles/packages/vdradmin
+++ b/config/rootfiles/packages/vdradmin
@@ -1,5 +1,3 @@
-opt/vdradmin
-#opt/vdradmin/COPYING
 #opt/vdradmin/CREDITS
 #opt/vdradmin/ChangeLog
 #opt/vdradmin/FAQ

diff --git a/lfs/vdradmin b/lfs/vdradmin
index 4636cd892ea2efbb912ab1f7144c96923b0e8272..00e00f46a289184ebd2bd3852dac733151470b24 100644 (file)
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -79,5 +79,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_SRC) && mv -vf vdradmin-am-$(VER) vdradmin && mv -vf vdradmin /opt
-       #@rm -rf $(DIR_APP)
+       cp src/initscripts/init.d/vdradmin /etc/init.d
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/init.d/vdradmin
index e0ef0612e5c30a0f29d6c4a34ff8d43913859afe..19045df67430ca32a2f3656168d51604d6ae133f 100644 (file)
--- a/src/initscripts/init.d/vdradmin
+++ b/src/initscripts/init.d/vdradmin
@@ -28,7 +28,7 @@ case "${1}" in
                
        stop)
                boot_mesg "Stopping VDR Webadministration Tool..."
-               killproc /opt/vdradmin/vdradmind.pl
+               killproc /usr/bin/vdradmind
                ;;
 
        restart)