Improve device-based-licensing cleaning
This commit is contained in:
parent
f6125eaa5b
commit
1567903b09
|
@ -1170,8 +1170,10 @@ reg delete HKLM\SOFTWARE\Microsoft\Office\15.0\ClickToRun\Configuration /v Share
|
||||||
:: Clear device-based-licensing
|
:: Clear device-based-licensing
|
||||||
:: https://learn.microsoft.com/deployoffice/device-based-licensing
|
:: https://learn.microsoft.com/deployoffice/device-based-licensing
|
||||||
|
|
||||||
for %%# in (%_o16c2rIds%) do (
|
if defined _o16c2rIds (
|
||||||
reg delete %o16c2r_reg%\Configuration /v %%#.DeviceBasedLicensing /f %nul%
|
for /f "tokens=1 delims= " %%A in ('reg query "%o16c2r_reg%\Configuration" %nul6%') do (
|
||||||
|
echo %%A | find /i ".DeviceBasedLicensing" %nul% && reg delete "%o16c2r_reg%\Configuration" /v "%%A" /f %nul%
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
:: Remove OEM registry key
|
:: Remove OEM registry key
|
||||||
|
|
|
@ -1226,8 +1226,10 @@ reg delete HKLM\SOFTWARE\Microsoft\Office\15.0\ClickToRun\Configuration /v Share
|
||||||
:: Clear device-based-licensing
|
:: Clear device-based-licensing
|
||||||
:: https://learn.microsoft.com/deployoffice/device-based-licensing
|
:: https://learn.microsoft.com/deployoffice/device-based-licensing
|
||||||
|
|
||||||
for %%# in (%_o16c2rIds%) do (
|
if defined _o16c2rIds (
|
||||||
reg delete %o16c2r_reg%\Configuration /v %%#.DeviceBasedLicensing /f %nul%
|
for /f "tokens=1 delims= " %%A in ('reg query "%o16c2r_reg%\Configuration" %nul6%') do (
|
||||||
|
echo %%A | find /i ".DeviceBasedLicensing" %nul% && reg delete "%o16c2r_reg%\Configuration" /v "%%A" /f %nul%
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
:: Remove OEM registry key
|
:: Remove OEM registry key
|
||||||
|
|
Loading…
Reference in New Issue