Revision 23c82433 image_creator/os_type/windows.py

b/image_creator/os_type/windows.py
217 217

  
218 218
        # Query for the maximum number of reclaimable bytes
219 219
        cmd = (
220
            r'cmd /Q /C "SET SCRIPT=%TEMP%\QUERYMAX_%RANDOM%.TXT & ' +
220
            r'cmd /Q /V:ON /C "SET SCRIPT=%TEMP%\QUERYMAX_%RANDOM%.TXT & ' +
221 221
            r'ECHO SELECT DISK 0 > %SCRIPT% & ' +
222 222
            'ECHO SELECT PARTITION %d >> %%SCRIPT%% & ' % self.last_part_num +
223 223
            r'ECHO SHRINK QUERYMAX >> %SCRIPT% & ' +
224 224
            r'ECHO EXIT >> %SCRIPT% & ' +
225 225
            r'DISKPART /S %SCRIPT% & ' +
226
            r'IF ERRORLEVEL 1 EXIT /B 1 & ' +
226
            r'IF NOT !ERRORLEVEL! EQU 0 EXIT /B 1 & ' +
227 227
            r'DEL /Q %SCRIPT%"')
228 228

  
229 229
        stdout, stderr, rc = self._guest_exec(cmd)
......
255 255
            self.out.warn("Not enought available space to shrink the image!")
256 256
            return
257 257

  
258
        self.out.output("\tReclaiming %dMB ..." % querymax)
259

  
258 260
        cmd = (
259
            r'cmd /Q /C "SET SCRIPT=%TEMP%\QUERYMAX_%RANDOM%.TXT & ' +
261
            r'cmd /Q /V:ON /C "SET SCRIPT=%TEMP%\QUERYMAX_%RANDOM%.TXT & ' +
260 262
            r'ECHO SELECT DISK 0 > %SCRIPT% & ' +
261 263
            'ECHO SELECT PARTITION %d >> %%SCRIPT%% & ' % self.last_part_num +
262 264
            'ECHO SHRINK DESIRED=%d >> %%SCRIPT%% & ' % querymax +
263 265
            r'ECHO EXIT >> %SCRIPT% & ' +
264 266
            r'DISKPART /S %SCRIPT% & ' +
265
            r'IF ERRORLEVEL 1 EXIT /B 1 & ' +
267
            r'IF NOT !ERRORLEVEL! EQU 0 EXIT /B 1 & ' +
266 268
            r'DEL /Q %SCRIPT%"')
267 269

  
268 270
        stdout, stderr, rc = self._guest_exec(cmd)

Also available in: Unified diff