Changeset 2610
- Timestamp:
- 09/06/07 19:48:35 (1 year ago)
- Files:
-
- trunk/scripts/vserver.functions (modified) (1 diff)
- trunk/src/vtag.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/scripts/vserver.functions
r2599 r2610 612 612 local tag 613 613 614 getFileValue tag "$vdir/tag" "$vdir/context" || return 0 614 getFileValue tag "$vdir/tag" "$vdir/context" 615 test -n "$tag" || return 0 615 616 616 617 OPTS_VTAG_CREATE=( --tag "$tag" ) trunk/src/vtag.c
r2599 r2610 110 110 goto exec; 111 111 } 112 if (args->tag == VC_DYNAMIC_XID) { 113 if (args->verbosity >= 1) { 114 WRITE_MSG(2, "You must specify the tag with '--tag'; try '--help' for more information\n"); 115 return wrapper_exit_code; 116 } 117 else { 118 WRITE_MSG(2, ENSC_WRAPPERS_PREFIX "WARNING: A dynamic tag has been specified, this is not supported\n"); 119 goto exec; 120 } 121 } 112 122 113 123 if (args->do_create) { … … 141 151 { 142 152 struct Arguments args = { 143 .tag = VC_ NOCTX,153 .tag = VC_DYNAMIC_XID, 144 154 .do_create = false, 145 155 .do_migrate = false, … … 174 184 else if (args.do_create && args.do_migrate) 175 185 WRITE_MSG(2, "Can not specify '--create' and '--migrate' at the same time; try '--help' for more information\n"); 176 else if (args.tag==VC_NOCTX)177 WRITE_MSG(2, "You must specify the tag with '--tag'; try '--help' for more information\n");178 186 else if (optind>=argc) 179 187 WRITE_MSG(2, "No command given; use '--help' for more information.\n");
