Merge branch 'toolchain' into next

diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files
index 207ff839f17e3cb92ecbe667d3484f29365fd169..26ac36080a49b4989bb75cf4d8edb0f9f00a8794 100644 (file)
--- a/config/rootfiles/core/125/filelists/files
+++ b/config/rootfiles/core/125/filelists/files
@@ -3,4 +3,5 @@ etc/issue
 etc/ssh/sshd_config
 etc/sysctl.conf
 srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
 var/ipfire/langs

diff --git a/doc/language_issues.de b/doc/language_issues.de
index d99efac7488984fc7d6c76d98a09fabbcd13d799..e9ca045485907bc6bdf090425c8c30bbe2e23e3f 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -259,6 +259,7 @@ WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
 WARNING: translation string unused: fwdfw till
 WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw useless rule
 WARNING: translation string unused: fwdfw xt access
 WARNING: translation string unused: fwhost Custom Host
 WARNING: translation string unused: fwhost Custom Network
@@ -469,6 +470,7 @@ WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn mtu-disc
 WARNING: translation string unused: ovpn mtu-disc and mtu not 1500
 WARNING: translation string unused: ovpn mtu-disc maybe
 WARNING: translation string unused: ovpn mtu-disc no
@@ -494,6 +496,9 @@ WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 60b6cbb465eebe8504b1edb5fc46d055e4e73d23..de3048a4c34f3d19899b6864c47f9fbeb3d00db8 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -283,6 +283,7 @@ WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
 WARNING: translation string unused: fwdfw till
 WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw useless rule
 WARNING: translation string unused: fwdfw xt access
 WARNING: translation string unused: fwhost Custom Host
 WARNING: translation string unused: fwhost Custom Network
@@ -497,6 +498,7 @@ WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn mtu-disc
 WARNING: translation string unused: ovpn mtu-disc and mtu not 1500
 WARNING: translation string unused: ovpn mtu-disc maybe
 WARNING: translation string unused: ovpn mtu-disc no
@@ -521,6 +523,9 @@ WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key

diff --git a/doc/language_issues.es b/doc/language_issues.es
index a9bf73f69e972b09b40924638714afbef86d9540..6a8acd6da8dfa0fdae0a779e449ae30f02e7014d 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -421,6 +421,9 @@ WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key
@@ -894,7 +897,6 @@ WARNING: untranslated string: fwdfw togglelog
 WARNING: untranslated string: fwdfw use nat
 WARNING: untranslated string: fwdfw use srcport
 WARNING: untranslated string: fwdfw use srv
-WARNING: untranslated string: fwdfw useless rule
 WARNING: untranslated string: fwdfw warn1
 WARNING: untranslated string: fwdfw wd_fri
 WARNING: untranslated string: fwdfw wd_mon
@@ -1097,7 +1099,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates
 WARNING: untranslated string: ovpn ha
 WARNING: untranslated string: ovpn hmac
 WARNING: untranslated string: ovpn mgmt in root range
-WARNING: untranslated string: ovpn mtu-disc
 WARNING: untranslated string: ovpn no connections
 WARNING: untranslated string: ovpn port in root range
 WARNING: untranslated string: ovpn routes push

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 4aaf5d3fb0c11482ab2843fd91b9430a23aeb644..271179cc692ffe1afbb0d85950b9cbb8bbc6b873 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -430,6 +430,9 @@ WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key
@@ -903,7 +906,6 @@ WARNING: untranslated string: fwdfw togglelog
 WARNING: untranslated string: fwdfw use nat
 WARNING: untranslated string: fwdfw use srcport
 WARNING: untranslated string: fwdfw use srv
-WARNING: untranslated string: fwdfw useless rule
 WARNING: untranslated string: fwdfw warn1
 WARNING: untranslated string: fwdfw wd_fri
 WARNING: untranslated string: fwdfw wd_mon
@@ -1111,7 +1113,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates
 WARNING: untranslated string: ovpn ha
 WARNING: untranslated string: ovpn hmac
 WARNING: untranslated string: ovpn mgmt in root range
-WARNING: untranslated string: ovpn mtu-disc
 WARNING: untranslated string: ovpn no connections
 WARNING: untranslated string: ovpn port in root range
 WARNING: untranslated string: ovpn warning rfc3280

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 448c96bb14f8df13e244485f9176484ddc983a11..ac51eb07c8a7fd214690f54c179fc1018a6fd20c 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -259,6 +259,7 @@ WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
 WARNING: translation string unused: fwdfw till
 WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw useless rule
 WARNING: translation string unused: fwdfw xt access
 WARNING: translation string unused: fwhost Custom Host
 WARNING: translation string unused: fwhost Custom Network
@@ -469,6 +470,7 @@ WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn mtu-disc
 WARNING: translation string unused: ovpn mtu-disc and mtu not 1500
 WARNING: translation string unused: ovpn mtu-disc maybe
 WARNING: translation string unused: ovpn mtu-disc no
@@ -493,6 +495,9 @@ WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index a0216f0f7c6b5207cd56821d21ab6415ea517780..18307d5af8411ee48a9d86dfcc7a7ba7cf784a9e 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -258,6 +258,7 @@ WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
 WARNING: translation string unused: fwdfw till
 WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw useless rule
 WARNING: translation string unused: fwdfw xt access
 WARNING: translation string unused: fwhost Custom Host
 WARNING: translation string unused: fwhost Custom Network
@@ -466,6 +467,7 @@ WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn mtu-disc
 WARNING: translation string unused: ovpn mtu-disc and mtu not 1500
 WARNING: translation string unused: ovpn mtu-disc maybe
 WARNING: translation string unused: ovpn mtu-disc no
@@ -490,6 +492,9 @@ WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index a9bf73f69e972b09b40924638714afbef86d9540..6a8acd6da8dfa0fdae0a779e449ae30f02e7014d 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -421,6 +421,9 @@ WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key
@@ -894,7 +897,6 @@ WARNING: untranslated string: fwdfw togglelog
 WARNING: untranslated string: fwdfw use nat
 WARNING: untranslated string: fwdfw use srcport
 WARNING: untranslated string: fwdfw use srv
-WARNING: untranslated string: fwdfw useless rule
 WARNING: untranslated string: fwdfw warn1
 WARNING: untranslated string: fwdfw wd_fri
 WARNING: untranslated string: fwdfw wd_mon
@@ -1097,7 +1099,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates
 WARNING: untranslated string: ovpn ha
 WARNING: untranslated string: ovpn hmac
 WARNING: untranslated string: ovpn mgmt in root range
-WARNING: untranslated string: ovpn mtu-disc
 WARNING: untranslated string: ovpn no connections
 WARNING: untranslated string: ovpn port in root range
 WARNING: untranslated string: ovpn routes push

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index cbcaca1ec8e72dd5aec010fa90cef6c554d151f8..3a7b6b95fbaa3d8ac705366a86c61ca33bfc2ee5 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -424,6 +424,9 @@ WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key
@@ -888,7 +891,6 @@ WARNING: untranslated string: fwdfw togglelog
 WARNING: untranslated string: fwdfw use nat
 WARNING: untranslated string: fwdfw use srcport
 WARNING: untranslated string: fwdfw use srv
-WARNING: untranslated string: fwdfw useless rule
 WARNING: untranslated string: fwdfw warn1
 WARNING: untranslated string: fwdfw wd_fri
 WARNING: untranslated string: fwdfw wd_mon
@@ -1096,7 +1098,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates
 WARNING: untranslated string: ovpn ha
 WARNING: untranslated string: ovpn hmac
 WARNING: untranslated string: ovpn mgmt in root range
-WARNING: untranslated string: ovpn mtu-disc
 WARNING: untranslated string: ovpn no connections
 WARNING: untranslated string: ovpn port in root range
 WARNING: untranslated string: ovpn warning rfc3280

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 8a7ca44c172eddda264aa2f5032ce9d42d3eee23..7b5bc05591d66b2ad678bfecb743c647b48c10c6 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -283,6 +283,7 @@ WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
 WARNING: translation string unused: fwdfw till
 WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw useless rule
 WARNING: translation string unused: fwdfw xt access
 WARNING: translation string unused: fwhost Custom Host
 WARNING: translation string unused: fwhost Custom Network
@@ -497,6 +498,7 @@ WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn mtu-disc
 WARNING: translation string unused: ovpn mtu-disc and mtu not 1500
 WARNING: translation string unused: ovpn mtu-disc maybe
 WARNING: translation string unused: ovpn mtu-disc no
@@ -521,6 +523,9 @@ WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 79ff636c804d408230526b622924ef578b5225fd..e6f3cda94aaa04f0377f2992bf2b50611b29b800 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -278,20 +278,6 @@ print <<END;
        </table>
 END
 
-&Header::closebox();
-&Header::openbox("100%", "center", "$Lang::tr{'settings'}");
-
-print <<END;
-       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-               <table width='95%'>
-                       <tr><td colspan='2' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b></td></tr>
-                       <tr><td align='left' width='45%'>$Lang::tr{'pakfire update daily'}</td><td width="55%" align="left">
-          on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} /> |
-          <input type='radio' name='AUTOUPDATE' value='off' $checked{'AUTOUPDATE'}{'off'} /> off </td></tr>
-               </table>
-       </form>
-END
-
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();

diff --git a/src/installer/hw.c b/src/installer/hw.c
index 8189aba18c08cfc72e93bed23fa6e7604c79085f..b329db545b843729f609214f7d53afbf37257dbe 100644 (file)
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -706,7 +706,6 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) {
                if (*dest->part_bootldr) {
                        asprintf(&cmd, "%s set %d bios_grub on", cmd, dest->part_boot_idx);
                }
-               asprintf(&cmd, "%s disk_set pmbr_boot on", cmd);
        }
 
        r = mysystem(output, cmd);