diff options
| author | Dirk von Suchodoletz | 2011-06-20 15:40:00 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-06-20 15:40:00 +0200 |
| commit | c246e4a3c706203e1c452d676bf5e02688904da3 (patch) | |
| tree | e4acbfada45b1bc9561deef0077ce6e0920fe8a8 /src | |
| parent | fix rpm/deb creation (diff) | |
| download | core-c246e4a3c706203e1c452d676bf5e02688904da3.tar.gz core-c246e4a3c706203e1c452d676bf5e02688904da3.tar.xz core-c246e4a3c706203e1c452d676bf5e02688904da3.zip | |
Fixing call of find in xmlchooser.sh (might fail in certain setups) ...
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot-env/syslinux/README.pxe | 8 | ||||
| -rw-r--r-- | src/os-plugins/plugins/vmchooser/files/run-virt.sh | 2 | ||||
| -rwxr-xr-x | src/os-plugins/plugins/vmchooser/files/xmlfilter.sh | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/boot-env/syslinux/README.pxe b/src/boot-env/syslinux/README.pxe index 9a14ee52..856e5aed 100644 --- a/src/boot-env/syslinux/README.pxe +++ b/src/boot-env/syslinux/README.pxe @@ -42,13 +42,13 @@ Example how the PXElinux information is gathered: ##### at this point the system labels are being included ##### ##### ##### # # -# LABEL openslx-suse-11.0-default::nfs # +# LABEL openslx-suse-11.4-default::nfs # # MENU LABEL ^SUSE 11.0 System / NFS # -# KERNEL suse-11.0-default/vmlinuz-2.6.25.20-0.1-pae # -# APPEND quiet vga=791 initrd=suse-11.0-default/initramfs-1 file # +# KERNEL suse-11.0-default/vmlinuz-2.6.35.20-0.1-pae # +# APPEND quiet vga=791 initrd=suse-11.4-default/initramfs-1 file # # IPAPPEND 3 # # TEXT HELP # -# OpenSUSE 11.0 System # +# OpenSUSE 11.4 System # # ENDTEXT # # . # # . # diff --git a/src/os-plugins/plugins/vmchooser/files/run-virt.sh b/src/os-plugins/plugins/vmchooser/files/run-virt.sh index 8d79b041..137012a3 100644 --- a/src/os-plugins/plugins/vmchooser/files/run-virt.sh +++ b/src/os-plugins/plugins/vmchooser/files/run-virt.sh @@ -1,7 +1,7 @@ #!/bin/bash # ----------------------------------------------------------------------------- # Copyright (c) 2007..2010 - RZ Uni FR -# Copyright (c) 2007..2010 - OpenSLX GmbH +# Copyright (c) 2007..2011 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING diff --git a/src/os-plugins/plugins/vmchooser/files/xmlfilter.sh b/src/os-plugins/plugins/vmchooser/files/xmlfilter.sh index 0252d9a6..ded5d114 100755 --- a/src/os-plugins/plugins/vmchooser/files/xmlfilter.sh +++ b/src/os-plugins/plugins/vmchooser/files/xmlfilter.sh @@ -1,7 +1,7 @@ #!/bin/bash # ----------------------------------------------------------------------------- # Copyright (c) 2007..2009 - RZ Uni FR -# Copyright (c) 2007..2009 - OpenSLX GmbH +# Copyright (c) 2007..2011 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -33,7 +33,7 @@ if [ -f ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf ]; then . ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf fi -for FILE in $(find $1 -iname *.xml); do +for FILE in $(find $1 -iname "*.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 |