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=02aecd376b4db04be4bdb3aa2d4001e28cb3a01b;hpb=2fb6b6da0754ba35f18352e224d6239d437f8906;p=util-vserver.git diff --git a/util-vserver/lib_internal/matchlist-initmanually.c b/util-vserver/lib_internal/matchlist-initmanually.c index 02aecd3..7ce0b8e 100644 --- a/util-vserver/lib_internal/matchlist-initmanually.c +++ b/util-vserver/lib_internal/matchlist-initmanually.c @@ -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 }; @@ -162,15 +163,15 @@ MatchList_initManually(struct MatchList *list, char const *vserver, 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 (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