X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib_internal%2Fmatchlist-initmanually.c;h=7ce0b8efcf832bcb6f774a169f0b44bed88adbaa;hb=3b6a82bbcaca5d27dee88ec1f2ddf77ae9b8ce24;hp=111ab420e97551bdf261a3d60e73773b892b3d16;hpb=5269e9607d89ac4dbd34f9adb5b14fb5dfc9b1a5;p=util-vserver.git diff --git a/util-vserver/lib_internal/matchlist-initmanually.c b/util-vserver/lib_internal/matchlist-initmanually.c index 111ab42..7ce0b8e 100644 --- a/util-vserver/lib_internal/matchlist-initmanually.c +++ b/util-vserver/lib_internal/matchlist-initmanually.c @@ -37,8 +37,8 @@ #include -extern int Global_getVerbosity(); -extern bool Global_doRenew(); +extern int Global_getVerbosity() PURE CONST; +extern bool Global_doRenew() PURE CONST; static void readExcludeListFD(int fd, @@ -146,7 +146,8 @@ getConfigfileList(char const *vserver, } void -MatchList_initManually(struct MatchList *list, char const *vserver, +MatchList_initManually(struct MatchList *list, + struct MatchVserverInfo const *vserver, char const *vdir, char const *exclude_file) { char *buf[2] = { 0,0 }; @@ -157,25 +158,25 @@ MatchList_initManually(struct MatchList *list, char const *vserver, char **expr_files = 0; size_t expr_count = 0; - if (Global_getVerbosity()>3) { + if (Global_getVerbosity()>=1) { WRITE_MSG(1, "Initializing exclude-list for "); WRITE_STR(1, vdir); if (vserver!=0) { WRITE_MSG(1, " ("); - WRITE_STR(1, vserver); + WRITE_STR(1, vserver->name); WRITE_MSG(1, ")"); } WRITE_MSG(1, "\n"); } - if (vserver && Global_doRenew()) { - if (Global_getVerbosity()>4) + if (vserver && vserver->use_pkgmgmt && Global_doRenew()) { + if (Global_getVerbosity()>=2) WRITE_MSG(1, " Fetching configuration-file list from packagemanagement\n"); - getConfigfileList(vserver, &fixed_files, &fixed_count, buf+0); + getConfigfileList(vserver->name, &fixed_files, &fixed_count, buf+0); } // abuse special values (NULL, empty string) to skip the next step if (exclude_file && *exclude_file) { - if (Global_getVerbosity()>4) WRITE_MSG(1, " Reading exclude file\n"); + if (Global_getVerbosity()>=6) WRITE_MSG(1, " Reading exclude file\n"); readExcludeList(exclude_file, &expr_files, &expr_count, buf+1);