wbatch: elevated privileges for create_hostnet

Code Issues Proposed changes

Currently, create_hostnet.bat asks no less than six times for elevated
privileges (once for each network created or modified). This change adds
code that allows create_hostnet to keep the elevated privileges while
configuring networks. That is, it prompts once rather than six times.
Partial-Bug: 1312764
Implements: blueprint openstack-training-labs
Change-Id: I30f9c158c674f1e308dc14d5e2efef184b6d464b

This commit is contained in:

Roger Luethi

2014年06月17日 18:45:15 +02:00

parent f2e5e3bb10

commit 9e9968197c

2 changed files with 32 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

6
labs/lib/wbatch/batch_for_windows

View File

@@ -139,6 +139,10 @@ function wbatch_end_file {

wbatch_close_file

}

function wbatch_elevate_privileges {

cat "$WBATCH_TEMPLATE_DIR/template-elevate_privs_bat" | wbatch_write_stdin

}

function wbatch_find_vbm {

cat "$WBATCH_TEMPLATE_DIR/template-find_vbm_bat" | wbatch_write_stdin

}

@@ -165,6 +169,8 @@ function wbatch_mkdirs {

function wbatch_create_hostnet {

wbatch_new_file "create_hostnet.bat"

wbatch_file_header "host-only networks"

# Creating networks requires elevated privileges

wbatch_elevate_privileges

wbatch_find_vbm

sed -e "

26
labs/lib/wbatch/template-elevate_privs_bat Normal file

View File

@@ -0,0 +1,26 @@

REM Elevate credentials, code courtesy of Matthew Newton

REM http://blog.mnewton.com/articles/Windows-Installer-Batch-Script-Revisited.html

REM Check for permissions

>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"

REM If error flag set, we do not have admin.

if '%errorlevel%' NEQ '0' (

echo Requesting administrative privileges...

goto UACPrompt

) else ( goto gotAdmin )

:UACPrompt

echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"

echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"

"%temp%\getadmin.vbs"

REM we are done, exiting recursive call

exit /B

:gotAdmin

if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )

echo We have admin privileges, proceeding...

REM vim: set ai ts=4 sw=4 et ft=dosbatch: