diff options
| author | Dirk | 2012-11-27 23:21:57 +0100 |
|---|---|---|
| committer | Dirk | 2012-11-27 23:21:57 +0100 |
| commit | e58bd4b97a18241356c8befb592761b84f8b8a5f (patch) | |
| tree | bf4f773b835512277ae1b48b7bd3dc73871a231b | |
| parent | ... (diff) | |
| download | core-e58bd4b97a18241356c8befb592761b84f8b8a5f.tar.gz core-e58bd4b97a18241356c8befb592761b84f8b8a5f.tar.xz core-e58bd4b97a18241356c8befb592761b84f8b8a5f.zip | |
Some more fixes ...
| -rw-r--r-- | src/os-plugins/plugins/qemukvm/XX_qemukvm.sh | 1 | ||||
| -rw-r--r-- | src/os-plugins/plugins/virtualbox/XX_virtualbox.sh | 5 | ||||
| -rw-r--r-- | src/os-plugins/plugins/vmchooser/XX_vmchooser.sh | 1 | ||||
| -rw-r--r-- | src/os-plugins/plugins/vmware/XX_vmware.sh | 6 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh b/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh index b0d40683..55c9434f 100644 --- a/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh +++ b/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh @@ -112,6 +112,7 @@ EOF if [ -f /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf -a \ -f /mnt/usr/sbin/smbd ] ; then testmkd /mnt/etc/qemu + testmkd /mnt/var/log/samba sed -e "s#NWIF#192.168.101.254,192.168.102.254#;s#PIDDIR#/tmp/virt#" \ /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf \ >/mnt/etc/qemu/smb.conf diff --git a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh index 37e1caa6..f2bf71ba 100644 --- a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh +++ b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh @@ -90,10 +90,13 @@ if [ -e ${CONFFILE} ]; then chown root:vboxusers /dev/vboxdrv # setting the base samba configuration - [ -f /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf -a -f /mnt/usr/sbin/smbd ] && \ + if [ -f /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf \ + -a -f /mnt/usr/sbin/smbd ] ; then sed -e "s,NWIF,vboxnet0,;s,PIDDIR,/var/run/vbox," \ /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf \ >/mnt/etc/vbox/smb.conf + testmkd /mnt/var/log/samba + fi # finished ... [ $DEBUGLEVEL -gt 0 ] && echo "done with 'virtualbox' os-plugin ..." diff --git a/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh b/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh index f86d96d3..957b24e7 100644 --- a/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh +++ b/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh @@ -75,6 +75,7 @@ if [ -e $CONFFILE ]; then # setup more scratch space for virtual machines, if configured testmkd /mnt/var/lib/virt/vmscratch testmkd /mnt/tmp/virt + testmkd /mnt/var/log/samba # enable normal users to setup the extended virtual machine redo file space # and image source via network block device (NBD only at the moment) diff --git a/src/os-plugins/plugins/vmware/XX_vmware.sh b/src/os-plugins/plugins/vmware/XX_vmware.sh index 6a43b8d4..a0ae8f40 100644 --- a/src/os-plugins/plugins/vmware/XX_vmware.sh +++ b/src/os-plugins/plugins/vmware/XX_vmware.sh @@ -76,11 +76,13 @@ stage3 setup" > ${PLUGINCONFDIR}/vmware.conf -e "s,LEASEFILE,/var/run/vmware/udhcpd-vmnet1.leases," \ /mnt/etc/opt/openslx/udhcpd.conf >/mnt/etc/vmware/udhcpd/udhcpd-vmnet1.conf # setting the base samba configuration if available - [ -f /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf \ - -a -f /mnt/usr/sbin/smbd ] && \ + if [ -f /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf \ + -a -f /mnt/usr/sbin/smbd ] ; then sed -e "s,NWIF,$vmsub,;s,PIDDIR,/var/run/vmware," \ /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf \ >/mnt/etc/vmware/smb.conf + testmkd /mnt/var/log/samba + fi fi # vmware nat interface configuration |