diff options
6 files changed, 9 insertions, 9 deletions
diff --git a/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh b/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh index 9579b056..a7cf6b64 100644 --- a/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh +++ b/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh @@ -113,7 +113,7 @@ EOF -f /mnt/usr/sbin/smbd ] ; then testmkd /mnt/etc/qemu sed -e "s#NWIF#tapnat0#taphost0#;s#PIDDIR#/tmp/virt#" \ - /mnt/opt/openslx/plugins/virtualization/smb.conf \ + /mnt/opt/openslx/plugins/vmchooser/smb.conf \ >/mnt/etc/qemu/smb.conf fi fi diff --git a/src/os-plugins/plugins/qemukvm/files/run-virt.include b/src/os-plugins/plugins/qemukvm/files/run-virt.include index 80b9290d..de0109a3 100644 --- a/src/os-plugins/plugins/qemukvm/files/run-virt.include +++ b/src/os-plugins/plugins/qemukvm/files/run-virt.include @@ -250,8 +250,8 @@ writelog "\tNetwork kind:\t\t${network_kind}" # configure and start samba service to provide user's home directory if [ -f /usr/sbin/smbd ] ; then sudo /opt/openslx/rootfs/bin/sed -i /etc/qemu/smb.conf -e "s,$USER,USER," - sudo /usr/sbin/nmbd -c /etc/qemu/smb.conf - sudo /usr/sbin/smbd -c /etc/qemu/smb.conf + sudo /usr/sbin/nmbd -s /etc/qemu/smb.conf + sudo /usr/sbin/smbd -s /etc/qemu/smb.conf fi diff --git a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh index adacc556..46422701 100644 --- a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh +++ b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh @@ -92,7 +92,7 @@ if [ -e ${CONFFILE} ]; then # setting the base samba configuration [ -f /mnt/opt/openslx/plugins/vmchooser/smb.conf -a -f /mnt/usr/sbin/smbd ] && \ sed -e "s,NWIF,vboxnet0,;s,PIDDIR,/var/run/vbox," \ - /mnt/opt/openslx/plugins/virtualization/smb.conf \ + /mnt/opt/openslx/plugins/vmchooser/smb.conf \ >/mnt/etc/vbox/smb.conf # finished ... diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include index 48f95f22..694b65fe 100644 --- a/src/os-plugins/plugins/virtualbox/files/run-virt.include +++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include @@ -411,8 +411,8 @@ fi # configure and start samba service to provide user's home directory if [ -f /usr/sbin/smbd ] ; then sudo /opt/openslx/rootfs/bin/sed -i /etc/vbox/smb.conf -e "s,$USER,USER," - sudo /usr/sbin/nmbd -c /etc/vbox/smb.conf - sudo /usr/sbin/smbd -c /etc/vbox/smb.conf + sudo /usr/sbin/nmbd -s /etc/vbox/smb.conf + sudo /usr/sbin/smbd -s /etc/vbox/smb.conf fi # wait for a certain command to settle diff --git a/src/os-plugins/plugins/vmware/XX_vmware.sh b/src/os-plugins/plugins/vmware/XX_vmware.sh index eee8b17f..f7fe3948 100644 --- a/src/os-plugins/plugins/vmware/XX_vmware.sh +++ b/src/os-plugins/plugins/vmware/XX_vmware.sh @@ -78,7 +78,7 @@ stage3 setup" > ${PLUGINCONFDIR}/vmware.conf # setting the base samba configuration if available [ -f /mnt/opt/openslx/plugins/vmchooser/smb.conf -a -f /mnt/usr/sbin/smbd ] && \ sed -e "s,NWIF,$vmsub,;s,PIDDIR,/var/run/vmware," \ - /mnt/opt/openslx/plugins/virtualization/smb.conf \ + /mnt/opt/openslx/plugins/vmchooser/smb.conf \ >/etc/vmware/smb.conf fi diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include index d38e5dff..621f31db 100644 --- a/src/os-plugins/plugins/vmware/files/run-virt.include +++ b/src/os-plugins/plugins/vmware/files/run-virt.include @@ -506,8 +506,8 @@ writelog "" # configure and start samba service to provide user's home directory if [ -f /usr/sbin/smbd ] ; then sudo /opt/openslx/rootfs/bin/sed -i /etc/vmware/smb.conf -e "s,$USER,USER," - sudo /usr/sbin/nmbd -c /etc/vmware/smb.conf - sudo /usr/sbin/smbd -c /etc/vmware/smb.conf + sudo /usr/sbin/nmbd -s /etc/vmware/smb.conf + sudo /usr/sbin/smbd -s /etc/vmware/smb.conf fi # using the modified version of the wrapper script |