diff options
author | Volker Uhrig | 2008-02-20 19:05:19 +0100 |
---|---|---|
committer | Volker Uhrig | 2008-02-20 19:05:19 +0100 |
commit | ef844b368377ccbb72d3d8aecbd0c919c2504adc (patch) | |
tree | dcc5cd5e3bb5b93227427a292b1c3a00de9ce7e0 /os-plugins | |
parent | * fixed potential use of uninitialized value (diff) | |
download | core-ef844b368377ccbb72d3d8aecbd0c919c2504adc.tar.gz core-ef844b368377ccbb72d3d8aecbd0c919c2504adc.tar.xz core-ef844b368377ccbb72d3d8aecbd0c919c2504adc.zip |
* Cleaned out some deprecated vmware commands
* We won't build vmware modules in initramfs anymore. They will be on the system
anyway. This avoids also issues with depmod.
* Directory/URI of the images moved into the vmware plugin
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1565 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 21 | ||||
-rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 24 |
2 files changed, 28 insertions, 17 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index 048f0f38..91ff3289 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -75,6 +75,17 @@ sub getAttrInfo content_descr => 'allowed range is from 01-99', default => 70, }, + # attribute 'imagesrc' defines where we can find vmware images + 'vmware::imagessrc' => { + applies_to_systems => 1, + applies_to_clients => 1, + description => unshiftHereDoc(<<' End-of-Here'), + Where do we store our vmware images? NFS? Filesystem? + End-of-Here + content_regex => qr{^\d\d$}, + content_descr => 'Allowed values: path or URI', + default => "", + }, }; } @@ -102,14 +113,4 @@ sub preInstallationPhase } } - -sub suggestAdditionalKernelModules -{ - my $self = shift; - my $makeInitRamFSEngine = shift; - - # simply suggest these and see where we go from there (what is vmblock?) - return qw( vmmon vmnet vmblock ); -} - 1; diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index f58b6004..df78cbc3 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -8,7 +8,9 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then # load needed variables . /initramfs/plugin-conf/vmware.conf - # Test if this plugin is activated + # Test if this plugin is activated... + # TODO: err... I think we could save this test due of a changed + # plugin system if [ $vmware_active -ne 0 ]; then [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'vmware' os-plugin ..."; @@ -33,10 +35,10 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then [ -z "${pool}" ] && pool="default" # get source of vmware image server (get type, server and path) - if strinstr "/" "${vmware}" ; then - vmimgprot=$(uri_token ${vmware} prot) - vmimgserv=$(uri_token ${vmware} server) - vmimgpath="$(uri_token ${vmware} path)" + if strinstr "/" "${vmware_imagesrc}" ; then + vmimgprot=$(uri_token ${vmware_imagesrc} prot) + vmimgserv=$(uri_token ${vmware_imagesrc} server) + vmimgpath="$(uri_token ${vmware_imagesrc} path)" fi if [ -n "${vmimgserv}" ] ; then testmkd /mnt/var/lib/vmware @@ -113,8 +115,16 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then # needed for VMware 5.5.3 and versions below echo -e "\tmount -t usbfs usbfs /proc/bus/usb 2>/dev/null" \ >>/mnt/etc/${D_INITDIR}/boot.slx - # TODO: we still use this function? Prove if we can delete it. - config_vmware + # config_vmware deprecated? + #config_vmware + # link /etc/init.d/vmware, so it starts uppon boot + if [ -f /mnt/etc/${D_INITDIR}/vmware ] ; then + rllinker "vmware" 20 2 + else + error "df_errvmw" nonfatal + fi + + chmod 1777 /mnt/var/run/vmware # define a variable where gdm/kdm should look for additional sessions # do we really need it? looks like we can delete it... |