diff options
author | Michael Janczyk | 2009-06-05 22:09:16 +0200 |
---|---|---|
committer | Michael Janczyk | 2009-06-05 22:09:16 +0200 |
commit | 04e1177387a454b471a39e4d497b8ba4af084121 (patch) | |
tree | f916f92e43bb2765b794a9331fc81ad88d4ff5a2 /os-plugins/plugins | |
parent | Various changes to xserver plugin: (diff) | |
download | core-04e1177387a454b471a39e4d497b8ba4af084121.tar.gz core-04e1177387a454b471a39e4d497b8ba4af084121.tar.xz core-04e1177387a454b471a39e4d497b8ba4af084121.zip |
ubuntu 8.10+ and suse with kdm4 should work now
TODO: change default theme to openslx3 when using kdm3
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2938 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins')
-rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm | 21 | ||||
-rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm | 46 | ||||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml | 4 | ||||
-rwxr-xr-x | os-plugins/plugins/desktop/themes/kdm/openslx3/GdmGreeterTheme.desktop (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/GdmGreeterTheme.desktop) | 0 | ||||
-rwxr-xr-x | os-plugins/plugins/desktop/themes/kdm/openslx3/KdmGreeterTheme.desktop (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/KdmGreeterTheme.desktop) | 0 | ||||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/color.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/color.png) | bin | 177 -> 177 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/enter.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/enter.png) | bin | 4260 -> 4260 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/enter_inactive.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/enter_inactive.png) | bin | 4072 -> 4072 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/environment.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/environment.png) | bin | 5076 -> 5076 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/main-runner.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/main-runner.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/openslx-logo-main.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/openslx-logo-main.png) | bin | 82050 -> 82050 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/openslx-logo.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/openslx-logo.png) | bin | 9113 -> 9113 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/sessions.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/sessions.png) | bin | 4245 -> 4245 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/sessions_inactive.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/sessions_inactive.png) | bin | 4066 -> 4066 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/system.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/system.png) | bin | 4257 -> 4257 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/system_inactive.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/system_inactive.png) | bin | 4091 -> 4091 bytes | |||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/theme.xml (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/theme.xml) | 3 | ||||
-rw-r--r-- | os-plugins/plugins/desktop/themes/kdm/openslx3/welcome-time-shadowed.png (renamed from os-plugins/plugins/desktop/themes/kdm3/openslx/welcome-time-shadowed.png) | bin | 1580 -> 1580 bytes | |||
-rwxr-xr-x | os-plugins/plugins/vmchooser/files/vm-template.xml | 98 | ||||
-rwxr-xr-x | os-plugins/plugins/vmchooser/files/xmlfilter.sh | 24 |
20 files changed, 115 insertions, 81 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm index 9d22b77c..59b36dac 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm @@ -88,6 +88,20 @@ sub setupKDMScript my $self = shift; my $repoPath = shift; + # check for kdm version + my $kdmVer; + my $kdmPath; + if (-e "/usr/bin/kdm") { + $kdmVer = "4"; + $kdmPath = "/usr/share/kde4"; + } + else { + $kdmVer = ""; + $kdmPath = "/opt/kde3/share"; + # change default theme to openslx3 if kdm3 + print " * Please change to openslx3 theme when using kdm3\n"; + } + # SUSE reads /var/adm/kdm/kdmrc.sysconfig, so we link that to # our config file my $pathInfo = $self->KDMPathInfo(); @@ -97,7 +111,7 @@ sub setupKDMScript # maybe backup kdmrc.sysconfig sometimes unlink("/var/adm/kdm/kdmrc.sysconfig"); # the config file gets overwritten if this script is present - unlink("/opt/kde3/share/apps/kdm/read_sysconfig.sh"); + unlink("$kdmPath/apps/kdm/read_sysconfig.sh"); symlink("/etc/opt/kdm/kdmrc", "/var/adm/kdm/kdmrc.sysconfig"); my $script = $self->SUPER::setupKDMScript($repoPath); @@ -105,11 +119,12 @@ sub setupKDMScript # include common stuff (independent of display manager used) $script = _setupCommonDmScript($script); + $script .= "kdmver=$kdmVer\n"; $script .= unshiftHereDoc(<<' End-of-Here'); - sed -i 's/DISPLAYMANAGER=.*/DISPLAYMANAGER="kdm"/' \ + sed -i "s/DISPLAYMANAGER=.*/DISPLAYMANAGER=\"kdm$kdmver\"/" \ /mnt/etc/sysconfig/displaymanager [ $(grep -q DISPLAYMANAGER /mnt/etc/sysconfig/displaymanager) ] && \ - echo "DISPLAYMANAGER=\"kdm\"" >> /mnt/etc/sysconfig/displaymanager + echo "DISPLAYMANAGER=\"kdm$kdmver\"" >> /mnt/et/sysconfig/displaymanager sed -i "s/DEFAULT_WM=.*/DEFAULT_WM=\"$desktop_kind\"/" \ /mnt/etc/sysconfig/windowmanager End-of-Here diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm index 8263d2a1..a314c1f6 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm @@ -74,14 +74,32 @@ sub setupGDMScript return $script; } +sub KDMVersion +{ + my $self = shift; + my $vendorOSName = $self->{'engine'}->{'vendor-os-name'}; + + my $kdmVer; + if ( $vendorOSName =~ /ubuntu-8.04.*/ ) { + $kdmVer = "3"; + } + else { + $kdmVer = "4"; + } + + return $kdmVer; + +} + sub KDMPathInfo { my $self = shift; my $pathInfo = $self->SUPER::KDMPathInfo(); + my $kdmVer = $self->KDMVersion(); $pathInfo = { - config => '/etc/kde3/kdm/kdmrc', + config => "/etc/kde$kdmVer/kdm/kdmrc", paths => [ '/var/lib/kdm', '/var/run/kdm', @@ -106,12 +124,13 @@ sub KDMConfigHashForWorkstation { my $self = shift; + my $kdmVer = $self->KDMVersion(); my $configHash = $self->SUPER::KDMConfigHashForWorkstation(); - $configHash->{'General'}->{PidFile} = '/var/run/kdm.pid'; - $configHash->{'X-:0-Core'}->{Setup} = '/etc/kde3/kdm/Xsetup'; - $configHash->{'X-:0-Core'}->{Startup} = '/etc/kde3/kdm/Xstartup'; - $configHash->{'X-:0-Core'}->{Session} = '/etc/kde3/kdm/Xsession'; - $configHash->{'X-:0-Core'}->{Reset} = '/etc/kde3/kdm/Xreset'; + $configHash->{'General'}->{PidFile} = "/var/run/kdm.pid"; + $configHash->{'X-:0-Core'}->{Setup} = "/etc/kde$kdmVer/kdm/Xsetup"; + $configHash->{'X-:0-Core'}->{Startup} = "/etc/kde$kdmVer/kdm/Xstartup"; + $configHash->{'X-:0-Core'}->{Session} = "/etc/kde$kdmVer/kdm/Xsession"; + $configHash->{'X-:0-Core'}->{Reset} = "/etc/kde$kdmVer/kdm/Xreset"; $configHash->{'X-:0-Core'}->{SessionsDirs} = '/etc/X11/sessions,/usr/share/xsessions,/usr/share/apps/kdm/sessions'; @@ -123,19 +142,26 @@ sub setupKDMScript my $self = shift; my $repoPath = shift; + my $kdmVer = $self->KDMVersion(); my $script = $self->SUPER::setupKDMScript($repoPath); + # change default theme to openslx3 if kdm3 + if ( $kdmVer == "3" ) { + print " * Please change to openslx3 theme when using kdm3\n"; + } + + $script .= "kdmver=$kdmVer\n"; $script .= unshiftHereDoc(<<' End-of-Here'); # cleanup after users Xorg session - sed 's,^#!.*,,' /mnt/etc/kde3/kdm/Xreset \ - >/mnt/etc/kde3/kdm/Xreset.system + sed 's,^#!.*,,' /mnt/etc/kde$kdmver/kdm/Xreset \ + >/mnt/etc/kde$kdmver/kdm/Xreset.system echo -e '#! /bin/sh\n#\n# modified by desktop plugin in Stage3\n#\n # remove safely any remaining files of the leaving user in /tmp ( su -c "rm -rf /tmp/*" - $USER echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null ) & - . /etc/kde3/kdm/Xreset.system' >/mnt/etc/kde3/kdm/Xreset - chmod a+x /mnt/etc/kde3/kdm/Xreset* + . /etc/kde$kdmver/kdm/Xreset.system' >/mnt/etc/kde$kdmver/kdm/Xreset + chmod a+x /mnt/etc/kde$kdmver/kdm/Xreset* rllinker kdm 1 10 echo '/usr/bin/kdm' > /mnt/etc/X11/default-display-manager diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml b/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml index 0df64ce1..55e20a06 100644 --- a/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml +++ b/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml @@ -4,9 +4,7 @@ KDM-OpenSLX-Theme --> <greeter id="greeter"> - <style font="Sans 11" window-text-color="#C7C7C7" - base-color="#C7C7C7" alternate-base-color="#666666" - text-color="#000000" disabled-text-color="#808080"/> + <style font="Sans 11" window-text-color="#f0f0f0" base-color="#f0f0f0" text-color="#000000"/> <!-- background --> <item type="pixmap" id="backgound"> diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/GdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/kdm/openslx3/GdmGreeterTheme.desktop index da63ec08..da63ec08 100755 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/GdmGreeterTheme.desktop +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/GdmGreeterTheme.desktop diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/KdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/kdm/openslx3/KdmGreeterTheme.desktop index 3cb9069d..3cb9069d 100755 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/KdmGreeterTheme.desktop +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/KdmGreeterTheme.desktop diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/color.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/color.png Binary files differindex 7a0feb03..7a0feb03 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/color.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/color.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/enter.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/enter.png Binary files differindex b646e851..b646e851 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/enter.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/enter.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/enter_inactive.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/enter_inactive.png Binary files differindex e12cfb8e..e12cfb8e 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/enter_inactive.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/enter_inactive.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/environment.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/environment.png Binary files differindex b9682822..b9682822 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/environment.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/environment.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/main-runner.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/main-runner.png Binary files differindex 5b3cf656..5b3cf656 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/main-runner.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/main-runner.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/openslx-logo-main.png Binary files differindex f98e6517..f98e6517 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/openslx-logo-main.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/openslx-logo-main.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/openslx-logo.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/openslx-logo.png Binary files differindex 8cfaaf94..8cfaaf94 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/openslx-logo.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/openslx-logo.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/sessions.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/sessions.png Binary files differindex 00d05f29..00d05f29 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/sessions.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/sessions.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/sessions_inactive.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/sessions_inactive.png Binary files differindex 86bbe642..86bbe642 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/sessions_inactive.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/sessions_inactive.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/system.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/system.png Binary files differindex f7b9e71f..f7b9e71f 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/system.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/system.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/system_inactive.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/system_inactive.png Binary files differindex c3e1719b..c3e1719b 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/system_inactive.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/system_inactive.png diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/theme.xml b/os-plugins/plugins/desktop/themes/kdm/openslx3/theme.xml index ac5f3d00..1438705d 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/theme.xml +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/theme.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE greeter SYSTEM "greeter.dtd"> +<!-- +KDM3-OpenSLX-Theme +-->--> <greeter> <!-- main pic, login pic --> <item type="pixmap"> diff --git a/os-plugins/plugins/desktop/themes/kdm3/openslx/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/kdm/openslx3/welcome-time-shadowed.png Binary files differindex 79e872c3..79e872c3 100644 --- a/os-plugins/plugins/desktop/themes/kdm3/openslx/welcome-time-shadowed.png +++ b/os-plugins/plugins/desktop/themes/kdm/openslx3/welcome-time-shadowed.png diff --git a/os-plugins/plugins/vmchooser/files/vm-template.xml b/os-plugins/plugins/vmchooser/files/vm-template.xml index ce4eb343..f6b59fea 100755 --- a/os-plugins/plugins/vmchooser/files/vm-template.xml +++ b/os-plugins/plugins/vmchooser/files/vm-template.xml @@ -1,70 +1,60 @@ <?xml version="1.0" encoding="utf-8"?>
<settings>
<entry>
- <!-- VM-name with ending .vmdk, .img, .vdi, .qcow2 -->
- <image_name param="vm-image.vmdk">
- </image_name>
- <creator param="Your Name">
- </creator>
- <email param="your@email.address.tld">
- </email>
- <phone param="-">
- </phone>
- <!-- sort after parameters then alphabet, values 0(top) - 9(bottom) -->
- <priority param="5">
- </priority>
+ <!-- "vmware", "virtualbox", "qemu" -->
+ <virtualmachine param="vmware"/>
+ <!-- VM-name with ending .vmdk, .img, .vdi, .qcow2 -->
+ <image_name param="vm-image.vmdk"/>
+ <!-- sort after parameters then alphabet, values 0(top) - 9(bottom) -->
+ <priority param="5"/>
<!-- title shown in the menu -->
- <title param="My VM Image">
- </title>
+ <title param="My VM Image"/>
<!-- description shown when image is chosen -->
<description>Image for lectures with a lot of software: office, ...
</description>
+ <!-- if active="true" the image is selectable via vmchooser -->
+ <active param="true"/>
+ <!-- in which environment this image will be selectable via vmchooser -->
+ <environment param="default"/>
+ <!-- image locked with a password? -->
+ <locked param="false"/>
+ <creator param="Your Name"/>
+ <email param="your@e-mail.add"/>
+ <phone param="0123-12345678"/>
+ <!-- when should this image be deactivated automatically -->
+ <valid_until param="DD-MM-YY"/>
<!-- type of the OS: if you do not know use "other" -->
<!-- vmware refer to: http://sanbarrow.com/vmx/vmx-guestos.html -->
- <os param="winxppro">
- </os>
+ <os param="winxppro"/>
<!-- "nat", "bridge", "hostonly" -->
- <network param="nat">
- </network>
- <!-- "vmware", "virtualbox", "qemu" -->
- <virtualmachine param="vmware">
- </virtualmachine>
- <!-- when should this image be deactivated automatically -->
- <valid_until param="DD-MM-YY">
- </valid_until>
- <!-- if active="true" the image is selectable via vmchooser -->
- <active param="true">
- </active>
- <!-- in which environment this image will be selectable via vmchooser -->
- <environment param="default">
- </environment>
+ <network param="nat"/>
+ <!-- use a different virtual network card than default -->
+ <netcard param="e1000"/>
+ <!-- activate serial port: "ttyS0", "auto" (recommended) -->
+ <serialport param="false"/>
+ <!-- activate parallel port: "parport0" (recommended) -->
+ <parport param="false"/>
+ <!-- enable 3D support -->
+ <enable3d param="true"/>
+ <!-- which shared folders should be connected -->
+ <shared_folders param="true">
+ <!-- name="Home" path="/home/$USER" for internal VMware sf -->
+ <shared_folder name="" path="" pass=""></shared_folder>
+ </shared_folders>
+ <!-- which printers should be connected -->
+ <printers>
+ <printer name="" path="">Human readable description</printer>
+ </printers>
+ <!-- which scanners should be connected -->
+ <scanners>
+ <scanner name="" path="">Description</scanner>
+ </scanners>
+ <!-- added automatically through vmchooser when started
+ <username param="user-id"/>
+ -->
<!-- obsolete, maybe for future implementations
<xdm param="false">
</xdm>
-->
- <!-- vmchooser stuff, automatically added
- <!-- added automatically through vmchooser when started -- >
- <username param="user-id">
- </username>
- <!-- which printers should be connected -- >
- <printers>
- <printer name="" path="">Human readable description</printer>
- </printers>
- <!-- which scanners should be connected -- >
- <scanners>
- <scanner name="" path="">Description</scanner>
- </scanners>
- -->
- <!-- should the home-directory be connected -->
- <home param="true">
- </home>
- <!-- which shared folders should be connected -->
- <shared_folders param="true">
- <shared_folder name="" path="" pass=""></shared_folder>
- </shared_folders>
- <!-- there is the ability to protect an image for a while using a -->
- <!-- password. Helpfull for courses (with special software licences). -->
- <locked param="true">
- </locked>
</entry>
</settings>
diff --git a/os-plugins/plugins/vmchooser/files/xmlfilter.sh b/os-plugins/plugins/vmchooser/files/xmlfilter.sh index 7b3a3ac5..0a69ef7b 100755 --- a/os-plugins/plugins/vmchooser/files/xmlfilter.sh +++ b/os-plugins/plugins/vmchooser/files/xmlfilter.sh @@ -30,15 +30,17 @@ if [ -f /etc/opt/openslx/vmchooser-stage3.conf ]; then . /etc/opt/openslx/vmchooser-stage3.conf fi -if [ -n ${vmchooser_env} ]; then - for FILE in $1/*.xml - do - # filter all xmls with pool-param not equal to slxgroup - if [ $(grep "<pools param=\"${vmchooser_env}\"" ${FILE} | wc -l) -eq 1 ]; then - echo ${FILE}; +for FILE in $1/*.xml; do + # filter all xmls which aren't set active + if [ $(grep "<active param=.*true.*" ${FILE} | wc -l) -eq 1 ]; then + if [ -n ${vmchooser_env} ]; then + # filter all xmls with pool-param not equal to vmchooser::env + if [ $(grep "<pools param=\"${vmchooser_env}\"" ${FILE} | wc -l) -eq 1 ]; then + echo ${FILE}; + fi + else + # if there is no pool set, just take all available xmls + echo -e ${active} fi - done -else - # if there is no pool set, just take all available xmls - ls -1 $1/*.xml -fi + fi +done |