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/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index d12e8b39d99f73d098dd018d1811a178d1d6c23a..a374a383bb111b02ccadc5bd3b28332a744e2453 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -75,6 +75,7 @@ $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`;
 $qossettings{'IMQ_DEV'} = 'imq0';
 $qossettings{'TOS'} = '';
 $qossettings{'VALID'} = 'yes';
+$qossettings{'IMQ_MODE'} = 'PREROUTING';
 
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
 
@@ -498,6 +499,9 @@ foreach $subclassentry (sort @subclasses) {
                print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n";
        }
 }
+
+if ( $qossettings{'IMQ_MODE'} eq 'POSTROUTING' )
+{
 print <<END
 
        ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
@@ -509,6 +513,22 @@ print <<END
        ### SET TOS
 END
 ;
+}
+else
+{
+print <<END
+
+       ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
+       iptables -t mangle -N QOS-INC
+       iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0
+       iptables -t mangle -I PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
+       iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
+
+       ### SET TOS
+END
+;
+}
+
        foreach $tosruleentry (sort @tosrules)
        {
                @tosruleline = split( /\;/, $tosruleentry );
@@ -655,15 +675,18 @@ print <<END
        tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
        # STOP IMQ-DEVICE
        ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1
-       iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0
+       iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1
+       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0  >/dev/null 2>&1
        # rmmod imq # this crash on 2.6.25.xx
        # REMOVE & FLUSH CHAINS
        iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/dev/null 2>&1
        iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
        iptables -t mangle --flush  QOS-OUT >/dev/null 2>&1
        iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1
-       iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC
-       iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS
+       iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1
+       iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
+       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1
+       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
        iptables -t mangle --flush  QOS-INC >/dev/null 2>&1
        iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1
        iptables -t mangle --flush  QOS-TOS >/dev/null 2>&1

diff --git a/config/rootfiles/core/27/files b/config/rootfiles/core/27/files
index b69e5bfe92ff21b448383cfe3712c1df53a64384..97aef8eff09422ceaa53f67acd5a6b99c57f7893 100644 (file)
--- a/config/rootfiles/core/27/files
+++ b/config/rootfiles/core/27/files
@@ -57,3 +57,4 @@ usr/bin/wpakey
 usr/local/bin/rebuild-initrd
 var/ipfire/menu.d/20-status.menu
 srv/web/ipfire/cgi-bin/atm-status.cgi
+usr/local/bin/backupiso

diff --git a/config/rootfiles/packages/perl-gettext b/config/rootfiles/packages/perl-gettext
new file mode 100644 (file)
index 0000000..26eead6
--- /dev/null
+++ b/config/rootfiles/packages/perl-gettext
@@ -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 1449b81c3efb14986e553afa041c8145becf913c..ed14f20964c05b98d5f59e2f93167a0ff7ecbe69 100644 (file)
--- a/config/rootfiles/packages/vdradmin
+++ b/config/rootfiles/packages/vdradmin
@@ -1,243 +1,241 @@
-+opt/vdradmin
-#+opt/vdradmin/COPYING
-#+opt/vdradmin/CREDITS
-#+opt/vdradmin/ChangeLog
-#+opt/vdradmin/FAQ
-#+opt/vdradmin/HISTORY
-#+opt/vdradmin/INSTALL
-#+opt/vdradmin/LGPL.txt
-#+opt/vdradmin/README
-#+opt/vdradmin/README.translators
-#+opt/vdradmin/REQUIREMENTS
-+opt/vdradmin/autotimer2searchtimer.pl
-+opt/vdradmin/contrib
-+opt/vdradmin/contrib/HISTORY
-+opt/vdradmin/contrib/HISTORY.bigpatch
-+opt/vdradmin/contrib/HISTORY.ct
-+opt/vdradmin/contrib/HISTORY.macfly
-+opt/vdradmin/contrib/README.Streaming
-+opt/vdradmin/contrib/user.css.example
-+opt/vdradmin/contrib/vdradmind.bl_example
-+opt/vdradmin/convert.pl
-#+opt/vdradmin/install.sh
-+opt/vdradmin/lib
-+opt/vdradmin/lib/File
-+opt/vdradmin/lib/File/Temp.pm
-+opt/vdradmin/lib/MIME
-+opt/vdradmin/lib/MIME/Base64.pm
-+opt/vdradmin/lib/Template
-+opt/vdradmin/lib/Template.pm
-+opt/vdradmin/lib/Template/Base.pm
-+opt/vdradmin/lib/Template/Config.pm
-+opt/vdradmin/lib/Template/Constants.pm
-+opt/vdradmin/lib/Template/Context.pm
-+opt/vdradmin/lib/Template/Directive.pm
-+opt/vdradmin/lib/Template/Document.pm
-+opt/vdradmin/lib/Template/Exception.pm
-+opt/vdradmin/lib/Template/Filters.pm
-+opt/vdradmin/lib/Template/Grammar.pm
-+opt/vdradmin/lib/Template/Iterator.pm
-+opt/vdradmin/lib/Template/Namespace
-+opt/vdradmin/lib/Template/Namespace/Constants.pm
-+opt/vdradmin/lib/Template/Parser.pm
-+opt/vdradmin/lib/Template/Plugin
-+opt/vdradmin/lib/Template/Plugin.pm
-+opt/vdradmin/lib/Template/Plugin/Date.pm
-+opt/vdradmin/lib/Template/Plugin/HTML.pm
-+opt/vdradmin/lib/Template/Plugin/JavaScript.pm
-+opt/vdradmin/lib/Template/Plugins.pm
-+opt/vdradmin/lib/Template/Provider.pm
-+opt/vdradmin/lib/Template/Service.pm
-+opt/vdradmin/lib/Template/Stash
-+opt/vdradmin/lib/Template/Stash.pm
-+opt/vdradmin/lib/Template/Stash/Context.pm
-+opt/vdradmin/lib/Template/Stash/XS.pm
-+opt/vdradmin/lib/Template/Test.pm
-+opt/vdradmin/lib/Template/View.pm
-+opt/vdradmin/lib/URI
-+opt/vdradmin/lib/URI/Escape.pm
-+opt/vdradmin/locale
-+opt/vdradmin/locale/cs
-+opt/vdradmin/locale/cs/LC_MESSAGES
-+opt/vdradmin/locale/cs/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/cs_CZ.utf8
-+opt/vdradmin/locale/cs_CZ.utf8/LC_MESSAGES
-+opt/vdradmin/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/de
-+opt/vdradmin/locale/de/LC_MESSAGES
-+opt/vdradmin/locale/de/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/de_DE.utf8
-+opt/vdradmin/locale/de_DE.utf8/LC_MESSAGES
-+opt/vdradmin/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/en_US.utf8
-+opt/vdradmin/locale/en_US.utf8/LC_MESSAGES
-+opt/vdradmin/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/es
-+opt/vdradmin/locale/es/LC_MESSAGES
-+opt/vdradmin/locale/es/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/es_ES.utf8
-+opt/vdradmin/locale/es_ES.utf8/LC_MESSAGES
-+opt/vdradmin/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/fi
-+opt/vdradmin/locale/fi/LC_MESSAGES
-+opt/vdradmin/locale/fi/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/fi_FI.utf8
-+opt/vdradmin/locale/fi_FI.utf8/LC_MESSAGES
-+opt/vdradmin/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/fr
-+opt/vdradmin/locale/fr/LC_MESSAGES
-+opt/vdradmin/locale/fr/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/fr_FR.utf8
-+opt/vdradmin/locale/fr_FR.utf8/LC_MESSAGES
-+opt/vdradmin/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/it
-+opt/vdradmin/locale/it/LC_MESSAGES
-+opt/vdradmin/locale/it/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/it_IT.utf8
-+opt/vdradmin/locale/it_IT.utf8/LC_MESSAGES
-+opt/vdradmin/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/nl
-+opt/vdradmin/locale/nl/LC_MESSAGES
-+opt/vdradmin/locale/nl/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/nl_NL.utf8
-+opt/vdradmin/locale/nl_NL.utf8/LC_MESSAGES
-+opt/vdradmin/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/ru
-+opt/vdradmin/locale/ru/LC_MESSAGES
-+opt/vdradmin/locale/ru/LC_MESSAGES/vdradmin.mo
-+opt/vdradmin/locale/ru_RU.utf8
-+opt/vdradmin/locale/ru_RU.utf8/LC_MESSAGES
-+opt/vdradmin/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo
-#+opt/vdradmin/make.sh
-+opt/vdradmin/po
-+opt/vdradmin/po/cs.po
-+opt/vdradmin/po/cs_CZ.utf8.po
-+opt/vdradmin/po/de.po
-+opt/vdradmin/po/de_DE.utf8.po
-+opt/vdradmin/po/en_US.utf8.po
-+opt/vdradmin/po/es.po
-+opt/vdradmin/po/es_ES.utf8.po
-+opt/vdradmin/po/fi.po
-+opt/vdradmin/po/fi_FI.utf8.po
-+opt/vdradmin/po/fr.po
-+opt/vdradmin/po/fr_FR.utf8.po
-+opt/vdradmin/po/it.po
-+opt/vdradmin/po/it_IT.utf8.po
-+opt/vdradmin/po/nl.po
-+opt/vdradmin/po/nl_NL.utf8.po
-+opt/vdradmin/po/ru.po
-+opt/vdradmin/po/ru_RU.utf8.po
-+opt/vdradmin/po/vdradmin.pot
-+opt/vdradmin/template
-+opt/vdradmin/template/default
-+opt/vdradmin/template/default/about.html
-+opt/vdradmin/template/default/at_timer_list.html
-+opt/vdradmin/template/default/at_timer_new.html
-+opt/vdradmin/template/default/config.html
-+opt/vdradmin/template/default/default
-+opt/vdradmin/template/default/default/aktion.png
-+opt/vdradmin/template/default/default/close.png
-+opt/vdradmin/template/default/default/configure.png
-+opt/vdradmin/template/default/default/cut.png
-+opt/vdradmin/template/default/default/delete.png
-+opt/vdradmin/template/default/default/edit.png
-+opt/vdradmin/template/default/default/fern_03.jpg
-+opt/vdradmin/template/default/default/fern_05.jpg
-+opt/vdradmin/template/default/default/fern_06.jpg
-+opt/vdradmin/template/default/default/fern_07.jpg
-+opt/vdradmin/template/default/default/fern_08.jpg
-+opt/vdradmin/template/default/default/fern_09.jpg
-+opt/vdradmin/template/default/default/fern_10.jpg
-+opt/vdradmin/template/default/default/fern_11.jpg
-+opt/vdradmin/template/default/default/fern_12.jpg
-+opt/vdradmin/template/default/default/fern_13.jpg
-+opt/vdradmin/template/default/default/fern_15.jpg
-+opt/vdradmin/template/default/default/fern_18.jpg
-+opt/vdradmin/template/default/default/fern_19.jpg
-+opt/vdradmin/template/default/default/fern_22.jpg
-+opt/vdradmin/template/default/default/fern_23.jpg
-+opt/vdradmin/template/default/default/fern_24.jpg
-+opt/vdradmin/template/default/default/fern_25.jpg
-+opt/vdradmin/template/default/default/fern_28.jpg
-+opt/vdradmin/template/default/default/fern_31.jpg
-+opt/vdradmin/template/default/default/fern_32.jpg
-+opt/vdradmin/template/default/default/fern_33.jpg
-+opt/vdradmin/template/default/default/fern_36.jpg
-+opt/vdradmin/template/default/default/fern_39.jpg
-+opt/vdradmin/template/default/default/fern_40.jpg
-+opt/vdradmin/template/default/default/fern_41.jpg
-+opt/vdradmin/template/default/default/fern_42.jpg
-+opt/vdradmin/template/default/default/fern_43.jpg
-+opt/vdradmin/template/default/default/fern_44.jpg
-+opt/vdradmin/template/default/default/fern_45.jpg
-+opt/vdradmin/template/default/default/fern_46.jpg
-+opt/vdradmin/template/default/default/fern_47.jpg
-+opt/vdradmin/template/default/default/fern_48.jpg
-+opt/vdradmin/template/default/default/fern_back.jpg
-+opt/vdradmin/template/default/default/fern_mute.jpg
-+opt/vdradmin/template/default/default/find.png
-+opt/vdradmin/template/default/default/folder_video.png
-+opt/vdradmin/template/default/default/help.png
-+opt/vdradmin/template/default/default/imdb.png
-+opt/vdradmin/template/default/default/info_button.png
-+opt/vdradmin/template/default/default/info_button_disabled.png
-+opt/vdradmin/template/default/default/logo.png
-+opt/vdradmin/template/default/default/noise.gif
-+opt/vdradmin/template/default/default/pfeile_nachlinks.png
-+opt/vdradmin/template/default/default/pfeile_nachlinks_soft.png
-+opt/vdradmin/template/default/default/pfeile_nachrechts.png
-+opt/vdradmin/template/default/default/pfeile_nachrechts_soft.png
-+opt/vdradmin/template/default/default/play.png
-+opt/vdradmin/template/default/default/poempl_gelb.png
-+opt/vdradmin/template/default/default/poempl_grau.png
-+opt/vdradmin/template/default/default/poempl_gruen.png
-+opt/vdradmin/template/default/default/poempl_rot.png
-+opt/vdradmin/template/default/default/rec.gif
-+opt/vdradmin/template/default/default/rec_button.png
-+opt/vdradmin/template/default/default/sortiert_asc.gif
-+opt/vdradmin/template/default/default/sortiert_desc.gif
-+opt/vdradmin/template/default/default/spacer.gif
-+opt/vdradmin/template/default/default/stream.png
-+opt/vdradmin/template/default/default/sum_find.png
-+opt/vdradmin/template/default/default/tv_bottom.gif
-+opt/vdradmin/template/default/default/udef_search.png
-+opt/vdradmin/template/default/default/view.png
-+opt/vdradmin/template/default/epgsearch_config.html
-+opt/vdradmin/template/default/epgsearch_list.html
-+opt/vdradmin/template/default/epgsearch_new.html
-+opt/vdradmin/template/default/error.html
-+opt/vdradmin/template/default/favicon.ico
-+opt/vdradmin/template/default/help_at_timer_list.html
-+opt/vdradmin/template/default/help_at_timer_new.html
-+opt/vdradmin/template/default/help_config.html
-+opt/vdradmin/template/default/help_edit_epg.html
-+opt/vdradmin/template/default/help_no.html
-+opt/vdradmin/template/default/help_rec_list.html
-+opt/vdradmin/template/default/help_timer_list.html
-+opt/vdradmin/template/default/help_timer_new.html
-+opt/vdradmin/template/default/index.html
-+opt/vdradmin/template/default/infobox.js
-+opt/vdradmin/template/default/library.js
-+opt/vdradmin/template/default/navigation.html
-+opt/vdradmin/template/default/noauth.html
-+opt/vdradmin/template/default/noperm.html
-+opt/vdradmin/template/default/prog_detail.html
-+opt/vdradmin/template/default/prog_detail_form.html
-+opt/vdradmin/template/default/prog_list.html
-+opt/vdradmin/template/default/prog_list2.html
-+opt/vdradmin/template/default/prog_summary.html
-+opt/vdradmin/template/default/prog_summary2.html
-+opt/vdradmin/template/default/prog_timeline.html
-+opt/vdradmin/template/default/rc.html
-+opt/vdradmin/template/default/rec_edit.html
-+opt/vdradmin/template/default/rec_list.html
-+opt/vdradmin/template/default/style.css
-+opt/vdradmin/template/default/timeline.js
-+opt/vdradmin/template/default/timer_list.html
-+opt/vdradmin/template/default/timer_new.html
-+opt/vdradmin/template/default/tv.html
-+opt/vdradmin/template/default/vdr_cmds.html
-#+opt/vdradmin/uninstall.sh
-+opt/vdradmin/vdradmind
-+opt/vdradmin/vdradmind.pl
-#+opt/vdradmin/vdradmind.pl.1
+#opt/vdradmin/CREDITS
+#opt/vdradmin/ChangeLog
+#opt/vdradmin/FAQ
+#opt/vdradmin/HISTORY
+#opt/vdradmin/INSTALL
+#opt/vdradmin/LGPL.txt
+#opt/vdradmin/README
+#opt/vdradmin/README.translators
+#opt/vdradmin/REQUIREMENTS
+opt/vdradmin/autotimer2searchtimer.pl
+opt/vdradmin/contrib
+opt/vdradmin/contrib/HISTORY
+opt/vdradmin/contrib/HISTORY.bigpatch
+opt/vdradmin/contrib/HISTORY.ct
+opt/vdradmin/contrib/HISTORY.macfly
+opt/vdradmin/contrib/README.Streaming
+opt/vdradmin/contrib/user.css.example
+opt/vdradmin/contrib/vdradmind.bl_example
+opt/vdradmin/convert.pl
+#opt/vdradmin/install.sh
+opt/vdradmin/lib
+opt/vdradmin/lib/File
+opt/vdradmin/lib/File/Temp.pm
+opt/vdradmin/lib/MIME
+opt/vdradmin/lib/MIME/Base64.pm
+opt/vdradmin/lib/Template
+opt/vdradmin/lib/Template.pm
+opt/vdradmin/lib/Template/Base.pm
+opt/vdradmin/lib/Template/Config.pm
+opt/vdradmin/lib/Template/Constants.pm
+opt/vdradmin/lib/Template/Context.pm
+opt/vdradmin/lib/Template/Directive.pm
+opt/vdradmin/lib/Template/Document.pm
+opt/vdradmin/lib/Template/Exception.pm
+opt/vdradmin/lib/Template/Filters.pm
+opt/vdradmin/lib/Template/Grammar.pm
+opt/vdradmin/lib/Template/Iterator.pm
+opt/vdradmin/lib/Template/Namespace
+opt/vdradmin/lib/Template/Namespace/Constants.pm
+opt/vdradmin/lib/Template/Parser.pm
+opt/vdradmin/lib/Template/Plugin
+opt/vdradmin/lib/Template/Plugin.pm
+opt/vdradmin/lib/Template/Plugin/Date.pm
+opt/vdradmin/lib/Template/Plugin/HTML.pm
+opt/vdradmin/lib/Template/Plugin/JavaScript.pm
+opt/vdradmin/lib/Template/Plugins.pm
+opt/vdradmin/lib/Template/Provider.pm
+opt/vdradmin/lib/Template/Service.pm
+opt/vdradmin/lib/Template/Stash
+opt/vdradmin/lib/Template/Stash.pm
+opt/vdradmin/lib/Template/Stash/Context.pm
+opt/vdradmin/lib/Template/Stash/XS.pm
+opt/vdradmin/lib/Template/Test.pm
+opt/vdradmin/lib/Template/View.pm
+opt/vdradmin/lib/URI
+opt/vdradmin/lib/URI/Escape.pm
+opt/vdradmin/locale
+opt/vdradmin/locale/cs
+opt/vdradmin/locale/cs/LC_MESSAGES
+opt/vdradmin/locale/cs/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/cs_CZ.utf8
+opt/vdradmin/locale/cs_CZ.utf8/LC_MESSAGES
+opt/vdradmin/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/de
+opt/vdradmin/locale/de/LC_MESSAGES
+opt/vdradmin/locale/de/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/de_DE.utf8
+opt/vdradmin/locale/de_DE.utf8/LC_MESSAGES
+opt/vdradmin/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/en_US.utf8
+opt/vdradmin/locale/en_US.utf8/LC_MESSAGES
+opt/vdradmin/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/es
+opt/vdradmin/locale/es/LC_MESSAGES
+opt/vdradmin/locale/es/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/es_ES.utf8
+opt/vdradmin/locale/es_ES.utf8/LC_MESSAGES
+opt/vdradmin/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/fi
+opt/vdradmin/locale/fi/LC_MESSAGES
+opt/vdradmin/locale/fi/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/fi_FI.utf8
+opt/vdradmin/locale/fi_FI.utf8/LC_MESSAGES
+opt/vdradmin/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/fr
+opt/vdradmin/locale/fr/LC_MESSAGES
+opt/vdradmin/locale/fr/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/fr_FR.utf8
+opt/vdradmin/locale/fr_FR.utf8/LC_MESSAGES
+opt/vdradmin/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/it
+opt/vdradmin/locale/it/LC_MESSAGES
+opt/vdradmin/locale/it/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/it_IT.utf8
+opt/vdradmin/locale/it_IT.utf8/LC_MESSAGES
+opt/vdradmin/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/nl
+opt/vdradmin/locale/nl/LC_MESSAGES
+opt/vdradmin/locale/nl/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/nl_NL.utf8
+opt/vdradmin/locale/nl_NL.utf8/LC_MESSAGES
+opt/vdradmin/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/ru
+opt/vdradmin/locale/ru/LC_MESSAGES
+opt/vdradmin/locale/ru/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/ru_RU.utf8
+opt/vdradmin/locale/ru_RU.utf8/LC_MESSAGES
+opt/vdradmin/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo
+#opt/vdradmin/make.sh
+opt/vdradmin/po
+opt/vdradmin/po/cs.po
+opt/vdradmin/po/cs_CZ.utf8.po
+opt/vdradmin/po/de.po
+opt/vdradmin/po/de_DE.utf8.po
+opt/vdradmin/po/en_US.utf8.po
+opt/vdradmin/po/es.po
+opt/vdradmin/po/es_ES.utf8.po
+opt/vdradmin/po/fi.po
+opt/vdradmin/po/fi_FI.utf8.po
+opt/vdradmin/po/fr.po
+opt/vdradmin/po/fr_FR.utf8.po
+opt/vdradmin/po/it.po
+opt/vdradmin/po/it_IT.utf8.po
+opt/vdradmin/po/nl.po
+opt/vdradmin/po/nl_NL.utf8.po
+opt/vdradmin/po/ru.po
+opt/vdradmin/po/ru_RU.utf8.po
+opt/vdradmin/po/vdradmin.pot
+opt/vdradmin/template
+opt/vdradmin/template/default
+opt/vdradmin/template/default/about.html
+opt/vdradmin/template/default/at_timer_list.html
+opt/vdradmin/template/default/at_timer_new.html
+opt/vdradmin/template/default/config.html
+opt/vdradmin/template/default/default
+opt/vdradmin/template/default/default/aktion.png
+opt/vdradmin/template/default/default/close.png
+opt/vdradmin/template/default/default/configure.png
+opt/vdradmin/template/default/default/cut.png
+opt/vdradmin/template/default/default/delete.png
+opt/vdradmin/template/default/default/edit.png
+opt/vdradmin/template/default/default/fern_03.jpg
+opt/vdradmin/template/default/default/fern_05.jpg
+opt/vdradmin/template/default/default/fern_06.jpg
+opt/vdradmin/template/default/default/fern_07.jpg
+opt/vdradmin/template/default/default/fern_08.jpg
+opt/vdradmin/template/default/default/fern_09.jpg
+opt/vdradmin/template/default/default/fern_10.jpg
+opt/vdradmin/template/default/default/fern_11.jpg
+opt/vdradmin/template/default/default/fern_12.jpg
+opt/vdradmin/template/default/default/fern_13.jpg
+opt/vdradmin/template/default/default/fern_15.jpg
+opt/vdradmin/template/default/default/fern_18.jpg
+opt/vdradmin/template/default/default/fern_19.jpg
+opt/vdradmin/template/default/default/fern_22.jpg
+opt/vdradmin/template/default/default/fern_23.jpg
+opt/vdradmin/template/default/default/fern_24.jpg
+opt/vdradmin/template/default/default/fern_25.jpg
+opt/vdradmin/template/default/default/fern_28.jpg
+opt/vdradmin/template/default/default/fern_31.jpg
+opt/vdradmin/template/default/default/fern_32.jpg
+opt/vdradmin/template/default/default/fern_33.jpg
+opt/vdradmin/template/default/default/fern_36.jpg
+opt/vdradmin/template/default/default/fern_39.jpg
+opt/vdradmin/template/default/default/fern_40.jpg
+opt/vdradmin/template/default/default/fern_41.jpg
+opt/vdradmin/template/default/default/fern_42.jpg
+opt/vdradmin/template/default/default/fern_43.jpg
+opt/vdradmin/template/default/default/fern_44.jpg
+opt/vdradmin/template/default/default/fern_45.jpg
+opt/vdradmin/template/default/default/fern_46.jpg
+opt/vdradmin/template/default/default/fern_47.jpg
+opt/vdradmin/template/default/default/fern_48.jpg
+opt/vdradmin/template/default/default/fern_back.jpg
+opt/vdradmin/template/default/default/fern_mute.jpg
+opt/vdradmin/template/default/default/find.png
+opt/vdradmin/template/default/default/folder_video.png
+opt/vdradmin/template/default/default/help.png
+opt/vdradmin/template/default/default/imdb.png
+opt/vdradmin/template/default/default/info_button.png
+opt/vdradmin/template/default/default/info_button_disabled.png
+opt/vdradmin/template/default/default/logo.png
+opt/vdradmin/template/default/default/noise.gif
+opt/vdradmin/template/default/default/pfeile_nachlinks.png
+opt/vdradmin/template/default/default/pfeile_nachlinks_soft.png
+opt/vdradmin/template/default/default/pfeile_nachrechts.png
+opt/vdradmin/template/default/default/pfeile_nachrechts_soft.png
+opt/vdradmin/template/default/default/play.png
+opt/vdradmin/template/default/default/poempl_gelb.png
+opt/vdradmin/template/default/default/poempl_grau.png
+opt/vdradmin/template/default/default/poempl_gruen.png
+opt/vdradmin/template/default/default/poempl_rot.png
+opt/vdradmin/template/default/default/rec.gif
+opt/vdradmin/template/default/default/rec_button.png
+opt/vdradmin/template/default/default/sortiert_asc.gif
+opt/vdradmin/template/default/default/sortiert_desc.gif
+opt/vdradmin/template/default/default/spacer.gif
+opt/vdradmin/template/default/default/stream.png
+opt/vdradmin/template/default/default/sum_find.png
+opt/vdradmin/template/default/default/tv_bottom.gif
+opt/vdradmin/template/default/default/udef_search.png
+opt/vdradmin/template/default/default/view.png
+opt/vdradmin/template/default/epgsearch_config.html
+opt/vdradmin/template/default/epgsearch_list.html
+opt/vdradmin/template/default/epgsearch_new.html
+opt/vdradmin/template/default/error.html
+opt/vdradmin/template/default/favicon.ico
+opt/vdradmin/template/default/help_at_timer_list.html
+opt/vdradmin/template/default/help_at_timer_new.html
+opt/vdradmin/template/default/help_config.html
+opt/vdradmin/template/default/help_edit_epg.html
+opt/vdradmin/template/default/help_no.html
+opt/vdradmin/template/default/help_rec_list.html
+opt/vdradmin/template/default/help_timer_list.html
+opt/vdradmin/template/default/help_timer_new.html
+opt/vdradmin/template/default/index.html
+opt/vdradmin/template/default/infobox.js
+opt/vdradmin/template/default/library.js
+opt/vdradmin/template/default/navigation.html
+opt/vdradmin/template/default/noauth.html
+opt/vdradmin/template/default/noperm.html
+opt/vdradmin/template/default/prog_detail.html
+opt/vdradmin/template/default/prog_detail_form.html
+opt/vdradmin/template/default/prog_list.html
+opt/vdradmin/template/default/prog_list2.html
+opt/vdradmin/template/default/prog_summary.html
+opt/vdradmin/template/default/prog_summary2.html
+opt/vdradmin/template/default/prog_timeline.html
+opt/vdradmin/template/default/rc.html
+opt/vdradmin/template/default/rec_edit.html
+opt/vdradmin/template/default/rec_list.html
+opt/vdradmin/template/default/style.css
+opt/vdradmin/template/default/timeline.js
+opt/vdradmin/template/default/timer_list.html
+opt/vdradmin/template/default/timer_new.html
+opt/vdradmin/template/default/tv.html
+opt/vdradmin/template/default/vdr_cmds.html
+#opt/vdradmin/uninstall.sh
+opt/vdradmin/vdradmind
+opt/vdradmin/vdradmind.pl
+#opt/vdradmin/vdradmind.pl.1

diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio
index 0c6e70ebf73c76a015873e9c3061463b348b9d3f..0251d57866d2746dbbdf0e43561404bee417654b 100644 (file)
--- a/lfs/mkinitcpio
+++ b/lfs/mkinitcpio
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio
        sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata filesystems"|g' /etc/mkinitcpio.conf
        sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3"|g' /etc/mkinitcpio.conf
-#      sed -i 's|ide-cd|ide-cd_mod|g' /lib/initcpio/install/ide
+       sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/vdradmin b/lfs/vdradmin
index 217bd6a825a881a21265cc7e0250dfd62545d891..00e00f46a289184ebd2bd3852dac733151470b24 100644 (file)
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdradmin
 PAK_VER    = 1
 
-DEPS       = "perl-gettext"
+DEPS       = perl-gettext vdr
 
 ###############################################################################
 # Top-level Rules
@@ -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/snort b/src/initscripts/init.d/snort
index 16f7953ef37be9cf3b88b3e083ee87d45455b1e9..a2db0de0fb4286095caabe0dd2724dc5be843c60 100644 (file)
--- a/src/initscripts/init.d/snort
+++ b/src/initscripts/init.d/snort
@@ -74,6 +74,7 @@ case "$1" in
                              IFACE=`/bin/cat /var/ipfire/red/iface 2>/dev/null | /usr/bin/tr -d '\012'`
                        sed -e "s/^Interface.*/Interface       ${IFACE}/" /var/ipfire/guardian/guardian.conf > temp
                        mv temp /var/ipfire/guardian/guardian.conf
+                       chown nobody.root /var/ipfire/guardian/guardian.conf
                      
                   boot_mesg "Starting Guardian..."
                              loadproc /usr/local/bin/guardian.pl -c /var/ipfire/guardian/guardian.conf

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 84cc51e997d5d31431a81e3320d7398f4c63c5cd..8c7f064364cf45c4f3a640affcfcd6bbe2c73e1f 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -90,7 +90,9 @@ int main(int argc, char *argv[])
        newtInit();
        newtCls();
 
-       /* Do usb detection first for usb keyboard */
+       newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
+       sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
+
        if (! (cmdfile = fopen("/proc/cmdline", "r")))
        {
                fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
@@ -104,8 +106,14 @@ int main(int argc, char *argv[])
                }               
        }
 
-       // mysystem("/sbin/modprobe ide-generic");
-       // mysystem("/sbin/modprobe generic");
+       // Load ata-piix prior kudzu because kudzu use ata-generic for ich7
+       mysystem("/sbin/modprobe ata_piix");
+
+       // Starting hardware detection
+       runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ...");
+
+       // Load common modules
+       mysystem("/sbin/modprobe ide-generic");
        mysystem("/sbin/modprobe ide-cd");
        mysystem("/sbin/modprobe ide-disk");
        mysystem("/sbin/modprobe uhci-hcd");
@@ -138,12 +146,7 @@ int main(int argc, char *argv[])
        ctr = langtrs[choice];
        strcpy(shortlangname, shortlangnames[choice]);
 
-       newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
        newtPushHelpLine(ctr[TR_HELPLINE]);
-       sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
-
-       // Starting hardware detection
-       runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
 
        sprintf(message, ctr[TR_WELCOME], NAME);
        newtWinMessage(title, ctr[TR_OK], message);

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index ba1725213a2a4b7a7f2275ccad1e973d58d93ec0..bbcfe29c9e5b833585579842e00edeb6bf5c194c 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -2,7 +2,7 @@
 
 # FIXME: edit this lines before release
 URL=http://download.ipfire.org/iso/
-ISO=ipfire-2.3.i586-full.iso
+ISO=ipfire-2.3.i586-full-core27.iso
 #URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/
 #ISO=ipfire-2.3-test.i586-full.iso