X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvsched.c;h=215f879edc434a3cccf6237d64c1f99623c2946b;hb=d641b1e3fac4d105ac0c7d0739d4cff765387264;hp=1313f58a74b704e545d5460a3b5959943c0236d5;hpb=a9f7bc9b6a135281b9298dc60f740e6b1958cf19;p=util-vserver.git diff --git a/src/vsched.c b/src/vsched.c index 1313f58..215f879 100644 --- a/src/vsched.c +++ b/src/vsched.c @@ -183,7 +183,7 @@ static void do_dir_entry(struct vc_set_sched *sched, const char *name) if (!isNumber(buf, &val, true)) { WRITE_MSG(2, ENSC_WRAPPERS_PREFIX); WRITE_STR(2, name); - WRITE_MSG(2, ": is not a number\n"); + WRITE_MSG(2, ": is not an integer\n"); exit(1); } @@ -244,7 +244,7 @@ static void do_dir(xid_t xid, struct vc_set_sched *sched, const char *dir, int m #define SETVAL(ATTR,MASK) \ if (!isNumber(optarg, &tmp, false)) { \ - WRITE_MSG(2, ENSC_WRAPPERS_PREFIX "non-numeric value specified for '--" #ATTR "'\n"); \ + WRITE_MSG(2, ENSC_WRAPPERS_PREFIX "non-integer value specified for '--" #ATTR "'\n"); \ exit(wrapper_exit_code); \ } \ else { \ @@ -313,7 +313,8 @@ int main(int argc, char *argv[]) do_dir(xid, &sched, dir, missing_ok, 0); } else { - if (sched.set_mask!=0 && vc_set_sched(xid, &sched)==-1) { + if (sched.set_mask!=0 && sched.set_mask!=VC_VXSM_FORCE && + vc_set_sched(xid, &sched)==-1) { perror("vc_set_sched()"); exit(255); }