webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-20 16:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

mtools enfernt.

Browse Source 
Keyserver des Pakfire geaendert.
ISDN aus dem Setup-Menue ausgebaut.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@758 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-08-11 13:15:05 +00:00
parent 05882fff6b
commit ca385da667
6 changed files with 10 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/install+setup/setup/main.c
View File

@@ -5,10 +5,6 @@
*
* (c) Lawrence Manning, 2001
* Contains main entry point, and misc functions.
*
* modified 16/11/2002 eoberlander - French language added
*
* $Id: main.c,v 1.4.2.7 2005/12/01 20:13:08 eoberlander Exp $
*
*/
@@ -84,7 +80,6 @@ int main(int argc, char *argv[])
if (!ctr)
{
/* zh,lt,ro,ru,th languages not available in setup, so use English */
for (choice = 0; shortlangnames[choice]; choice++)
{
if (strcmp(shortlangnames[choice], "en") == 0)
@@ -99,11 +94,10 @@ int main(int argc, char *argv[])
sections[1] = ctr[TR_TIMEZONE];
sections[2] = ctr[TR_HOSTNAME];
sections[3] = ctr[TR_DOMAINNAME];
sections[4] = ctr[TR_ISDN_CONFIGURATION];
sections[5] = ctr[TR_NETWORKING];
sections[6] = ctr[TR_ROOT_PASSWORD];
sections[7] = ctr[TR_ADMIN_PASSWORD];
sections[8] = NULL;
sections[4] = ctr[TR_NETWORKING];
sections[5] = ctr[TR_ROOT_PASSWORD];
sections[6] = ctr[TR_ADMIN_PASSWORD];
sections[7] = NULL;
newtInit();
newtCls();
@@ -151,18 +145,14 @@ int main(int argc, char *argv[])
break;
case 4:
handleisdn();
break;
case 5:
handlenetworking();
break;
case 6:
case 5:
handlerootpassword();
break;
case 7:
case 6:
handleadminpassword();
break;
@@ -181,8 +171,6 @@ int main(int argc, char *argv[])
goto EXIT;
if (!(handledomainname()))
goto EXIT;
// if (!(handleisdn()))
// goto EXIT;
if (!(handlenetworking()))
goto EXIT;
if (!(handledhcp()))
@@ -213,4 +201,3 @@ EXIT:
return 0;
}

5
src/pakfire/lib/functions.pl
View File

@@ -760,8 +760,9 @@ sub checkcryptodb {
unless ( "$ret" eq "0" ) {
message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
message("CRYPTO WARN: It's normal to see this on first execution.");
system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --status-fd 2 --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --status-fd 2 --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
my $command = "gpg --keyserver pgp.mit.edu --always-trust --status-fs 2";
system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
} else {
logger("CRYPTO INFO: Database is okay");
}