Skip to content
This repository was archived by the owner on Oct 10, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions atomic_dbus.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,17 +287,21 @@ def VulnerableInfo(self):
# atomic install section
# The Install method will install the specified image
@slip.dbus.polkit.require_auth("org.atomic.readwrite")
@dbus.service.method("org.atomic", in_signature='ssbbsasas', out_signature='')
def Install(self, image, name, user, system, remote, setvalues, extra_args):
@dbus.service.method("org.atomic", in_signature='ssbbsbas', out_signature='')
def Install(self, image, name='', system=False, remote=False, storage='', user=False, setvalues=''):
if setvalues is None:
setvalues = []
assert(isinstance(setvalues, list))
i = Install()
args = self.Args()
args.image = image
args.name = name
args.user = user
args.system = system
args.storage = storage
args.remote = remote
args.setvalues = setvalues
args.args = extra_args
args.args = []
i.set_args(args)
return i.install()

Expand Down
8 changes: 2 additions & 6 deletions atomic_dbus_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,14 @@ def ImageVersion(self, image, recurse=False):
return self.dbus_object.ImageVersion(image, recurse, dbus_interface="org.atomic")

@polkit.enable_proxy
def Install(self, image, name=None, user=False, system=False, remote="", setvalues=None, extra_args=None):
def Install(self, image, name='', system=False, remote=False, storage='', user=False, setvalues=''):
if not name:
name = image
if not setvalues:
setvalues = []
if not isinstance(setvalues, (list, tuple)):
setvalues = [ setvalues ]
if not extra_args:
extra_args = []
if not isinstance(extra_args, (list, tuple)):
extra_args = [ extra_args ]
return self.dbus_object.Install(image, name, user, system, remote, setvalues, extra_args, dbus_interface="org.atomic", timeout = 2147400)
return self.dbus_object.Install(image, name, system, remote, storage, user, setvalues, dbus_interface="org.atomic", timeout = 2147400)

@polkit.enable_proxy
def MountImage(self, src, dest, options="", live=False, shared=False):
Expand Down