diff options
author | Dirk von Suchodoletz | 2008-12-22 23:43:43 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2008-12-22 23:43:43 +0100 |
commit | a8b7e47059359904a2953b99e3e634bac0331c71 (patch) | |
tree | eee39a17237230516a76567425b5a38096f78e46 /os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm | |
parent | Just explained the use of the filter script: It allows to dynamically (diff) | |
download | core-a8b7e47059359904a2953b99e3e634bac0331c71.tar.gz core-a8b7e47059359904a2953b99e3e634bac0331c71.tar.xz core-a8b7e47059359904a2953b99e3e634bac0331c71.zip |
A fix to the packet install mechanism in the x11vnc plugin. Added some
configuration scripting for x11gen mode of the plugin. See [wiki:x11vnc
plugin info] for more information.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2451 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm')
-rw-r--r-- | os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm b/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm index e86bbfcf..98667c3a 100644 --- a/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm +++ b/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm @@ -35,9 +35,10 @@ sub getInfo my $self = shift; return { description => unshiftHereDoc(<<' End-of-Here'), - enables x11vnc server + enables x11vnc server (user or xorg) End-of-Here - precedence => 50, + # depends on xorg to be configured + precedence => 80, }; } @@ -67,7 +68,7 @@ sub getAttrInfo End-of-Here content_regex => qr{^(x11user|x11gen|fb)$}, content_descr => 'x11user for user, x11gen for general X access or fb', - default => 'x11user', + default => 'x11gen', }, 'x11vnc::scale' => { @@ -174,7 +175,6 @@ sub getAttrInfo content_descr => 'use 1 or yes to enable - 0 or no to disable', default => 'yes', }, - }; } @@ -189,9 +189,10 @@ sub installationPhase # should we distinguish between the two different packages!? # libvnc should be part of the xorg package!? (so no check needed) + my $engine = $self->{'os-plugin-engine'}; if (!isInPath('x11vnc')) { - $self->{'distro'}->installPackages( - $self->{'os-plugin-engine'}->getInstallablePackagesForSelection('x11vnc') + $engine->installPackages( + $engine->getInstallablePackagesForSelection('x11vnc') ); } else { vlog(3, "x11vnc is already installed"); |