summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/nfsmount.c
diff options
context:
space:
mode:
Diffstat (limited to 'mdk-stage1/nfsmount.c')
-rw-r--r--mdk-stage1/nfsmount.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/mdk-stage1/nfsmount.c b/mdk-stage1/nfsmount.c
index 85ffb25c1..02d7ddba8 100644
--- a/mdk-stage1/nfsmount.c
+++ b/mdk-stage1/nfsmount.c
@@ -284,7 +284,6 @@ int nfsmount_prepare(const char *spec, char **mount_opts)
enum clnt_stat clnt_stat;
static struct nfs_mount_data data;
int nfs_mount_version;
- int val;
struct sockaddr_in server_addr;
struct sockaddr_in mount_server_addr;
struct pmap *pm_mnt;
@@ -297,12 +296,11 @@ int nfsmount_prepare(const char *spec, char **mount_opts)
char *s;
int port, mountport, proto, soft, intr;
int posix, nocto, noac, broken_suid, nolock;
- int retry, tcp;
+ int tcp;
int mountprog, mountvers, nfsprog, nfsvers;
int retval;
time_t t;
time_t prevt;
- time_t timeout;
nfs_mount_version = find_kernel_nfs_mount_version();
@@ -361,7 +359,6 @@ int nfsmount_prepare(const char *spec, char **mount_opts)
nolock = 1;
broken_suid = 0;
noac = 0;
- retry = 10000; /* 10000 minutes ~ 1 week */
tcp = 0;
mountprog = MOUNTPROG;
@@ -469,10 +466,8 @@ retry_mount:
retry_timeout.tv_usec = 0;
total_timeout.tv_sec = 20;
total_timeout.tv_usec = 0;
- timeout = time(NULL) + 60 * retry;
prevt = 0;
t = 30;
- val = 1;
/* be careful not to use too many CPU cycles */
@@ -677,7 +672,7 @@ retry_mount:
if (fsock != -1)
close(fsock);
return retval;
-}
+}
/*
* We need to translate between nfs status return values and
n173' href='#n173'>173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278
package timezone; # $Id: timezone.pm 269985 2010-06-09 22:02:57Z herton $

use diagnostics;
use strict;

use common;
use log;

sub get_timezone_prefix() {
    my $prefix = $::testing ? '' : $::prefix;
    $prefix . "/usr/share/zoneinfo";
}

sub getTimeZones() {
    my $tz_prefix = get_timezone_prefix();
    open(my $F, "cd $tz_prefix && find [A-Z]* -noleaf -type f |");
    my @l = difference2([ chomp_(<$F>) ], [ 'ROC', 'PRC' ]);
    close $F or die "cannot list the available zoneinfos";
    sort @l;
}

sub read() {
    my %t = getVarsFromSh("$::prefix/etc/sysconfig/clock") or return {};
    { timezone => $t{ZONE}, UTC => text2bool($t{UTC}) };
}

my $ntp_conf_file = "/etc/ntp.conf";

sub ntp_server() {
    find { $_ ne '127.127.1.0' } map { if_(/^\s*server\s+(\S*)/, $1) } cat_($::prefix . $ntp_conf_file);
}

sub set_ntp_server {
    my ($server) = @_;
    my $f = $::prefix . $ntp_conf_file;
    -f $f or return;

    my $pool_match = qr/\.pool\.ntp\.org$/;
    my @servers = $server =~ $pool_match  ? (map { "$_.$server" } 0 .. 2) : $server;

    my $added = 0;
    substInFile {
        if (/^#?\s*server\s+(\S*)/ && $1 ne '127.127.1.0') {
            $_ = $added ? $_ =~ $pool_match ? undef : "#server $1\n" : join('', map { "server $_\n" } @servers);
            $added = 1;
        }
    } $f;