Revision d415dda2 image_creator/main.py

b/image_creator/main.py
121 121
                      "input media", default=[], action="append",
122 122
                      metavar="SYSPREP")
123 123

  
124
    parser.add_option("--sysprep-param", dest="sysprep_params", default=[],
125
                      help="Add KEY=VALUE system preparation parameter",
126
                      action="append")
127

  
124 128
    parser.add_option("--no-sysprep", dest="sysprep", default=True,
125 129
                      help="don't perform any system preparation operation",
126 130
                      action="store_false")
......
170 174
        meta[key] = value
171 175
    options.metadata = meta
172 176

  
177
    sysprep_params = {}
178
    for p in options.sysprep_params:
179
        try:
180
            key, value = p.split('=', 1)
181
        except ValueError:
182
            raise FatalError("Sysprep parameter optiont: `%s' is not in "
183
                             "KEY=VALUE format." % p)
184
        sysprep_params[key] = value
185
    options.sysprep_params = sysprep_params
186

  
173 187
    return options
174 188

  
175 189

  
......
253 267
    try:
254 268
        snapshot = disk.snapshot()
255 269

  
256
        image = disk.get_image(snapshot)
270
        image = disk.get_image(snapshot, sysprep_params=options.sysprep_params)
257 271

  
258 272
        for sysprep in options.disabled_syspreps:
259 273
            image.os.disable_sysprep(image.os.get_sysprep_by_name(sysprep))

Also available in: Unified diff