Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
1b7d6427
Commit
1b7d6427
authored
Aug 01, 2011
by
Antoine Catton
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'promises' of
https://git.erp5.org/repos/slapos.core
into promises
parents
63b2e2d7
e46c3aee
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
slapos.cfg.example
slapos.cfg.example
+3
-1
slapos/format.py
slapos/format.py
+1
-1
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+2
-2
No files found.
slapos.cfg.example
View file @
1b7d6427
...
...
@@ -42,5 +42,7 @@ alias =
mariadb http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.16:/software/mariadb/software.cfg
memcached http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.16:/software/memcached/software.cfg
kumofs http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.21:/software/kumofs/software.cfg
erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/
HEAD
:/software/erp5/software.cfg
erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/
refs/tags/slapos-0.30
:/software/erp5/software.cfg
erp5_branch http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5:/software/erp5/software.cfg
vifib http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.30:/software/vifib/software.cfg
slapos/format.py
View file @
1b7d6427
...
...
@@ -211,7 +211,7 @@ class Computer:
# all addresses on interface are for partition, so lets add new one
computer_tap
=
Tap
(
'compdummy'
)
computer_tap
.
createWithOwner
(
'root'
,
attach_to_tap
=
True
)
computer_tap
.
createWithOwner
(
User
(
'root'
)
,
attach_to_tap
=
True
)
self
.
bridge
.
addTap
(
computer_tap
)
return
self
.
bridge
.
addAddr
()
...
...
slapos/grid/slapgrid.py
View file @
1b7d6427
...
...
@@ -581,11 +581,11 @@ class Slapgrid(object):
if
process_handler
.
poll
()
is
None
:
process_handler
.
kill
()
computer_partition
.
error
(
"The promise
'%s'
timed out"
%
promise
)
computer_partition
.
error
(
"The promise
%r
timed out"
%
promise
)
elif
process_handler
.
returncode
!=
0
:
stderr
=
process_handler
.
communicate
()[
1
]
if
stderr
is
None
:
stderr
=
'No error output from %
s
.'
%
promise
stderr
=
'No error output from %
r
.'
%
promise
computer_partition
.
error
(
stderr
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment