vdradmin part II

diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin
index a040558499a2ee9c9a11203ef1ff19c4ffbb79fa..b9ae1a023dca3c87749ef241d35bc5d68a60360d 100644 (file)
--- a/config/rootfiles/packages/vdradmin
+++ b/config/rootfiles/packages/vdradmin
@@ -1,3 +1,8 @@
+etc/rc.d/init.d/vdradmin
+etc/rc.d/rc0.d/K01vdradmin
+etc/rc.d/rc6.d/K01vdradmin
+etc/rc.d/rc3.d/S99vdradmin
+etc/vdradmin/vdradmind.conf
 usr/bin/vdradmind
 #usr/share/doc/vdradmin
 #usr/share/doc/vdradmin/COPYING
@@ -18,21 +23,39 @@ usr/bin/vdradmind
 #usr/share/doc/vdradmin/contrib/user.css.example
 #usr/share/doc/vdradmin/contrib/vdradmind.bl_example
 #usr/share/locale/cs/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/cs_CZ.utf8
+#usr/share/locale/cs_CZ.utf8/LC_MESSAGES
 #usr/share/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo
 usr/share/locale/de/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/de_DE.utf8
+#usr/share/locale/de_DE.utf8/LC_MESSAGES
 usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/en_US.utf8
+#usr/share/locale/en_US.utf8/LC_MESSAGES
 usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/es/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/es_ES.utf8
+#usr/share/locale/es_ES.utf8/LC_MESSAGES
 #usr/share/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/fi/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/fi_FI.utf8
+#usr/share/locale/fi_FI.utf8/LC_MESSAGES
 #usr/share/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/fr/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/fr_FR.utf8
+#usr/share/locale/fr_FR.utf8/LC_MESSAGES
 #usr/share/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/it/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/it_IT.utf8
+#usr/share/locale/it_IT.utf8/LC_MESSAGES
 #usr/share/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/nl/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/nl_NL.utf8
+#usr/share/locale/nl_NL.utf8/LC_MESSAGES
 #usr/share/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/ru/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/ru_RU.utf8
+#usr/share/locale/ru_RU.utf8/LC_MESSAGES
 #usr/share/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo
 #usr/share/man/man1/vdradmind.1
 usr/share/vdradmin

diff --git a/lfs/initscripts b/lfs/initscripts
index 51c379430675de5c831f1bbc610f4c1c215194f0..dc196ef10a9be2af053a86841b5780b6384f9e70 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -138,6 +138,9 @@ $(TARGET) :
        ln -sf ../init.d/sslh        /etc/rc.d/rc3.d/S98sslh
        ln -sf ../init.d/sslh        /etc/rc.d/rc0.d/K02sslh
        ln -sf ../init.d/sslh        /etc/rc.d/rc6.d/K02sslh
+       ln -sf ../init.d/vdradmin    /etc/rc.d/rc3.d/S99vdradmin
+       ln -sf ../init.d/vdradmin    /etc/rc.d/rc0.d/K01vdradmin
+       ln -sf ../init.d/vdradmin    /etc/rc.d/rc6.d/K01vdradmin
 
        ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
        ln -sf ../init.d/modules     /etc/rc.d/rcsysinit.d/S05modules

diff --git a/lfs/perl-gettext b/lfs/perl-gettext
index 60f664be3b6b0dd9779b56620528ea509de930a8..63ec9703ee24b986bcc1ff21c5248cb10c4ce21f 100644 (file)
--- a/lfs/perl-gettext
+++ b/lfs/perl-gettext
@@ -32,6 +32,8 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = perl-gettext
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -51,8 +53,8 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-#dist: 
-#      make-packages.sh Archive-Tar $(THISAPP)-ipfire-beta-1
+dist: 
+       @$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum

diff --git a/lfs/vdradmin b/lfs/vdradmin
index 0a82363b0f754e63780d1c5ee3c09ef03088e061..7af667f6d5d89049758b313779a9d5dfe94045c3 100644 (file)
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -81,6 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        export "LANG=de_DE"
        cp $(DIR_SRC)/config/vdradmin/install-ipfire.sh $(DIR_APP)/
        cd $(DIR_APP) && ./install-ipfire.sh
-       # cp src/initscripts/init.d/vdradmin /etc/init.d
+       install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \
+                /etc/vdradmin/vdradmind.conf
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/init.d/vdradmin
index 19045df67430ca32a2f3656168d51604d6ae133f..e663b8d5182c3e71c82c95ee7930b352b7bc8c22 100644 (file)
--- a/src/initscripts/init.d/vdradmin
+++ b/src/initscripts/init.d/vdradmin
@@ -1,6 +1,6 @@
 #!/bin/sh
 ########################################################################
-# Begin $rc_base/init.d/vdradmind
+# Begin $rc_base/init.d/vdradmin
 #
 # Description : This is a script that starts vdradmind as deamon
 #
@@ -18,12 +18,7 @@
 case "${1}" in
        start)
                boot_mesg "Starting VDR Webadministration Tool..."
-               if [ "$(ps -A | grep vdradmind)" != "" ]; then
-                  boot_mesg "Error! Already running!"
-                  echo_failure
-                  exit 1;
-               fi
-               loadproc /opt/vdradmin/vdradmind.pl
+               loadproc /usr/bin/vdradmind
                ;;
                
        stop)
@@ -47,4 +42,4 @@ case "${1}" in
                ;;
 esac
 
-# End $rc_base/init.d/vdr
+# End $rc_base/init.d/vdradmin