Commit 49344e5a authored by Mark Beierl's avatar Mark Beierl
Browse files

Bug fix 



Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>
parent 36bcc70b

hackfest_virtual-pc_vnfd/charms/virtual-pc-src/src/charm.py

+6 −4
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ APT_REQUIREMENTS = [ 
    "mate-desktop",

    "mate-applets",

    "mate-applet-brisk-menu",

    "mate-control-center",

    "mate-indicator-applet",

    "mate-notification-daemon",

    "mate-session-manager",
@@ -103,13 +104,13 @@ class VirtualPCCharm(CharmBase, InstallProgress): 


        self.unit.status = MaintenanceStatus("Installing snaps")

        for snap in SNAP_INSTALLS:

            shell("sudo snap install " + snap)

            shell("snap install " + snap)



        self.unit.status = MaintenanceStatus("Setting default display manager")

        shell("echo /usr/sbin/lightdm | sudo tee /etc/X11/default-display-manager")



        self.unit.status = MaintenanceStatus("Adding XRDP to ssl-cert group")

        shell("sudo adduser xrdp ssl-cert")

        shell("adduser xrdp ssl-cert")



        self.unit.status = MaintenanceStatus("Generating Window Manager startup script")

        with open(STARTWM_TEMPLATE, "r") as template:
@@ -153,11 +154,12 @@ class VirtualPCCharm(CharmBase, InstallProgress): 
    def _add_snap(self, event):

        self.unit.status = MaintenanceStatus("Installing snaps")

        for snap in event.params["package"].split(','):

            shell("sudo snap install " + snap)

            shell("snap install " + snap)

        self.unit.status = self._get_current_status()



    def _announce(self, event):

        self.unit.status = MaintenanceStatus("Announce")

        message = event.params["message"]

        shell("su - ubuntu -c 'XDG_RUNTIME_DIR=/run/user/$(id -u) notify-send \"" + message + "\"'")

        self.unit.status = self._get_current_status()
@@ -176,7 +178,7 @@ class VirtualPCCharm(CharmBase, InstallProgress): 
    def _remove_snap(self, event):

        self.unit.status = MaintenanceStatus("Removing snaps")

        for snap in event.params["package"].split(','):

            shell("sudo snap remove" + snap)

            shell("snap remove " + snap)

        self.unit.status = self._get_current_status()



    def _update_system(self, _):