git://git.onelab.eu
/
bootmanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7a580ba
)
shebags mention python2 explicitly
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Thu, 28 Nov 2019 10:52:18 +0000
(11:52 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Thu, 28 Nov 2019 10:52:18 +0000
(11:52 +0100)
33 files changed:
source/BootAPI.py
patch
|
blob
|
history
source/BootManager.py
patch
|
blob
|
history
source/BootServerRequest.py
patch
|
blob
|
history
source/Exceptions.py
patch
|
blob
|
history
source/ModelOptions.py
patch
|
blob
|
history
source/RunlevelAgent.py
patch
|
blob
|
history
source/notify_messages.py
patch
|
blob
|
history
source/steps/AnsibleHook.py
patch
|
blob
|
history
source/steps/AuthenticateWithPLC.py
patch
|
blob
|
history
source/steps/ChainBootNode.py
patch
|
blob
|
history
source/steps/CheckForNewDisks.py
patch
|
blob
|
history
source/steps/CheckHardwareRequirements.py
patch
|
blob
|
history
source/steps/ConfirmInstallWithUser.py
patch
|
blob
|
history
source/steps/GetAndUpdateNodeDetails.py
patch
|
blob
|
history
source/steps/InitializeBootManager.py
patch
|
blob
|
history
source/steps/InstallBootstrapFS.py
patch
|
blob
|
history
source/steps/InstallInit.py
patch
|
blob
|
history
source/steps/InstallUninitHardware.py
patch
|
blob
|
history
source/steps/MakeInitrd.py
patch
|
blob
|
history
source/steps/ReadNodeConfiguration.py
patch
|
blob
|
history
source/steps/SendHardwareConfigToPLC.py
patch
|
blob
|
history
source/steps/StartDebug.py
patch
|
blob
|
history
source/steps/StartRunlevelAgent.py
patch
|
blob
|
history
source/steps/StopRunlevelAgent.py
patch
|
blob
|
history
source/steps/UpdateBootStateWithPLC.py
patch
|
blob
|
history
source/steps/UpdateLastBootOnce.py
patch
|
blob
|
history
source/steps/UpdateNodeConfiguration.py
patch
|
blob
|
history
source/steps/UpdateRunLevelWithPLC.py
patch
|
blob
|
history
source/steps/ValidateNodeInstall.py
patch
|
blob
|
history
source/steps/WriteModprobeConfig.py
patch
|
blob
|
history
source/steps/WriteNetworkConfig.py
patch
|
blob
|
history
source/steps/__init__.py
patch
|
blob
|
history
source/systeminfo.py
patch
|
blob
|
history
diff --git
a/source/BootAPI.py
b/source/BootAPI.py
index
db17356
..
f6243fa
100644
(file)
--- a/
source/BootAPI.py
+++ b/
source/BootAPI.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/BootManager.py
b/source/BootManager.py
index
55686ea
..
a24b720
100755
(executable)
--- a/
source/BootManager.py
+++ b/
source/BootManager.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python -u
+#!/usr/bin/python
2
-u
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/BootServerRequest.py
b/source/BootServerRequest.py
index
9f7b07f
..
e1b8c1e
100644
(file)
--- a/
source/BootServerRequest.py
+++ b/
source/BootServerRequest.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/Exceptions.py
b/source/Exceptions.py
index
1004d5b
..
5f99442
100644
(file)
--- a/
source/Exceptions.py
+++ b/
source/Exceptions.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/ModelOptions.py
b/source/ModelOptions.py
index
512348b
..
10044da
100644
(file)
--- a/
source/ModelOptions.py
+++ b/
source/ModelOptions.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/RunlevelAgent.py
b/source/RunlevelAgent.py
index
0d514c3
..
ee597a2
100755
(executable)
--- a/
source/RunlevelAgent.py
+++ b/
source/RunlevelAgent.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# RunlevelAgent - acts as a heartbeat back to myplc reporting that the node is
# online and whether it is in boot or pre-boot run-level.
#
# RunlevelAgent - acts as a heartbeat back to myplc reporting that the node is
# online and whether it is in boot or pre-boot run-level.
diff --git
a/source/notify_messages.py
b/source/notify_messages.py
index
61ab87b
..
17f8ea0
100644
(file)
--- a/
source/notify_messages.py
+++ b/
source/notify_messages.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/AnsibleHook.py
b/source/steps/AnsibleHook.py
index
ecbac91
..
1848078
100644
(file)
--- a/
source/steps/AnsibleHook.py
+++ b/
source/steps/AnsibleHook.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
import os
#
import os
diff --git
a/source/steps/AuthenticateWithPLC.py
b/source/steps/AuthenticateWithPLC.py
index
2282dd6
..
955fcf1
100644
(file)
--- a/
source/steps/AuthenticateWithPLC.py
+++ b/
source/steps/AuthenticateWithPLC.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/ChainBootNode.py
b/source/steps/ChainBootNode.py
index
9c1e06c
..
b9be927
100644
(file)
--- a/
source/steps/ChainBootNode.py
+++ b/
source/steps/ChainBootNode.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/CheckForNewDisks.py
b/source/steps/CheckForNewDisks.py
index
42a07e7
..
1c171a3
100644
(file)
--- a/
source/steps/CheckForNewDisks.py
+++ b/
source/steps/CheckForNewDisks.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/CheckHardwareRequirements.py
b/source/steps/CheckHardwareRequirements.py
index
1e10362
..
2a025bf
100644
(file)
--- a/
source/steps/CheckHardwareRequirements.py
+++ b/
source/steps/CheckHardwareRequirements.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/ConfirmInstallWithUser.py
b/source/steps/ConfirmInstallWithUser.py
index
1a18387
..
f8a3db7
100644
(file)
--- a/
source/steps/ConfirmInstallWithUser.py
+++ b/
source/steps/ConfirmInstallWithUser.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/GetAndUpdateNodeDetails.py
b/source/steps/GetAndUpdateNodeDetails.py
index
b6d20a6
..
55cd94f
100644
(file)
--- a/
source/steps/GetAndUpdateNodeDetails.py
+++ b/
source/steps/GetAndUpdateNodeDetails.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/InitializeBootManager.py
b/source/steps/InitializeBootManager.py
index
278f9b5
..
75fd10f
100644
(file)
--- a/
source/steps/InitializeBootManager.py
+++ b/
source/steps/InitializeBootManager.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/InstallBootstrapFS.py
b/source/steps/InstallBootstrapFS.py
index
f0414e0
..
f06bc91
100644
(file)
--- a/
source/steps/InstallBootstrapFS.py
+++ b/
source/steps/InstallBootstrapFS.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/InstallInit.py
b/source/steps/InstallInit.py
index
b303c05
..
077852c
100644
(file)
--- a/
source/steps/InstallInit.py
+++ b/
source/steps/InstallInit.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/InstallUninitHardware.py
b/source/steps/InstallUninitHardware.py
index
a2f6086
..
ddfdf68
100644
(file)
--- a/
source/steps/InstallUninitHardware.py
+++ b/
source/steps/InstallUninitHardware.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/MakeInitrd.py
b/source/steps/MakeInitrd.py
index
f6f2d03
..
89fd6e9
100644
(file)
--- a/
source/steps/MakeInitrd.py
+++ b/
source/steps/MakeInitrd.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/ReadNodeConfiguration.py
b/source/steps/ReadNodeConfiguration.py
index
57e12d5
..
efa44c4
100644
(file)
--- a/
source/steps/ReadNodeConfiguration.py
+++ b/
source/steps/ReadNodeConfiguration.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/SendHardwareConfigToPLC.py
b/source/steps/SendHardwareConfigToPLC.py
index
52ad003
..
db27115
100644
(file)
--- a/
source/steps/SendHardwareConfigToPLC.py
+++ b/
source/steps/SendHardwareConfigToPLC.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/StartDebug.py
b/source/steps/StartDebug.py
index
f913dc8
..
76ba7b0
100644
(file)
--- a/
source/steps/StartDebug.py
+++ b/
source/steps/StartDebug.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/StartRunlevelAgent.py
b/source/steps/StartRunlevelAgent.py
index
7184021
..
8343c4e
100644
(file)
--- a/
source/steps/StartRunlevelAgent.py
+++ b/
source/steps/StartRunlevelAgent.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
@@
-26,7
+26,7
@@
def Run(vars, log):
# raise error if script is not present.
os.stat(cmd)
# init script only starts RLA once.
# raise error if script is not present.
os.stat(cmd)
# init script only starts RLA once.
- os.system("/usr/bin/python {} start bootmanager &".format(cmd))
+ os.system("/usr/bin/python
2
{} start bootmanager &".format(cmd))
except KeyError as var:
raise BootManagerException("Missing variable in vars: {}\n".format(var))
except ValueError as var:
except KeyError as var:
raise BootManagerException("Missing variable in vars: {}\n".format(var))
except ValueError as var:
diff --git
a/source/steps/StopRunlevelAgent.py
b/source/steps/StopRunlevelAgent.py
index
58c0cbf
..
41e415a
100644
(file)
--- a/
source/steps/StopRunlevelAgent.py
+++ b/
source/steps/StopRunlevelAgent.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
@@
-25,7
+25,7
@@
def Run(vars, log):
cmd = "{}/RunlevelAgent.py".format(vars['BM_SOURCE_DIR'])
# raise error if script is not present.
os.stat(cmd)
cmd = "{}/RunlevelAgent.py".format(vars['BM_SOURCE_DIR'])
# raise error if script is not present.
os.stat(cmd)
- os.system("/usr/bin/python {} stop".format(cmd))
+ os.system("/usr/bin/python
2
{} stop".format(cmd))
except KeyError as var:
raise BootManagerException("Missing variable in vars: {}\n".format(var))
except ValueError as var:
except KeyError as var:
raise BootManagerException("Missing variable in vars: {}\n".format(var))
except ValueError as var:
diff --git
a/source/steps/UpdateBootStateWithPLC.py
b/source/steps/UpdateBootStateWithPLC.py
index
8cd0f8b
..
07e5e83
100644
(file)
--- a/
source/steps/UpdateBootStateWithPLC.py
+++ b/
source/steps/UpdateBootStateWithPLC.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/UpdateLastBootOnce.py
b/source/steps/UpdateLastBootOnce.py
index
33dd6cb
..
f276ddd
100644
(file)
--- a/
source/steps/UpdateLastBootOnce.py
+++ b/
source/steps/UpdateLastBootOnce.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/UpdateNodeConfiguration.py
b/source/steps/UpdateNodeConfiguration.py
index
26f9453
..
0bb7471
100644
(file)
--- a/
source/steps/UpdateNodeConfiguration.py
+++ b/
source/steps/UpdateNodeConfiguration.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/UpdateRunLevelWithPLC.py
b/source/steps/UpdateRunLevelWithPLC.py
index
3234798
..
66c2548
100644
(file)
--- a/
source/steps/UpdateRunLevelWithPLC.py
+++ b/
source/steps/UpdateRunLevelWithPLC.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/ValidateNodeInstall.py
b/source/steps/ValidateNodeInstall.py
index
159d4d3
..
93ac083
100644
(file)
--- a/
source/steps/ValidateNodeInstall.py
+++ b/
source/steps/ValidateNodeInstall.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/WriteModprobeConfig.py
b/source/steps/WriteModprobeConfig.py
index
de1fe85
..
f43e31a
100644
(file)
--- a/
source/steps/WriteModprobeConfig.py
+++ b/
source/steps/WriteModprobeConfig.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/WriteNetworkConfig.py
b/source/steps/WriteNetworkConfig.py
index
ac4431c
..
1ceac1f
100644
(file)
--- a/
source/steps/WriteNetworkConfig.py
+++ b/
source/steps/WriteNetworkConfig.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/steps/__init__.py
b/source/steps/__init__.py
index
5042299
..
45b1dbf
100644
(file)
--- a/
source/steps/__init__.py
+++ b/
source/steps/__init__.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
diff --git
a/source/systeminfo.py
b/source/systeminfo.py
index
3140755
..
9524359
100755
(executable)
--- a/
source/systeminfo.py
+++ b/
source/systeminfo.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.