From 3c568a8f73b6305ae7b87aef488a2cfeddca31b6 Mon Sep 17 00:00:00 2001 From: Michael Neves Date: Wed, 12 Jun 2013 16:06:42 +0200 Subject: [ConsoleKit] systemd-logind replaces consolekit for user session management --- log | 302 ------------ .../vmchooser/vmchooser-temp/etc/init.d/vmware-env | 139 ------ .../opt/openslx/plugins/virtualbox/machine.include | 120 ----- .../openslx/plugins/virtualbox/run-virt.include | 441 ----------------- .../opt/openslx/plugins/virtualbox/virtualbox.conf | 4 - .../openslx/plugins/virtualbox/virtualbox.include | 56 --- .../opt/openslx/plugins/vmware/run-virt.include | 532 --------------------- .../etc/opt/openslx/plugins/vmware/vmware.conf | 8 - .../vmchooser-temp/etc/opt/openslx/udhcpd.conf | 37 -- .../vmchooser/vmchooser-temp/etc/vmware/config | 4 - .../vmchooser/vmchooser-temp/etc/vmware/nat.conf | 9 - .../vmchooser/vmchooser-temp/etc/vmware/smb.conf | 25 - .../etc/vmware/udhcpd/udhcpd-vmnet1.conf | 37 -- .../etc/vmware/udhcpd/udhcpd-vmnet8.conf | 37 -- .../vmchooser-temp/etc/vmware/usbarb.rules | 0 .../vmchooser-temp/etc/vmware/vmnet-natd-8.mac | 1 - .../opt/openslx/plugin-repo/vmchooser/run-virt.sh | 440 ----------------- .../opt/openslx/plugin-repo/vmchooser/vmchooser | Bin 1563753 -> 0 bytes .../opt/openslx/plugin-repo/vmchooser/xmlfilter.sh | 50 -- .../openslx/plugin-repo/vmware/run-virt.include | 532 --------------------- .../vmchooser-temp/var/opt/openslx/bin/run-virt.sh | 1 - .../vmchooser-temp/var/opt/openslx/bin/vmchooser | 1 - .../vmchooser-temp/var/opt/openslx/bin/vmplayer | 8 - .../vmchooser-temp/var/opt/openslx/bin/vmware | 8 - .../var/opt/openslx/bin/xmlfilter.sh | 1 - .../vmchooser-temp/vmchooser/default.desktop | 10 - .../vmchooser/vmchooser-temp/vmchooser/mesgdisp | Bin 222820 -> 0 bytes .../vmchooser/vmchooser-temp/vmchooser/printer.sh | 10 - .../vmchooser/vmchooser-temp/vmchooser/scanner.sh | 4 - .../vmchooser/vmchooser-temp/vmchooser/smb.conf | 25 - remote/targets/stage32/consolekit | 1 - 31 files changed, 2843 deletions(-) delete mode 100644 log delete mode 100755 remote/modules/vmchooser/vmchooser-temp/etc/init.d/vmware-env delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/machine.include delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/run-virt.include delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/virtualbox.conf delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/virtualbox.include delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/vmware/run-virt.include delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/vmware/vmware.conf delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/udhcpd.conf delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/vmware/config delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/vmware/nat.conf delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/vmware/smb.conf delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/vmware/udhcpd/udhcpd-vmnet1.conf delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/vmware/udhcpd/udhcpd-vmnet8.conf delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/vmware/usbarb.rules delete mode 100644 remote/modules/vmchooser/vmchooser-temp/etc/vmware/vmnet-natd-8.mac delete mode 100755 remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/run-virt.sh delete mode 100755 remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/vmchooser delete mode 100755 remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/xmlfilter.sh delete mode 100644 remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmware/run-virt.include delete mode 120000 remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/run-virt.sh delete mode 120000 remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmchooser delete mode 100755 remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmplayer delete mode 100755 remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmware delete mode 120000 remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/xmlfilter.sh delete mode 100755 remote/modules/vmchooser/vmchooser-temp/vmchooser/default.desktop delete mode 100755 remote/modules/vmchooser/vmchooser-temp/vmchooser/mesgdisp delete mode 100755 remote/modules/vmchooser/vmchooser-temp/vmchooser/printer.sh delete mode 100755 remote/modules/vmchooser/vmchooser-temp/vmchooser/scanner.sh delete mode 100755 remote/modules/vmchooser/vmchooser-temp/vmchooser/smb.conf delete mode 120000 remote/targets/stage32/consolekit diff --git a/log b/log deleted file mode 100644 index 11694002..00000000 --- a/log +++ /dev/null @@ -1,302 +0,0 @@ -25132 execve("/usr/bin/xrandr", ["xrandr"], [/* 58 vars */]) = 0 -25132 brk(0) = 0x87c1000 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 mmap2(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb7709000 -25132 access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory) -25132 open("/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3 -25132 fstat64(3, {st_mode=S_IFREG|0644, st_size=102401, ...}) = 0 -25132 mmap2(NULL, 102401, PROT_READ, MAP_PRIVATE, 3, 0) = 0xb76ef000 -25132 close(3) = 0 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 open("/usr/lib/i386-linux-gnu/libXrandr.so.2", O_RDONLY|O_CLOEXEC) = 3 -25132 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\300\24\0\0004\0\0\0"..., 512) = 512 -25132 fstat64(3, {st_mode=S_IFREG|0644, st_size=38364, ...}) = 0 -25132 mmap2(NULL, 41180, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb76e4000 -25132 mmap2(0xb76ed000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x8) = 0xb76ed000 -25132 close(3) = 0 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 open("/usr/lib/i386-linux-gnu/libX11.so.6", O_RDONLY|O_CLOEXEC) = 3 -25132 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\20D\1\0004\0\0\0"..., 512) = 512 -25132 fstat64(3, {st_mode=S_IFREG|0644, st_size=1268672, ...}) = 0 -25132 mmap2(NULL, 1272664, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb75ad000 -25132 mmap2(0xb76e0000, 16384, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x132) = 0xb76e0000 -25132 close(3) = 0 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 open("/lib/i386-linux-gnu/libm.so.6", O_RDONLY|O_CLOEXEC) = 3 -25132 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0000D\0\0004\0\0\0"..., 512) = 512 -25132 fstat64(3, {st_mode=S_IFREG|0644, st_size=173588, ...}) = 0 -25132 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb75ac000 -25132 mmap2(NULL, 176272, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb7580000 -25132 mmap2(0xb75aa000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x29) = 0xb75aa000 -25132 close(3) = 0 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 open("/lib/i386-linux-gnu/libc.so.6", O_RDONLY|O_CLOEXEC) = 3 -25132 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0000\226\1\0004\0\0\0"..., 512) = 512 -25132 fstat64(3, {st_mode=S_IFREG|0755, st_size=1730024, ...}) = 0 -25132 mmap2(NULL, 1743580, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb73d6000 -25132 mprotect(0xb7579000, 4096, PROT_NONE) = 0 -25132 mmap2(0xb757a000, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1a3) = 0xb757a000 -25132 mmap2(0xb757d000, 10972, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0xb757d000 -25132 close(3) = 0 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 open("/usr/lib/i386-linux-gnu/libXext.so.6", O_RDONLY|O_CLOEXEC) = 3 -25132 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\260(\0\0004\0\0\0"..., 512) = 512 -25132 fstat64(3, {st_mode=S_IFREG|0644, st_size=68272, ...}) = 0 -25132 mmap2(NULL, 71400, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb73c4000 -25132 mmap2(0xb73d4000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0xf) = 0xb73d4000 -25132 close(3) = 0 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 open("/usr/lib/i386-linux-gnu/libXrender.so.1", O_RDONLY|O_CLOEXEC) = 3 -25132 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\360\23\0\0004\0\0\0"..., 512) = 512 -25132 fstat64(3, {st_mode=S_IFREG|0644, st_size=38564, ...}) = 0 -25132 mmap2(NULL, 37288, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb73ba000 -25132 mmap2(0xb73c2000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x8) = 0xb73c2000 -25132 close(3) = 0 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 open("/usr/lib/i386-linux-gnu/libxcb.so.1", O_RDONLY|O_CLOEXEC) = 3 -25132 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\20|\0\0004\0\0\0"..., 512) = 512 -25132 fstat64(3, {st_mode=S_IFREG|0644, st_size=132680, ...}) = 0 -25132 mmap2(NULL, 135468, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb7398000 -25132 mmap2(0xb73b8000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1f) = 0xb73b8000 -25132 close(3) = 0 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 open("/lib/i386-linux-gnu/libdl.so.2", O_RDONLY|O_CLOEXEC) = 3 -25132 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0`\n\0\0004\0\0\0"..., 512) = 512 -25132 fstat64(3, {st_mode=S_IFREG|0644, st_size=13952, ...}) = 0 -25132 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb7397000 -25132 mmap2(NULL, 16516, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb7392000 -25132 mmap2(0xb7395000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2) = 0xb7395000 -25132 close(3) = 0 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 open("/usr/lib/i386-linux-gnu/libXau.so.6", O_RDONLY|O_CLOEXEC) = 3 -25132 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0`\n\0\0004\0\0\0"..., 512) = 512 -25132 fstat64(3, {st_mode=S_IFREG|0644, st_size=9608, ...}) = 0 -25132 mmap2(NULL, 12424, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb738e000 -25132 mmap2(0xb7390000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1) = 0xb7390000 -25132 close(3) = 0 -25132 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) -25132 open("/usr/lib/i386-linux-gnu/libXdmcp.so.6", O_RDONLY|O_CLOEXEC) = 3 -25132 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\240\16\0\0004\0\0\0"..., 512) = 512 -25132 fstat64(3, {st_mode=S_IFREG|0644, st_size=21888, ...}) = 0 -25132 mmap2(NULL, 24692, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb7387000 -25132 mmap2(0xb738c000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x4) = 0xb738c000 -25132 close(3) = 0 -25132 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb7386000 -25132 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb7385000 -25132 set_thread_area({entry_number:-1 -> 6, base_addr:0xb7386ac0, limit:1048575, seg_32bit:1, contents:0, read_exec_only:0, limit_in_pages:1, seg_not_present:0, useable:1}) = 0 -25132 mprotect(0xb757a000, 8192, PROT_READ) = 0 -25132 mprotect(0xb738c000, 4096, PROT_READ) = 0 -25132 mprotect(0xb7390000, 4096, PROT_READ) = 0 -25132 mprotect(0xb7395000, 4096, PROT_READ) = 0 -25132 mprotect(0xb73b8000, 4096, PROT_READ) = 0 -25132 mprotect(0xb76e0000, 4096, PROT_READ) = 0 -25132 mprotect(0xb73c2000, 4096, PROT_READ) = 0 -25132 mprotect(0xb73d4000, 4096, PROT_READ) = 0 -25132 mprotect(0xb75aa000, 4096, PROT_READ) = 0 -25132 mprotect(0xb76ed000, 4096, PROT_READ) = 0 -25132 mprotect(0x8054000, 4096, PROT_READ) = 0 -25132 mprotect(0xb772c000, 4096, PROT_READ) = 0 -25132 munmap(0xb76ef000, 102401) = 0 -25132 brk(0) = 0x87c1000 -25132 brk(0x87e2000) = 0x87e2000 -25132 socket(PF_FILE, SOCK_STREAM|SOCK_CLOEXEC, 0) = 3 -25132 connect(3, {sa_family=AF_FILE, path=@"/tmp/.X11-unix/X0"}, 20) = 0 -25132 getpeername(3, {sa_family=AF_FILE, path=@"/tmp/.X11-unix/X0"}, [20]) = 0 -25132 uname({sys="Linux", node="mbox", ...}) = 0 -25132 access("/home/michael/.Xauthority", R_OK) = 0 -25132 open("/home/michael/.Xauthority", O_RDONLY) = 4 -25132 fstat64(4, {st_mode=S_IFREG|0600, st_size=99, ...}) = 0 -25132 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb7708000 -25132 read(4, "\1\0\0\4mbox\0\00210\0\22MIT-MAGIC-COOKIE-1"..., 4096) = 99 -25132 read(4, "", 4096) = 0 -25132 close(4) = 0 -25132 munmap(0xb7708000, 4096) = 0 -25132 getsockname(3, {sa_family=AF_FILE, NULL}, [2]) = 0 -25132 fcntl64(3, F_GETFL) = 0x2 (flags O_RDWR) -25132 fcntl64(3, F_SETFL, O_RDWR|O_NONBLOCK) = 0 -25132 fcntl64(3, F_SETFD, FD_CLOEXEC) = 0 -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"l\0\v\0\0\0\22\0\20\0\0\0", 12}, {"", 0}, {"MIT-MAGIC-COOKIE-1", 18}, {"\0\0", 2}, {"}\353\343#WO\242\343\fw\273$p\4F\201", 16}, {"", 0}], 6) = 48 -25132 recv(3, "\1\0\v\0\0\0\363\0", 8, 0) = 8 -25132 recv(3, "\240l\254\0\0\0`\4\377\377\37\0\0\1\0\0\24\0\377\377\1\7\0\0 \10\377\0\0\0\0"..., 972, 0) = 972 -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"b\0\5\0\f\0\0\0BIG-REQUESTS", 20}], 1) = 20 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\1\0\0\0\0\0\1\205\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\205\0\1\0", 4}], 1) = 4 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\2\0\0\0\0\0\377\377?\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"7\0\5\0\0\0`\4\270\0\0\0\10\0\0\0\377\377\377\0\24\0\6\0\270\0\0\0\27\0\0\0"..., 44}, {NULL, 0}, {"", 0}], 3) = 44 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\10\4\0\33\0\0\0\37\0\0\0\0\0\0\0k\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 4096, 0) = 140 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"b\0\5\0\t\0`\4", 8}, {"XKEYBOARD", 9}, {"\0\0\0", 3}], 3) = 20 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\5\0\0\0\0\0\1\207U\211\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\207\0\2\0\1\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\1\6\0\0\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"b\0\4\0\5\0\0\0", 8}, {"RANDR", 5}, {"\0\0\0", 3}], 3) = 16 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\7\0\0\0\0\0\1\214Z\223\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"b\0\10\0\27\0\0\0", 8}, {"Generic Event Extension", 23}, {"\0", 1}], 3) = 32 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\10\0\0\0\0\0\1\200\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\200\0\2\0\1\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\t\0\0\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\0\3\0\1\0\0\0\4\0\0\0", 12}, {NULL, 0}, {"", 0}], 3) = 12 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\n\0\0\0\0\0\1\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\6\2\0\270\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\v\0\0\0\0\0@\1\310\0\0 \0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\10\2\0\270\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\f\0\257\0\0\0\244n\1\0)b\0\0\2\0\3\0\21\0\205\0\0\0\0\0\0\0\0\0"..., 4096, 0) = 732 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\24\3\0?\0\0\0)b\0\0", 12}, {NULL, 0}, {"", 0}], 3) = 12 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\r\0\4\0\0\0\244n\1\0\0\0\0\0\220\6\32\4E\0\0\0\1\0?\0\1\0\3\0"..., 4096, 0) = 48 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\34\2\0?\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\16\0\1\0\0\0\244n\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 4096, 0) = 36 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\33\2\0?\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\17\0\20\0\0\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\0\0"..., 4096, 0) = 96 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\24\3\0@\0\0\0)b\0\0", 12}, {NULL, 0}, {"", 0}], 3) = 12 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\20\0\4\0\0\0\244n\1\0\220\6\32\0\0\5\0\4H\0\0\0\1\0?\0\1\0\3\0"..., 4096, 0) = 48 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\34\2\0@\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\21\0\1\0\0\0\244n\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 4096, 0) = 36 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\33\2\0@\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\22\0\20\0\0\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\0\0"..., 4096, 0) = 96 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\t\3\0A\0\0\0)b\0\0", 12}, {NULL, 0}, {"", 0}], 3) = 12 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\23\0\25\0\0\0\244n\1\0?\0\0\0\332\1\0\0(\1\0\0\0\0\2\0\21\0\1\0"..., 4096, 0) = 116 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\26\2\0?\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\24\0\0\0\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\27\2\0?\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\25\0\200\1\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 4096, 0) = 1568 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\37\2\0\270\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\26\0\0\0\0\0A\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\t\3\0B\0\0\0)b\0\0", 12}, {NULL, 0}, {"", 0}], 3) = 12 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\27\0\17\0\0\0\244n\1\0@\0\0\0x\1\0\0-\1\0\0\0\0\2\0\n\0\1\0"..., 4096, 0) = 92 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\26\2\0@\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\30\0\0\0\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\27\2\0@\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\31\0\200\1\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 4096, 0) = 1568 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\37\2\0\270\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\32\0\0\0\0\0A\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\t\3\0C\0\0\0)b\0\0", 12}, {NULL, 0}, {"", 0}], 3) = 12 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\33\0\4\0\0\0\244n\1\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\2\0\0\0\0\0"..., 4096, 0) = 48 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 poll([{fd=3, events=POLLIN|POLLOUT}], 1, -1) = 1 ([{fd=3, revents=POLLOUT}]) -25132 writev(3, [{"\214\37\2\0\270\0\0\0", 8}, {NULL, 0}, {"", 0}], 3) = 8 -25132 poll([{fd=3, events=POLLIN}], 1, -1) = 1 ([{fd=3, revents=POLLIN}]) -25132 recv(3, "\1\0\34\0\0\0\0\0A\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 4096, 0) = 32 -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 recv(3, 0x87c1ae0, 4096, 0) = -1 EAGAIN (Resource temporarily unavailable) -25132 fstat64(1, {st_mode=S_IFCHR|0600, st_rdev=makedev(136, 4), ...}) = 0 -25132 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb7708000 -25132 write(1, "Screen 0: minimum 320 x 200, cur"..., 70) = 70 -25132 write(1, "VGA1 connected 1680x1050+0+0 (no"..., 86) = 86 -25132 write(1, " 1680x1050 59.9*+ 60.0 "..., 34) = 34 -25132 write(1, " 1280x1024 75.0 60.0 "..., 34) = 34 -25132 write(1, " 1440x900 75.0 59.9 "..., 34) = 34 -25132 write(1, " 1280x960 60.0 \n", 25) = 25 -25132 write(1, " 1152x864 75.0 \n", 25) = 25 -25132 write(1, " 1024x768 75.1 60.0 "..., 34) = 34 -25132 write(1, " 832x624 74.6 \n", 25) = 25 -25132 write(1, " 800x600 75.0 60.3 "..., 43) = 43 -25132 write(1, " 640x480 75.0 60.0 "..., 34) = 34 -25132 write(1, " 720x400 70.1 \n", 25) = 25 -25132 write(1, "HDMI1 connected 1280x1024+1680+2"..., 91) = 91 -25132 write(1, " 1280x1024 60.0*+ 75.0 "..., 34) = 34 -25132 write(1, " 1152x864 75.0 \n", 25) = 25 -25132 write(1, " 1024x768 75.1 60.0 "..., 34) = 34 -25132 write(1, " 800x600 75.0 60.3 "..., 34) = 34 -25132 write(1, " 640x480 75.0 60.0 "..., 34) = 34 -25132 write(1, " 720x400 70.1 \n", 25) = 25 -25132 write(1, "DP1 disconnected (normal left in"..., 60) = 60 -25132 exit_group(0) = ? diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/init.d/vmware-env b/remote/modules/vmchooser/vmchooser-temp/etc/init.d/vmware-env deleted file mode 100755 index 78fac650..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/init.d/vmware-env +++ /dev/null @@ -1,139 +0,0 @@ -#!/bin/sh -# Copyright (c) 2009 - OpenSLX GmbH -# -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org/ -# ----------------------------------------------------------------------------- -# §filename§ -# - §desc§ -# §generated§ -# ----------------------------------------------------------------------------- - -### BEGIN INIT INFO -# Provides: vmware-slx -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 1 -# Short-Description: Setup environment for VMware Workstation or Player (local5X). -### END INIT INFO - -. /lib/lsb/init-functions - -#functions: helper functions -tempdir () { -# Create a special tempfs directory -mkdir -m 1777 -p /tmp/vmware -# Don't mount special tempfs, when using local harddrive for /tmp -[ ! -n "$(cat /proc/mounts |grep ' /tmp '|grep '/dev/sd')" ] \ - && mount -t tmpfs -o size=180%,mode=1777 tmpfs /tmp/vmware - -} - -load_modules () { -# VMplayer common stuff -insmod /lib/modules/$(uname -r)/misc/vmmon.ko || return 1 -insmod /lib/modules/$(uname -r)/misc/vmnet.ko || return 1 -# VMplayer 3.X specific stuff -insmod /lib/modules/$(uname -r)/misc/vmci.ko -insmod /lib/modules/$(uname -r)/misc/vmblock.ko -insmod /lib/modules/$(uname -r)/misc/vsock.ko - -} - -unload_modules () { -rmmod vmnet vmmonvsock vmci vmblock 2>/dev/null -} - -vmnetif () { -# let point the path directly to the directory where the binary lives -location="/usr/bin" -if [ -n "$vmnet0" ] ; then - # the path might be directly point to the plugin dir - $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0 -fi -if [ -n "$vmnet1" ] ; then - $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \ - /dev/vmnet1 vmnet1 - ip addr add $vmnet1 dev vmnet1 - ip link set vmnet1 up - if [ -n "$vmnet1nat" ] ; then - echo "1" >/proc/sys/net/ipv4/conf/vmnet1/forwarding 2>/dev/null - echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null - #iptables -A -s vmnet1 -d br0 - fi - /opt/openslx/rootfs/usr/sbin/udhcpd \ - -S /etc/vmware/udhcpd/udhcpd-vmnet1.conf -fi -if [ -n "$vmnet8" ] ; then - $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet8.pid \ - /dev/vmnet8 vmnet8 - ip addr add $vmnet8 dev vmnet8 - ip link set vmnet8 up - echo "1" >/proc/sys/net/ipv4/conf/vmnet8/forwarding 2>/dev/null - echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null - iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE - # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50 - $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \ - -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf 2>/dev/null # or logfile - /opt/openslx/rootfs/usr/sbin/udhcpd \ - -S /etc/vmware/udhcpd/udhcpd-vmnet8.conf -fi - -} - -vmblock () { -# let point the path directly to the directory where the binary lives - /usr/bin/vmware-usbarbitrator - -} - - -case "$1" in - start) - #start: defines start function for initscript - # include default directories - . /etc/opt/openslx/openslx.conf - # load the configuration file - . ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf - # hack to access the first serial/parallel port - chmod a+rw /dev/ttyS0 - chmod a+rw /dev/parport0 - tempdir - load_modules - vmnetif - vmblock - - ;; - stop) - #stop: defines stop function for initscript - killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \ - vmware-tray vmnet-dhcpd 2>/dev/null - # might take a while until all services are shut down - sleep 1 - umount -l /tmp/vmware 2>/dev/null - unload_modules - - ;; - restart) - #restart: defines restart function for initscript - $0 stop && $0 start - ;; - status) - #status: defines status function for initscript - vmstatus - ;; - *) - #usage: defines usage function for initscript - ## print out usage - echo "Usage: $0 {start, stop, restart, status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/machine.include b/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/machine.include deleted file mode 100644 index 6367d3d9..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/machine.include +++ /dev/null @@ -1,120 +0,0 @@ -# ----------------------------------------------------------------------------- -# Copyright (c) 2010..2012 - OpenSLX GmbH -# -# This program/file is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org -# ----------------------------------------------------------------------------- -# Include file (machine template) for run-virt.include of the OpenSLX virtual- -# box plugin -cat << EOF > "${machconfig}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <${network_kind}/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -EOF diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/run-virt.include b/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/run-virt.include deleted file mode 100644 index cd5329a1..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/run-virt.include +++ /dev/null @@ -1,441 +0,0 @@ -# run-virt.include -# ----------------------------------------------------------------------------- -# Copyright (c) 2009..2011 - RZ Uni Freiburg -# Copyright (c) 2009..2012 - OpenSLX GmbH -# -# This program/file is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org -# ----------------------------------------------------------------------------- -# run-virt.include -# - Include script for running the VirtualBox on an OpenSLX client via the -# run-virt.sh or run-vmgrid.sh -################################################################################ - -################################################################################ -### Include general configuration -################################################################################ -if [ -f ${OPENSLX_DEFAULT_CONFDIR}/plugins/${self}/${self}.conf ]; then - . ${OPENSLX_DEFAULT_CONFDIR}/plugins/${self}/${self}.conf -else - writelog "Problems reading config file of ${self} plugin" - exit 1 -fi - -################################################################################ -### Declaration of default variables -################################################################################ - -PLUGINCONFVIRTUALBOX="${PLUGINCONFROOT}/${self}" -PLUGINDIRVIRTUALBOX="${OPENSLX_DEFAULT_DIR}/plugin-repo/${self}" -# create TMPDIR for all users -TMPDIR=/tmp/virt/${self} -mkdir -m 1777 ${TMPDIR} 2>/dev/null -# dir for configs -confdir="/tmp/virt/${self}/${USER}/${VM_ID}" -# use alternate configuration directory instead of $HOME/.VirtualBox -export VBOX_USER_HOME=${confdir} -# define dirs and files which can be removed after exit, be carefull! -RMDIRS="${snapshotdir} ${confdir} /tmp/virt/.vbox-${USER}-ipc" -rm -rf ${RMDIRS} 2>/dev/null -machfolder="${confdir}/Machines" -# use vm_shortname for dir and config names since vm_name can be very long -machconfig="${machfolder}/${vm_shortname}/${vm_shortname}.xml" -diskfolder="${confdir}/HardDisks" -snapshotdir=${machfolder}/${vm_shortname}/Snapshots -mkdir -p ${diskfolder} ${snapshotdir} 2>/dev/null -# check if diskless var empty? -[ -z "${diskless}" ] && diskless=0 -# default guest audio controller (SB16, AC97, HDA) -guestaudio="HDA" -# default guest network adaptor -vb_network_card="Am79C973" -# default setting for accelerated 2D grapics (OS dependent) -enable2d="true" -# set default graphics ram -vram="128" - -# configure our own rwimg, empty image which we provide -if [ "${imgmode}" = "rwimg" ]; then - # what is our rwimg called? - imgname="${vm_shortname}.vdi" - vmpath=${imgpath}/${imgname} - if ! [ -e "${vmpath}" ]; then - cat ${PLUGINDIRVIRTUALBOX}/rwimg.vdi.gz | gunzip > "${vmpath}" - fi -fi - -# link to image -diskfile="${diskfolder}/${imgname}" -[ ${diskless} -eq 0 ] && ln -sf ${vmpath} ${diskfile} - -# check the file type -if echo ${imgname} | grep -qiE "vdi|vmdk|vhd" && [ ${diskless} -eq 0 ]; then - imgfmt=$(echo ${imgname##*.} | tr "[a-z]" "[A-Z]") -elif [ ${diskless} -eq 0 ]; then - writelog "${imgname} is not a valid image format (vdi|vmdk|vhd), exiting!" - cleanexit 1 -fi - -# nested paging -npaging="false" -# enable VT -enablevt="false" -# check for VT, if not available use only 1 cpu (only 1 supported) -[ ${vtflag} -eq 0 ] && cpu_cores=1 -[ ${vtflag} -eq 1 ] && enablevt="true" - -# set some base configuration depending on the guest operating system -case "${vmostype}" in - win31*) - guestaudio="SB16" - vmostype="Windows31" - mem="32" - vram="16" - cpu_cores=1 - enablevt="false" - ;; - win95*) - vmostype="Windows95" - guestaudio="SB16" - mem="92" - vram="32" - cpu_cores=1 - enablevt="false" - ;; - win98*) - vmostype="Windows98" - guestaudio="SB16" - mem="256" - vram="64" - cpu_cores=1 - ;; - winme*) - vmostype="WindowsMe" - guestaudio="AC97" - mem="256" - vram="64" - cpu_cores=1 - ;; - winxp*|windowsxp*) - vmostype="WindowsXP" - guestaudio="AC97" - ;; - winvista*|windowsvista*) - vmostype="WindowsVista" - ;; - windows7*) - vmostype="Windows7" - ;; - linux*|*ubuntu*|*suse*|debian*|*sci*) - if echo "${vmostype}" | grep -q "64"; then - vmostype="Linux26_64" - # check for vtflag - if [ ${vtflag} -ne 1 ]; then - writelog "You are trying to boot a 64 bit OS without a VT enabled CPU" - writelog "This is not supported, exiting!" - cleanexit 1 - fi - # check if host is only 32 bit, then use only 1 cpu (only 1 supported) - if echo "${host_arch}" | grep -qE "i.86"; then - cpu_cores=1 - fi - else - vmostype="Linux26" - fi - ;; - os2*) - mem="256" - vmostype="OS2eCS" - cpu_cores=1 - enable2d="false" - ;; - macos*|MacOS*) - vmostype="MacOS" - enable2d="false" - ;; - *) - vmostype="Other" - enable2d="false" - ;; -esac - -writelog "Directories:" -writelog "\tConfig dir:\t\t$confdir" -writelog "\tMachines dir:\t\t$machfolder" -writelog "\tMachine config:\t\t$machconfig" -[ ${diskless} -eq 0 ] && writelog "\tHardDisks dir:\t\t$diskfolder" - -################################################################################ -### Hardware checks -################################################################################ - -# remove ':' from MAC addr for vbox -macaddr=$(echo ${macaddr} | sed 's/://g') - -# machine UUID, MAC addr part of it -machineuuid="00000000-0000-0000-0000-${macaddr}" -# cosmetical, since UUID in lower case -machineuuid=$(echo ${machineuuid} | tr "[A-Z]" "[a-z]") -# get UUID of VBox image, if not diskless -[ ${diskless} -eq 0 ] && diskuuid=$(VBoxManage -q showvdiinfo ${diskfile} \ - | grep UUID | awk '{print $2}') -# make disk immutable -imgtype="Immutable" -# snapshot UUID is static -snapshotuuid="34f617be-192a-46b3-a8ae-bce1029e093f" -# imageuuid in machine.include, dafault snapshotuuid -imageuuid=${snapshotuuid} - -# check if rw image -# remove disk and add rwimg if set -if echo "${imgmode}" | grep -q rw; then - # lock existing? - if [ -e "${vmpath}.lock" ]; then - writelog "This rw image is already in use." - writelog "Found lock: ${vmpath}.lock, exiting!" - writelog "Remove lock if you are sure that this is not the case" - cleanexit 1 - # image rw? - elif ! [ -w ${vmpath} ]; then - writelog "You defined mode rw, but image ${vmpath} is not rw! \c" - writelog "Please correct, exiting!" - cleanexit 1 - fi - # add lock - touch "${vmpath}.lock" - # remove lock after VM stopped - RMDIRS="${RMDIRS} ${vmpath}.lock" - imgtype="Normal" - # replace image uuid in machine config - imageuuid=${diskuuid} -elif [ ${diskless} -eq 0 ]; then - # use temp disk as snapshot - cat ${PLUGINDIRVIRTUALBOX}/empty-diff.vdi.gz \ - | gunzip > "${snapshotdir}/{${snapshotuuid}}.vdi" - # patch the disk file uuid into the snapshot vdi file - dd if=${diskfile} of="${snapshotdir}/{${snapshotuuid}}.vdi" seek=424 \ - skip=392 bs=1 count=16 conv=notrunc -fi - -# TODO: MEM muss noch angepasst werden. Maschine crasht wenn mehr als 50% MEM -# memory part equal to vmware plugin -# percentage of memory to use for virtualbox in standard case -#if [ -n "${forcemem}" ]; then -# mem="${forcemem}" -#else -# permem=30 -# if [ "${totalmem}" -ge "1600" ]; then -# permem=40 -# fi -# # check if /tmp is on harddisk -# if grep -qe "/dev/.* /tmp " /proc/mounts ; then -# permem=60 -# id44="1" -# # Hack, if more than 2,5G RAM use 40% of Ram and write vmem into Ram as well -# # (40% vmware | 40% confdir(vmem...) | 20% host -# # VMplayer 2+ issue -# # TODO: makes this sense for vbox? -# #if [ "${totalmem}" -ge "2500" ]; then -# #permem=40 -# #rmdir ${snapshotdir} -# #snapshotdirold=${snapshotdir} -# #snapshotdir=/dev/shm/${self}/${USER}/${VM_ID} -# #mkdir -p ${snapshotdir} -# #ln -sf ${snapshotdir} ${snapshotdirold} -# #fi -# fi -# mem=$(expr ${totalmem} / 100 \* ${permem}) -# if [ "${id44}" = "1" ]; then -# hostmem=$(expr ${totalmem} - ${mem}) -# else -# hostmem=$(expr ${totalmem} - ${mem} - ${mem}) -# fi -# #permem=40 -# #mem=$(expr ${totalmem} * ${permem}) -#fi - -# translate network cards -case "${network_card}" in - e1000) - vb_network_card="82540EM" - ;; - virtio) - vb_network_card="virtio" - ;; - *) - network_card="pcnet" - vb_network_card="Am79C973" -esac - -# translate network kinds (nat, bridged, host-only) -case "${network_kind}" in - bridge*) - network_kind='BridgedInterface name="br0"' - ;; - host*) - network_kind='HostOnlyInterface name="vboxnet0"' - ;; - *) - network_kind="NAT" -esac - -# configure 3d settings -case "${enable3d}" in - *true*|*yes*) - enable3d="true" - ;; - *) - enable3d="false" - ;; -esac - -# translate boot, use if set else set to HardDisk -# usually support for a,c,d,n, stands for Floppy, HD, CD-ROM, Network -# support nfs and tftp as well -case ${boot} in - n*|tftp) - boot="Network" - if [ "${network_kind}" = "NAT" ] && [ -n "${virtualbox_tftpdir}" ]; then - # use vm_shortname to avoid Problems /w TFTP in NAT - vm_name=${vm_shortname} - # link TFTP dir for NAT TFTP boots - mkdir -p ${confdir}/TFTP - if [ -e ${virtualbox_tftpdir}/pxelinux.0 ]; then - cp ${virtualbox_tftpdir}/pxelinux.0 ${confdir}/TFTP/${vm_name}.pxe - else - writelog "${virtualbox_tftpdir}/pxelinux.0 not found!" - writelog "Network boot won't work, exiting!" - cleanexit 1 - fi - for i in $(ls ${virtualbox_tftpdir}); do - ln -sf ${virtualbox_tftpdir}/${i} ${confdir}/TFTP/${i} - done - fi - ;; - # later maybe c|disk|hd*|sd*) for HD and d|cd*) for CD-ROM - *) - boot="HardDisk" - ;; -esac - -# external GUI -vrdpport=${remotedesktopport} - -[ ${diskless} -eq 0 ] && writelog "\tSnapshots dir:\t\t$snapshotdir" -writelog "Diskimage:" -[ ${diskless} -eq 0 ] && writelog "\tDisk file:\t\t$diskfile" -[ ${diskless} -eq 0 ] && writelog "\tDisk format:\t\t$imgfmt" -[ ${diskless} -eq 0 ] && writelog "\tDisk type:\t\t$imgtype" - writelog "\tVMostype:\t\t$vmostype" - writelog "\tMachine UUID:\t\t$machineuuid" -[ ${diskless} -eq 0 ] && writelog "\tDisk UUID:\t\t$diskuuid" -writelog "Virtual Hardware:" -writelog "\tCPU cores:\t\t${cpu_cores}\c" -[ ${vtflag} -eq 0 ] && writelog "" -[ ${vtflag} -eq 1 ] && writelog " (VT enabled CPU)" -writelog "\tGuest RAM:\t\t${mem} MB" -# echo nur wenn hostmem gesetzt -[ -n "${hostmem}" ] && writelog "\tHost RAM:\t\t${hostmem} MB" -writelog "\tMAC address:\t\t$macaddr" -writelog "\tNetwork card:\t\t${vb_network_card}" -writelog "\tNetwork kind:\t\t${network_kind}" -writelog "\tBooting from:\t\t${boot}\c" -[ ${diskless} -eq 0 ] && writelog "" -[ ${diskless} -eq 1 ] && writelog " 'diskless'" -# TODO: server start activate via xml, etc... -#writelog "\tGuest VRDP port:\t${vrdpport}" -writelog "\tCD-ROM1:\t\t${cdrom0}" -#writelog "\tCD-ROM2:\t\t${cdrom1}" -writelog "\tFloppy_A:\t\t${floppy0}" -writelog "\tFloppy_B:\t\t${floppy1}" -# defined in run-virt.sh and run-vmgrid.sh -writelog "\tShared Folders '${sharename}':\t${sharepath}" - -################################################################################ -### Pepare and configure virtual machine and disk image -################################################################################ - -# create Virtualbox.xml -. ${PLUGINCONFVIRTUALBOX}/virtualbox.include - -# remove snapshot disk when using rw images -if [ "${imgtype}" != "Immutable" ]; then - sed -i "/${snapshotuuid}/d" "${confdir}/VirtualBox.xml" -fi - -# TODO: add rawdisk if requested -#"raw.vmdk" format="VMDK" type="Writethrough"/> - -# create machine.xml -. ${PLUGINCONFVIRTUALBOX}/machine.include - -# remove CD-ROM if not available -if [ "${cdrom0}" != "TRUE" ]; then - sed -i "/HostDrive/d" ${machconfig} - sed -i '/AttachedDevice.*type="DVD"/d' ${machconfig} - sed -i "//d" ${machconfig} -fi - -# if diskless remove all disks -if [ ${diskless} -eq 1 ]; then - sed -i "//d" ${machconfig} -fi - -# define redirects -if [ ${redirects} -ge 1 ]; then - (( i=1 )) - writelog "\tGuest redirects:\t\c" - while [ ${i} -le ${redirects} ]; do - extradataitem='" - extradatahostport="HostPort\" value=\"${redirect_hport[$i]}\"/>" - extradataguestport="GuestPort\" value=\"${redirect_gport[$i]}\"/>" - sed -i "s,, ${extradataitem}${extradataguestport}\n\ - ${extradataitem}${extradatahostport}\n\ - ${extradataitem}${extradataprotocol}\n\ - ," "${machconfig}" - writelog "${tabspace}${redirect_name[$i]} port: ${redirect_hport[$i]}" - tabspace='\t\t\t\t' - (( i=$i+1 )) - done -fi - -################################################################################ -### finally set env for run-virt.sh -################################################################################ - -# 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 -s /etc/vbox/smb.conf - sudo /usr/sbin/smbd -s /etc/vbox/smb.conf -fi - -# wait for a certain command to settle -# get the PID of the right process -# kill PID, seems to work -VBMANPID=$(pstree -p | grep VBoxXPCOMIPCD | grep -ivE "VirtualBox|VBoxHeadless"\ - | sed -e "s/.*VBoxXPCOMIPCD(\(.*\)).*/\1/") -for i in $(echo ${VBMANPID}); do - kill -9 ${VBMANPID} >/dev/null 2>&1 -done - -# set the variables appropriately (several interfaces with different names) -VIRTCMD=$(which VirtualBox 2>/dev/null) -VIRTCMDOPTS="--startvm ${machineuuid} --start-running" - -# set headless mode (-v off to disable vrdp) -VIRTCMDHL=$(which VBoxHeadless 2>/dev/null) -VIRTCMDOPTSHL="-s ${machineuuid}" -RMDIRS="${TMPDIR}" - diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/virtualbox.conf b/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/virtualbox.conf deleted file mode 100644 index e6e185f2..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/virtualbox.conf +++ /dev/null @@ -1,4 +0,0 @@ -virtualbox_active="1" -virtualbox_bridge="0" -virtualbox_imagesrc="" -virtualbox_tftpdir="/var/lib/virt/virtualbox" diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/virtualbox.include b/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/virtualbox.include deleted file mode 100644 index 70ca394c..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/virtualbox/virtualbox.include +++ /dev/null @@ -1,56 +0,0 @@ -# ----------------------------------------------------------------------------- -# Copyright (c) 2010..2012 - OpenSLX GmbH -# -# This program/file is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org -# ----------------------------------------------------------------------------- -# Include file (general template) for run-virt.include of the virtualbox plugin -cat << EOF > "${confdir}/VirtualBox.xml" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -EOF diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/vmware/run-virt.include b/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/vmware/run-virt.include deleted file mode 100644 index 603c8e9b..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/vmware/run-virt.include +++ /dev/null @@ -1,532 +0,0 @@ -# run-virt.include -# ----------------------------------------------------------------------------- -# Copyright (c) 2009..2012 - RZ Uni Freiburg -# Copyright (c) 2009..2013 - OpenSLX GmbH -# -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org/ -# ----------------------------------------------------------------------------- -# run-virt.include -# - component for vmware/player of the vmchooser plugin run-virt.sh -################################################################################ - -# configuration writer functions -################################################################################ - -runvmwareconfheader () -{ -echo "# This configuration file was generated by $0" >${conffile} - -# check for the ostype -case "${vmostype}" in - win31*) - mem="32" - cpu_cores="1" - sound="sb16" - shfolders="FALSE" - ;; - win95*) - mem="92" - cpu_cores="1" - shfolders="FALSE" - ;; - win98*|winme*) - mem="256" - cpu_cores="1" - shfolders="FALSE" - ;; - winxp*|windowsxp*) - shfolders="TRUE" - ;; - winvista*|windowsvista*) - shfolders="TRUE" - ;; - windows7*) - shfolders="TRUE" - ;; - windows8*) - shfolders="TRUE" - ;; - linux*|*ubuntu*|*suse*|debian*|*sci*) - vmostype="linux" - shfolders="TRUE" - ;; - macos*) - cpu_cores="1" - vmostype="other" - shfolders="FALSE" - ;; - beos*) - cpu_cores="1" - vmostype="other" - shfolders="FALSE" - ;; - *) - vmostype="other" - shfolders="FALSE" - ;; -esac -case "$vmversion" in - *) - svga_autodetect="TRUE" - numvcpus="1" - echo ".encoding = \"UTF-8\" -# version specific stuff - all versions -config.version = \"8\"" >>${conffile} - ;; -esac -case "$vmversion" in - 2.*|3.*|4.*|5.*|6.*|7.*|8.*|9.*) - [ ${shfolders} == FALSE ] || echo " -# version specific stuff - ver. 2.*|3.*|6.*|7.*|8.*|9.* -sharedFolder.option = \"alwaysEnabled\"" >>${conffile} - ;; -esac -case "$vmversion" in - 2.5|3.*|4.*|5.*|6.5|7.*|8.*|9.*) - if [ "${cpu_cores}" -ge "2" 2>/dev/null ]; then - numvcpus="2" - fi - if [ "${mem}" -ge "8000" 2>/dev/null ]; then - mem=8000 - fi - cap3d="TRUE" # helper var for loging output - echo " -# version specific stuff - ver. 2.5|3.*|6.5|7.* -ehci.present = \"TRUE\" -mks.enable3d = \"${enable3d}\"" >>${conffile} - ;; -esac -case "$vmversion" in - 3.*|4.*|7.*|8.*|9.*) - numvcpus="${cpu_cores}" - if [ "${cpu_cores}" -ge "4" 2>/dev/null ]; then - numvcpus="4" - fi - # svga_autodetect="FALSE" # if defined manual, see below - echo " -# version specific stuff - ver. 3.*|7.* -cpuid.coresPerSocket = \"${cpu_cores}\" -maxvcpus = \"4\" -monitor.virtual_mmu = \"automatic\" -monitor.virtual_exec = \"automatic\" -floppy1.clientDevice = \"FALSE\" -floppy1.readonly = \"TRUE\"" >>${conffile} - ;; -esac - -echo " -# id -virtualHW.version = \"${hwver}\" -displayName = \"${displayname}\" -guestOS = \"${vmostype}\" - -# CPU/MEM -numvcpus = \"${numvcpus}\" -memsize = \"${mem}\" -MemAllowAutoScaleDown = \"FALSE\" -MemTrimRate = \"-1\" - -# ide-disks -ide0:0.present = \"${ide}\" -ide0:0.fileName = \"${diskfile}\" -ide0:0.mode = \"independent-nonpersistent\" -ide1:0.present = \"${cdrom0}\" -ide1:0.autodetect = \"TRUE\" -ide1:0.fileName = \"auto detect\" -ide1:0.deviceType = \"cdrom-raw\" -ide1:1.present = \"${cdrom1}\" -ide1:1.autodetect = \"TRUE\" -ide1:1.fileName = \"auto detect\" -ide1:1.deviceType = \"cdrom-raw\" - -# scsi-disks -scsi0.present = \"${scsi}\" -scsi0:0.present = \"${scsi}\" -scsi0:0.fileName = \"${diskfile}\" -scsi0.virtualDev = \"${hddrv}\" -scsi0:0.mode = \"independent-nonpersistent\" - -# floppies -floppy0.present = \"${floppy0}\" -floppy0.startConnected = \"FALSE\" -floppy0.autodetect = \"TRUE\" -floppy0.fileName = \"auto detect\" -# we need floppy b: for our windows client configuration -floppy1.present = \"${floppy1}\" -floppy1.startConnected = \"TRUE\" -floppy1.fileType = \"file\" -floppy1.fileName = \"${floppy1name}\" - -# nics -ethernet0.present = \"TRUE\" -ethernet0.addressType = \"static\" -${network_virtualDev} -ethernet0.connectionType = \"${network_kind}\" -#ethernet1.connectionType = \"custom\" -#ethernet1.vnet = \"/dev/vmnet2\" -ethernet0.address = \"00:50:56:${VM_ID}:${machostpart}\" -ethernet0.wakeOnPcktRcv = \"FALSE\" - -# sound -sound.present = \"TRUE\" -sound.fileName = \"-1\" -sound.autodetect = \"TRUE\" -sound.virtualdev = \"${sound}\" - -# svga -svga.autodetect = \"${svga_autodetect}\" - -# usb -usb.present = \"TRUE\" -usb.generic.autoconnect = \"TRUE\" - -# pci configuration -usb.pciSlotNumber = "16" -ethernet0.pciSlotNumber = "17" -sound.pciSlotNumber = "18" -ehci.pciSlotNumber = "19" -scsi0.pciSlotNumber = "20" - -# shared folders -sharedFolder0.present = \"${shfolders}\" -sharedFolder0.enabled = \"${shfolders}\" -sharedFolder0.expiration = \"never\" -sharedFolder0.guestName = \"${sharename}\" -sharedFolder0.hostPath = \"${sharepath}\" -sharedFolder0.readAccess = \"TRUE\" -sharedFolder0.writeAccess = \"TRUE\" -sharedFolder.maxNum = \"1\" - -# dirs/configs -tmpDirectory = \"${redodir}\" -redoLogDir = \"${redodir}\" -mainMem.useNamedFile = \"TRUE\" -snapshot.disabled = \"TRUE\" -tools.syncTime = \"TRUE\" -isolation.tools.hgfs.disable = \"FALSE\" -hgfs.mapRootShare = \"TRUE\" -isolation.tools.dnd.disable = \"FALSE\" -isolation.tools.copy.enable = \"TRUE\" -isolation.tools.paste.enabled = \"TRUE\" - -# serial port -serial0.present = \"${serial}\" -${serialdev} - -# parallel port -parallel0.present = \"${parallel}\" -parallel0.bidirectional = \"${paralbidi}\" -${paraldev}" >>${conffile} - -# set the appropriate permissions for the vmware config file -chmod u+rwx ${conffile} >/dev/null 2>&1 -} - -preferencesheader () -{ -echo ".encoding = \"UTF-8\" -# This configuration file was generated by $0 - -# updates/tips -webUpdate.enabled = \"FALSE\" -pref.downloadPermission = \"deny\" -pref.vmplayer.downloadPermission = \"deny\" -pref.vmplayer.webUpdateOnStartup = \"FALSE\" -pref.tip.startup = \"FALSE\" -hints.hideAll = \"TRUE\" -hint.vmui.showAllUSBDevs = \"FALSE\" - -# configs -prefvmx.defaultVMPath = \"${vmhome}\" -prefvmx.mru.config = \"${conffile}:\" - -# hot keys -pref.hotkey.control = \"true\" -pref.hotkey.alt = \"true\" -pref.hotkey.shift = \"true\" -pref.hotkey.gui = \"true\" -gui.restricted = \"true\" - -# fullscreen/mouse/keyboard -pref.fullscreen.toolbarPixels = \"0\" -pref.vmplayer.fullscreen.autohide = \"TRUE\" -pref.grabOnMouseClick = \"TRUE\" -pref.grabOnKeyPress = \"FALSE\" -pref.motionGrab = \"TRUE\" -pref.motionUngrab = \"TRUE\" -pref.hideCursorOnUngrab = \"TRUE\" -pref.autoFit = \"TRUE\" -pref.autoFitFullScreen = \"fitGuestToHost\" -pref.vmplayer.exit.vmAction = \"poweroff\" -pref.vmplayer.confirmOnExit = \"TRUE\" - -# shared folders -pref.enableAllSharedFolders = \"TRUE\" - -# eula" >${vmhome}/preferences - -# different eula parameters from Workstation 9+/ Player 5+ -case "$vmversion" in - 3.*|4.*|7.*|8.*) - echo " -pref.eula.size = \"2\" -pref.eula.0.appName = \"VMware Player\" -pref.eula.0.buildNumber = \"${vmbuild}\" -pref.eula.1.appName = \"VMware Workstation\" -pref.eula.1.buildNumber = \"${vmbuild}\"" >>${vmhome}/preferences - ;; - 5.*|9.*) - # code - echo " -pref.eula.count = \"2\" -pref.eula0.product = \"VMware Player\" -pref.eula0.build = \"${vmbuild}\" -pref.eula1.product = \"VMware Workstation\" -pref.eula1.build = \"${vmbuild}\"" >>${vmhome}/preferences - ;; -esac - -} - - -# declaration of default variables -################################################################################ - -# VM-ID static (0D), remove if changed to 00 -VM_ID="0D" -# should be dynamic -if [ "x$(which bc)" != "x" ]; then - VM_ID=$(echo "obase=16; $$" | bc) - VM_ID=$(expr substr $VM_ID $(expr ${#VM_ID} - 1) 2) -fi -# temporary disk space for logs, etc... -redodir=/tmp/vmware/${USER}.$$ -# dir for configs and vmem file -confdir=/tmp/vmware/${USER}.$$ -# configfile -conffile="${confdir}/run-vmware.conf" -# diskfile -diskfile=${vmpath} -# users vmware config folder -vmhome="${HOME}/.vmware" - -# get several version infos for vmware/player -. ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf -vmbuild=$buildversion -vmversion=$version - -# VMware start options -# "-X": start in fullscreen -vmopt="-X" - - -# hardware checks -################################################################################ - -# use different network card (default e1000, vlance, vmxnet) -if [ -n "${network_card}" ]; then - network_virtualDev="ethernet0.virtualDev = \"${network_card}\"" -else - network_virtualDev='# using default virtualDev for ethernet0' -fi - -# set standard sound card, overwrite depending on OS (options sb16, es1371, hdaudio) -sound="es1371" - -# check for 3D configuration setting -case "${enable3d}" in - *true*|*yes*) - enable3d="TRUE" - ;; - *) - enable3d="FALSE" - ;; -esac - -# serial/parallel port defined (e.g. "ttyS0, lp0" or "autodetect") -case "$serial" in - tty*) - serialdev="serial0.filename = \"/dev/${serial}\"" - serial="TRUE" - ;; - auto*) - serialdev="serial0.autodetect = \"TRUE\"" - serial="TRUE" - ;; - *) - serialdev="# no serial port configured" - serial="FALSE" - ;; -esac -case "$parallel" in - lp*|parport*) - paraldev="parallel0.filename = \"/dev/${parallel}\"" - paralbidi="TRUE" - parallel="TRUE" - ;; - auto*) - paraldev="parallel0.autodetect = \"TRUE\"" - paralbidi="TRUE" - parallel="TRUE" - ;; - *) - paraldev="# no parallel port configured" - paralbidi="FALSE" - parallel="FALSE" - ;; -esac - -# adjust memory available for vmware guests -#if [ -n "${forcemem}" ]; then -# mem="${forcemem}" -#else -# case "$vmversion" in -# 2.*|6.*) -# permem=30 -# ;; -# 3.*|7.*) -# permem=25 -# ;; -# esac -# if [ "${totalmem}" -ge "2500" ]; then -# permem=40 -# fi -# # check if /tmp is on harddisk -# if grep -qe "/dev/.* /tmp " /proc/mounts ; then -# permem=60 -# id44="1" -# # Hack, if more than 2,5G RAM use 40% of Ram and write vmem into Ram as well -# # (40% vmware | 40% confdir(vmem...) | 20% host -# # VMplayer 2+ issue -# if [ "${totalmem}" -ge "2500" ]; then -# permem=40 -# confdir=/dev/shm/vmware/$USER -# conffile=${confdir}/run-vmware.conf -# mkdir -p /dev/shm/vmware/$USER -# fi -# fi -# mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4) -# if [ "${id44}" = "1" ]; then -# hostmem=$(expr ${totalmem} - ${mem}) -# else -# hostmem=$(expr ${totalmem} - ${mem} - ${mem}) -# fi -#fi - -# check if ide/scsi and hwver of image -# read only the first 30 lines to be shure -imghead=$(head -30 ${diskfile}) -hddrv=$(echo "${imghead}" | grep -m1 -ia "ddb.adapterType" |\ - awk -F '"' '{print $2}') -hwver=$(echo "${imghead}" | grep -m1 -ia "ddb.virtualHWVersion" |\ - awk -F '"' '{print $2}') -case "${hddrv}" in - ide) - ide="TRUE" - scsi="FALSE" - ;; - lsilogic|buslogic) - ide="FALSE" - scsi="TRUE" - ;; -esac - -# write configuration files -################################################################################ - -# create vmware directories -mkdir -p ${redodir} >/dev/null 2>&1 -mkdir -p ${confdir} >/dev/null 2>&1 -mkdir -p ${vmhome}/dndlogs >/dev/null 2>&1 -touch ${vmhome}/dndlogs/dndlog.conf >/dev/null 2>&1 - -# create preferences -preferencesheader - -# create VMware startup file -runvmwareconfheader -# link to conffile if confdir != redodir -ln -s ${conffile} ${redodir}/run-vmware.conf >/dev/null 2>&1 - -# sync is needed to ensure that data is really written to virtual disk -sync - -# own nvram. We need it for floppy drive b, default nvram has just drive a -# TODO: optimize, currently kinda inefficient, too much copys, but we -# don't know which one is installed... -for i in /opt/openslx/plugin-repo/vmware/*; do - cp ${i}/nvram ${confdir}/nvram 2>/dev/null -done - - -# logging and stdout -################################################################################ - -# log script information -writelog "# File created by $0 (VMversion ${vmversion})\n# on $(date)\n" -writelog "Starting with non-persistent mode ...\n" - -# write all results to logfile -# log disksetup -writelog "Directories:" -writelog "\tConfdir:\t${confdir}" -writelog "\tConffile:\t${conffile}" -writelog "\tRedodir:\t${redodir}" -writelog "\tVMhome:\t\t${vmhome}" -writelog "\t/tmp info: \ - $(grep "/tmp " /proc/mounts) $(df -h | grep " /tmp$" | awk '{print $2}')" -# hw setup -writelog "Hardware:" -writelog "\tMAC:\t\t00:50:56:${VM_ID}:${machostpart}" -if [ -n "${network_card}" ]; then - writelog "\tNet Adaptor:\t${network_card}" -fi -writelog "\tMem:\t\t${mem} MB" -# echo nur wenn hostmem gesetzt -[ -n "${hostmem}" ] && writelog "\tHostmem:\t${hostmem} MB" -writelog "\tMax. res.:\t${xres}x${yres}" -writelog "\tCD-ROM1:\t${cdrom0}" -writelog "\tCD-ROM2:\t${cdrom1}" -writelog "\tFloppy_A:\t${floppy0}" -if [ "${serial}" = "TRUE" ]; then - writelog "\tSerial Port:\t${serialdev}" -fi -if [ "${parallel}" = "TRUE" ]; then - writelog "\tParallel Port:\t${paraldev}" -fi -# image -writelog "Diskimage:" -writelog "\tDiskfile:\t${diskfile}" -writelog "\tDisktype:\t${hddrv}" -writelog "\tHWVersion:\t${hwver}" -writelog "\tVMostype:\t${vmostype}" -# misc -writelog "Misc:" -writelog "\tDisplayname:\t${displayname}" -if [ "${cap3d}" = "TRUE" -a "${enable3d}" = "TRUE" ]; then - writelog "\t3D Graphics:\tenabled" -fi -# empty line at end -writelog "" - - -# finally set env for run-virt.sh -################################################################################ - -# 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 -s /etc/vmware/smb.conf - sudo /usr/sbin/smbd -s /etc/vmware/smb.conf -fi - -# using the modified version of the wrapper script -VIRTCMD="${OPENSLX_DEFAULT_BINDIR}/vmplayer" -VIRTCMDOPTS="${vmopt} ${conffile}" -RMDIRS="${redodir} ${conffile}" diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/vmware/vmware.conf b/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/vmware/vmware.conf deleted file mode 100644 index a67adc18..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/plugins/vmware/vmware.conf +++ /dev/null @@ -1,8 +0,0 @@ -# configuration file for vmware background services written in stage3 setup -vmnet0=true -vmnet1=192.168.101.1/24 -vmnet1nat=true -vmnet8=192.168.102.1/24 -# stage1 variables produced during plugin install -version="5.0" -buildversion="1031769" diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/udhcpd.conf b/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/udhcpd.conf deleted file mode 100644 index b1e02ba2..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/opt/openslx/udhcpd.conf +++ /dev/null @@ -1,37 +0,0 @@ -# general udhcpd configuration file for virtual machines written by -# /bin/init-wrapper during OpenSLX stage3 configuration - -# start and end of the IP lease block -start CNETWORK.20 -end CNETWORK.100 - -# interface that udhcpd will use -interface NWIF - -# how long an offered address is reserved (leased) in seconds -offer_time 6000 - -# location of the leases file -lease_file LEASEFILE - -# location of the pid file -pidfile PIDFILE - -option dns 132.230.200.200 -option subnet 255.255.255.0 -option router CNETWORK.1 -option wins CNETWORK.10 -option domain virtual.site - -# additional options known to udhcpd -#subnet #timezone -#router #timesvr -#namesvr #dns -#logsvr #cookiesvr -#lprsvr #bootsize -#domain #swapsvr -#rootpath #ipttl -#mtu #broadcast -#wins #lease -#ntpsrv #tftp -#bootfile diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/config b/remote/modules/vmchooser/vmchooser-temp/etc/vmware/config deleted file mode 100644 index eb5d01c0..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/config +++ /dev/null @@ -1,4 +0,0 @@ -.encoding = "UTF-8" -prefvmx.minVmMemPct = "100" -prefvmx.useRecommendedLockedMemSize = "TRUE" -libdir = "/usr/lib/vmware" diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/nat.conf b/remote/modules/vmchooser/vmchooser-temp/etc/vmware/nat.conf deleted file mode 100644 index 18dfcc24..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/nat.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Linux NAT configuration file -[host] -ip = 192.168.102.2/24 -device = /dev/vmnet8 -activeFTP = 1 -[udp] -timeout = 60 -[incomingtcp] -[incomingudp] diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/smb.conf b/remote/modules/vmchooser/vmchooser-temp/etc/vmware/smb.conf deleted file mode 100644 index e7a1d2c1..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/smb.conf +++ /dev/null @@ -1,25 +0,0 @@ -# basic samba configuration file for OpenSLX host-internal networking -[global] - workgroup = OPENSLX - netbios name = HOMESERVER - security = SHARE - server string = Home and Print Provider - bind interfaces only = Yes - interfaces = vmnet1,vmnet8 - pid directory = /var/run/vmware - -[userhome] - comment = Home Directory of USER - path = /home/USER - create mask = 0700 - guest ok = No - read only = No - -[scratch] - comment = Host System Temp Folder - path = /tmp - create mask = 0700 - guest ok = Yes - read only = No - browseable = Yes - diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/udhcpd/udhcpd-vmnet1.conf b/remote/modules/vmchooser/vmchooser-temp/etc/vmware/udhcpd/udhcpd-vmnet1.conf deleted file mode 100644 index 62045d21..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/udhcpd/udhcpd-vmnet1.conf +++ /dev/null @@ -1,37 +0,0 @@ -# general udhcpd configuration file for virtual machines written by -# /bin/init-wrapper during OpenSLX stage3 configuration - -# start and end of the IP lease block -start 192.168.101.20 -end 192.168.101.100 - -# interface that udhcpd will use -interface vmnet1 - -# how long an offered address is reserved (leased) in seconds -offer_time 6000 - -# location of the leases file -lease_file /var/run/vmware/udhcpd-vmnet1.leases - -# location of the pid file -pidfile /var/run/vmware/udhcpd-vmnet1.pid - -option dns 132.230.200.200 -option subnet 255.255.255.0 -option router 192.168.101.1 -option wins 192.168.101.10 -option domain virtual.site - -# additional options known to udhcpd -#subnet #timezone -#router #timesvr -#namesvr #dns -#logsvr #cookiesvr -#lprsvr #bootsize -#domain #swapsvr -#rootpath #ipttl -#mtu #broadcast -#wins #lease -#ntpsrv #tftp -#bootfile diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/udhcpd/udhcpd-vmnet8.conf b/remote/modules/vmchooser/vmchooser-temp/etc/vmware/udhcpd/udhcpd-vmnet8.conf deleted file mode 100644 index d89a8bee..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/udhcpd/udhcpd-vmnet8.conf +++ /dev/null @@ -1,37 +0,0 @@ -# general udhcpd configuration file for virtual machines written by -# /bin/init-wrapper during OpenSLX stage3 configuration - -# start and end of the IP lease block -start 192.168.102.20 -end 192.168.102.100 - -# interface that udhcpd will use -interface vmnet8 - -# how long an offered address is reserved (leased) in seconds -offer_time 6000 - -# location of the leases file -lease_file /var/run/vmware/udhcpd-vmnet8.leases - -# location of the pid file -pidfile /var/run/vmware/udhcpd-vmnet8.pid - -option dns 132.230.200.200 -option subnet 255.255.255.0 -option router 192.168.102.1 -option wins 192.168.102.10 -option domain virtual.site - -# additional options known to udhcpd -#subnet #timezone -#router #timesvr -#namesvr #dns -#logsvr #cookiesvr -#lprsvr #bootsize -#domain #swapsvr -#rootpath #ipttl -#mtu #broadcast -#wins #lease -#ntpsrv #tftp -#bootfile diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/usbarb.rules b/remote/modules/vmchooser/vmchooser-temp/etc/vmware/usbarb.rules deleted file mode 100644 index e69de29b..00000000 diff --git a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/vmnet-natd-8.mac b/remote/modules/vmchooser/vmchooser-temp/etc/vmware/vmnet-natd-8.mac deleted file mode 100644 index ef6cc5ce..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/etc/vmware/vmnet-natd-8.mac +++ /dev/null @@ -1 +0,0 @@ -00:50:56:F1:30:50 diff --git a/remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/run-virt.sh b/remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/run-virt.sh deleted file mode 100755 index 070581d2..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/run-virt.sh +++ /dev/null @@ -1,440 +0,0 @@ -#!/bin/bash -# ----------------------------------------------------------------------------- -# Copyright (c) 2007..2010 - RZ Uni FR -# Copyright (c) 2007..2011 - OpenSLX GmbH -# -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org/ -# ----------------------------------------------------------------------------- -# run-virt.sh -# - This is the generic wrapper for the several virtualization solutions. -# The idea is to setup a set of variables used by at least two different -# tools and then include the specific plugin which configures the speci- -# fied virtualization tool. -################################################################################ - -. /etc/opt/openslx/openslx.conf - -################################################################################ -### Define default dirs / get configs -################################################################################ - -PLUGINCONFROOT=${OPENSLX_DEFAULT_CONFDIR}/plugins -PLUGINCONFDIR=${PLUGINCONFROOT}/vmchooser -# include general configuration from vmchooser -[ -f ${PLUGINCONFROOT}/vmchooser/vmchooser.conf ] && \ - . ${PLUGINCONFROOT}/vmchooser/vmchooser.conf -# load general virtualization information -[ -f ${PLUGINCONFROOT}/virtualization/virtualization.conf ] && \ - . ${PLUGINCONFROOT}/virtualization/virtualization.conf - -################################################################################ -### Functions used throughout the script -################################################################################ - -# function to write to stdout and logfile -LOGFILE=${OPENSLX_DEFAULT_LOGDIR}/run-virt.${USER}.$$.log -writelog () { - # write to stdout - echo -e "$1" - # log into file - echo -e "$1" >> ${LOGFILE} -} - -# remove config dirs when exit -cleanexit () { - if echo "${RMDIRS}" 2>/dev/null | grep -q ${xmlvirt}; then - writelog "${xmlvirt} exited. Cleanning up... \c" - rm -rf ${RMDIRS} >/dev/null 2>&1 - writelog "done" - fi - - exit "$1" -} - -# check for important files used -filecheck () -{ - filecheck=$(LANG=us ls -lh ${diskfile} 2>&1) - writelog "Filecheck:\n${filecheck}\n" - noimage=$(echo ${filecheck} | grep -i "no such file or directory" | wc -l) - rightsfile=${diskfile} - - # check if link - if [ -L "${diskfile}" ]; then - # take link target - rightsfile=$(ls -lh ${diskfile} 2>&1 | awk -F '-> *' '{print $2}') - rightsfile=${vmdir}/${rightsfile} - filecheck=$(LANG=us ls -lh ${rightsfile} 2>&1) - fi - - # does file exist - if [ "${noimage}" -ge "1" ]; then - writelog "Virtual Machine Image Problem:\c " - writelog "\tThe image you've specified doesn't exist." - writelog "Filecheck says:\c " - writelog "\t\t${diskfile}:\n\t\t\tNo such file or directory" - writelog "Hint:\c " - writelog "\t\t\tCompare spelling of the image with your options.\n" - exit 1 - fi - - # readable by calling user - if ! [ -r "${diskfile}" >/dev/null 2>&1 \ - -o -r "${diskfile}" >/dev/null 2>&1 ]; then - writelog "Vmware Image Problem:\c " - writelog "\tThe image you've specified has wrong rights." - writelog "Filecheck says:\t\t$(echo ${filecheck} \ - | awk '{print $1" "$3" "$4}') ${rightsfile}" - writelog "Hint:\t\t\tChange rights with: chmod a+r ${rightsfile}\n" - exit 1 - fi - - # writable (for persistent-mode)? - if ! [ -w "${diskfile}" >/dev/null 2>&1 \ - -o -w "${diskfile}" >/dev/null 2>&1 ] \ - && [ "${np}" = "independent-persistent" ]; then - writelog "Vmware Image Problem:\c " - writelog "\tThe image you have specified has wrong rights." - writelog "Filecheck says:\t\t$(echo ${filecheck} \ - | awk '{print $1" "$3" "$4}') ${rightsfile}" - writelog "Hint:\t\t\tUse nonpersistent-mode or change rights to rw\n" - exit 1 - fi -} - -################################################################################ -### Get XML file and dir -################################################################################ - -# absolute or relative path? -xmlfile=$1 -if ls ${xmlfile} 2>/dev/null | grep '/' >/dev/null 2>&1; then - xmlpath=$(dirname ${xmlfile}) - xmlfile=$(basename ${xmlfile}) -else - xmlpath=${vmchooser_xmlpath} -fi -# full path -xmlfile="${xmlpath}/${xmlfile%.xml}.xml" - -################################################################################ -### Sanity checks -################################################################################ - -# test if the xml file is valid -if ! [ -r "${xmlfile}" ]; then - writelog "${xmlfile} not a readable XML file!" - exit 1 -fi - -# test if XML file -if ! grep '/dev/null 2>&1; then - writelog \ - "Submitted configuration file ${xmlfile} seems to have wrong XML format" - exit 1 -fi - -# check for running in graphical environment otherwise no much use here -[ -z "$DISPLAY" ] && echo -e "\n\tStart only within a graphical desktop!\n" \ - && exit 1 - -################################################################################ -### Logo for console -################################################################################ - -cat </dev/null | grep -q '^/' >/dev/null 2>&1; then - imgpath=$(dirname ${imgname}) - imgname=$(basename ${imgname}) - vmpath=${imgpath}/${imgname} -# If old vmchooser binary stuff -# We do not need folder name as it is already included by vmchooser -elif echo ${xmlfile} 2>/dev/null | grep -q '^/tmp/' >/dev/null 2>&1; then - vmpath=$imgname - imgname=$(basename ${imgname}) -# Else use same path as xml -else - imgpath=${xmlpath} - vmpath=${imgpath}/${imgname} -fi - -# Check if virtual machine container file exists -if ! [ -e "${vmpath}" ]; then - writelog "Virtual machine image ${vmpath} not found!" - exit 1 -fi - -# Name of the virt machine, sed because of Windows formatting -vm_name=$(grep -o 'short_description param=.*"' ${xmlfile} \ - | sed -e "s/&.*;/; /g" | awk -F '"' '{print $2}') -# If ${vm_name} not defined use ${xmlfile} -vm_name=${vm_name:-${xmlfile%.xml}} - -# Define vm_shortname since vm_name can be very long -vm_shortname=$(basename ${xmlfile%.xml} | sed -e "s, ,-,g") - -# vm_name = displayname, define for old scripts -displayname=${vm_name} - -# image is for the following virtual machine -xmlvirt=$(grep -o 'virtualmachine param=.*"' ${xmlfile} \ - | sed -e "s/&.*;/; /g" | awk -F '"' '{print $2}') - -# choose the proper virtualization/emulator plugin -[ "x${xmlvirt}" != "x" -a "x${xmlvirt}" != "xqemukvm" -a \ - "x${xmlvirt}" != "xvirtualbox" -a "x${xmlvirt}" != "xvmware" ] && \ - xmlvirt="emufe" - -# make a guess from the filename extension if ${xmlvirt} is empty -# (not set within the XML file) -# TODO: implement possibility to submit own configuration files -if [ -z "${xmlvirt}" ] && [ -n "${additional_config}" ]; then - writelog "No virtual machine parameter defined in ${xmlfile}" - writelog "Trying to guess VM...\c" - case "$(cat ${additional_config} | tr \"[A-Z]\" \"[a-z]\")" in - *config.version*|*virtualhw.version*|*independent-nonpersistent*|*vmdk*) - xmlvirt="vmware" - ;; - *innotek*|*virtualbox*) - xmlvirt="virtualbox" - ;; - *qemu*|*kvm*) - xmlvirt="qemukvm" - ;; - *) - xmlvirt="none" - ;; - esac -elif [ -z "${xmlvirt}" ]; then - case "$(echo ${imgname##*.} | tr \"[A-Z]\" \"[a-z]\")" in - vmdk) - xmlvirt="vmware" - ;; - vbox|vdi) - xmlvirt="virtualbox" - ;; - qcow*) - xmlvirt="qemukvm" - ;; - *) - xmlvirt="emufe" - ;; - esac - writelog "result:\t${xmlvirt}" -fi - -# Definition of the client system -vmostype=$(grep -io '/dev/null| grep -ve "^$") -xres=$(echo "${hostres}" | awk '{print $3}') -yres=$(echo "${hostres}" | awk '{print $7}') - -# Resolution defined via xml parameter: fullscreen, full/X*Y/depth; windowed, -# win/X*Y/depth -userres=$(grep -io '/dev/null | \ - awk -F '=' {'print $2'} | tr "[A-Z]" "[a-z]") - -# Add rw share -sharepath="${HOME}" -sharename="home" - -# Set hostname: using original hostname and adding string -hostname="virt-$(hostname)" - -writelog "\tVM Hostname:\t\t$hostname" - -################################################################################ -### Setup the rest of the environment and run the configured vm -################################################################################ - -# Adjust sound volume -writelog "Unmuting sound...\c " -amixer -q sset Master 100% unmute 2>/dev/null -amixer -q sset PCM 100% unmute 2>/dev/null -amixer -q sset CD 100% unmute 2>/dev/null -amixer -q sset Headphone 100% unmute 2>/dev/null -amixer -q sset Front 100% unmute 2>/dev/null # in SUSE 11.0 it's headphone -amixer -q sset Speaker 100% unmute 2>/dev/null # annoying built-in speaker -writelog "finished\n" - -# Copy guest configuration (with added information) config.xml to be accessed -# via virtual floppy -# fixme -> to be changed (vmchooser adapts the file content!?) -#TODO: wozu echo? -#echo "Please fix the config.xml generation" -cp ${xmlfile} ${PLUGINCONFDIR}/fd-loop/config.xml - -# Get all virtual machine specific stuff from the respective include file -if [ -e ${PLUGINCONFROOT}/${xmlvirt}/run-virt.include ] ; then - self=${xmlvirt} - . ${PLUGINCONFROOT}/${xmlvirt}/run-virt.include - # start a windowmanager for easier handling - # (expect problems /w windows opening in background /w vmware without wm) - for dm in xfwm4 metacity openbox blackbox kwin fvwm2 ; do - if which $dm >/dev/null 2>&1 ; then - if [ "$dm" = "fvwm2" ] ; then - echo "EdgeScroll 0 0" > ${redodir}/fvwm - fvwm2 -f ${redodir}/fvwm >/dev/null 2>&1 & - else - $dm >/dev/null 2>&1 & - fi - break - fi - done - # Start poolvideoswitch if we find the autostarter file - if [ -e /etc/xdg/autostart/pvsgui.desktop ]; then - /usr/local/bin/pvsgui -p 2 -b >/dev/null 2>&1 & - fi - eval ${VIRTCMD} ${VIRTCMDOPTS} - writelog "Bye." - - # Postrun for commands after virtualization finishes - if [ -n "${POSTRUN}" ]; then - eval ${POSTRUN} >/dev/null 2>&1 - fi - - cleanexit 0 -else - writelog "Failed because of missing ${xmlvirt} plugin." - cleanexit 1 -fi - -# Postrun for commands after virtualization finishes -if [ -n "${POSTRUN}" ]; then - eval ${POSTRUN} >/dev/null 2>&1 -fi - -cleanexit 0 -exit 0 diff --git a/remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/vmchooser b/remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/vmchooser deleted file mode 100755 index c4ec59e2..00000000 Binary files a/remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/vmchooser and /dev/null differ diff --git a/remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/xmlfilter.sh b/remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/xmlfilter.sh deleted file mode 100755 index ded5d114..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/opt/openslx/plugin-repo/vmchooser/xmlfilter.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# ----------------------------------------------------------------------------- -# Copyright (c) 2007..2009 - RZ Uni FR -# Copyright (c) 2007..2011 - OpenSLX GmbH -# -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org/ -# ----------------------------------------------------------------------------- -# xmlfilter.sh -# - This script is invoked by the vmchooser tool. It simply filters xml- -# files (taking the path to these files in $1). You might modify it in any -# way to match your needs, e.g. ask some database instead. You can re- -# implement it in any other programming language too. You simply have to -# return a list of proper xml files to be interpreted by the vmchooser -# binary). Please check for vmchooser.sh too ... -# ----------------------------------------------------------------------------- - -# This script . -# -# currently: -# - filter for slxgrp (which comes from /etc/machine-setup) -# - -# include default directories -. /etc/opt/openslx/openslx.conf - -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 - # filter all xmls which aren't set active - if [ $(grep "${conffile} - -# check for the ostype -case "${vmostype}" in - win31*) - mem="32" - cpu_cores="1" - sound="sb16" - shfolders="FALSE" - ;; - win95*) - mem="92" - cpu_cores="1" - shfolders="FALSE" - ;; - win98*|winme*) - mem="256" - cpu_cores="1" - shfolders="FALSE" - ;; - winxp*|windowsxp*) - shfolders="TRUE" - ;; - winvista*|windowsvista*) - shfolders="TRUE" - ;; - windows7*) - shfolders="TRUE" - ;; - windows8*) - shfolders="TRUE" - ;; - linux*|*ubuntu*|*suse*|debian*|*sci*) - vmostype="linux" - shfolders="TRUE" - ;; - macos*) - cpu_cores="1" - vmostype="other" - shfolders="FALSE" - ;; - beos*) - cpu_cores="1" - vmostype="other" - shfolders="FALSE" - ;; - *) - vmostype="other" - shfolders="FALSE" - ;; -esac -case "$vmversion" in - *) - svga_autodetect="TRUE" - numvcpus="1" - echo ".encoding = \"UTF-8\" -# version specific stuff - all versions -config.version = \"8\"" >>${conffile} - ;; -esac -case "$vmversion" in - 2.*|3.*|4.*|5.*|6.*|7.*|8.*|9.*) - [ ${shfolders} == FALSE ] || echo " -# version specific stuff - ver. 2.*|3.*|6.*|7.*|8.*|9.* -sharedFolder.option = \"alwaysEnabled\"" >>${conffile} - ;; -esac -case "$vmversion" in - 2.5|3.*|4.*|5.*|6.5|7.*|8.*|9.*) - if [ "${cpu_cores}" -ge "2" 2>/dev/null ]; then - numvcpus="2" - fi - if [ "${mem}" -ge "8000" 2>/dev/null ]; then - mem=8000 - fi - cap3d="TRUE" # helper var for loging output - echo " -# version specific stuff - ver. 2.5|3.*|6.5|7.* -ehci.present = \"TRUE\" -mks.enable3d = \"${enable3d}\"" >>${conffile} - ;; -esac -case "$vmversion" in - 3.*|4.*|7.*|8.*|9.*) - numvcpus="${cpu_cores}" - if [ "${cpu_cores}" -ge "4" 2>/dev/null ]; then - numvcpus="4" - fi - # svga_autodetect="FALSE" # if defined manual, see below - echo " -# version specific stuff - ver. 3.*|7.* -cpuid.coresPerSocket = \"${cpu_cores}\" -maxvcpus = \"4\" -monitor.virtual_mmu = \"automatic\" -monitor.virtual_exec = \"automatic\" -floppy1.clientDevice = \"FALSE\" -floppy1.readonly = \"TRUE\"" >>${conffile} - ;; -esac - -echo " -# id -virtualHW.version = \"${hwver}\" -displayName = \"${displayname}\" -guestOS = \"${vmostype}\" - -# CPU/MEM -numvcpus = \"${numvcpus}\" -memsize = \"${mem}\" -MemAllowAutoScaleDown = \"FALSE\" -MemTrimRate = \"-1\" - -# ide-disks -ide0:0.present = \"${ide}\" -ide0:0.fileName = \"${diskfile}\" -ide0:0.mode = \"independent-nonpersistent\" -ide1:0.present = \"${cdrom0}\" -ide1:0.autodetect = \"TRUE\" -ide1:0.fileName = \"auto detect\" -ide1:0.deviceType = \"cdrom-raw\" -ide1:1.present = \"${cdrom1}\" -ide1:1.autodetect = \"TRUE\" -ide1:1.fileName = \"auto detect\" -ide1:1.deviceType = \"cdrom-raw\" - -# scsi-disks -scsi0.present = \"${scsi}\" -scsi0:0.present = \"${scsi}\" -scsi0:0.fileName = \"${diskfile}\" -scsi0.virtualDev = \"${hddrv}\" -scsi0:0.mode = \"independent-nonpersistent\" - -# floppies -floppy0.present = \"${floppy0}\" -floppy0.startConnected = \"FALSE\" -floppy0.autodetect = \"TRUE\" -floppy0.fileName = \"auto detect\" -# we need floppy b: for our windows client configuration -floppy1.present = \"${floppy1}\" -floppy1.startConnected = \"TRUE\" -floppy1.fileType = \"file\" -floppy1.fileName = \"${floppy1name}\" - -# nics -ethernet0.present = \"TRUE\" -ethernet0.addressType = \"static\" -${network_virtualDev} -ethernet0.connectionType = \"${network_kind}\" -#ethernet1.connectionType = \"custom\" -#ethernet1.vnet = \"/dev/vmnet2\" -ethernet0.address = \"00:50:56:${VM_ID}:${machostpart}\" -ethernet0.wakeOnPcktRcv = \"FALSE\" - -# sound -sound.present = \"TRUE\" -sound.fileName = \"-1\" -sound.autodetect = \"TRUE\" -sound.virtualdev = \"${sound}\" - -# svga -svga.autodetect = \"${svga_autodetect}\" - -# usb -usb.present = \"TRUE\" -usb.generic.autoconnect = \"TRUE\" - -# pci configuration -usb.pciSlotNumber = "16" -ethernet0.pciSlotNumber = "17" -sound.pciSlotNumber = "18" -ehci.pciSlotNumber = "19" -scsi0.pciSlotNumber = "20" - -# shared folders -sharedFolder0.present = \"${shfolders}\" -sharedFolder0.enabled = \"${shfolders}\" -sharedFolder0.expiration = \"never\" -sharedFolder0.guestName = \"${sharename}\" -sharedFolder0.hostPath = \"${sharepath}\" -sharedFolder0.readAccess = \"TRUE\" -sharedFolder0.writeAccess = \"TRUE\" -sharedFolder.maxNum = \"1\" - -# dirs/configs -tmpDirectory = \"${redodir}\" -redoLogDir = \"${redodir}\" -mainMem.useNamedFile = \"TRUE\" -snapshot.disabled = \"TRUE\" -tools.syncTime = \"TRUE\" -isolation.tools.hgfs.disable = \"FALSE\" -hgfs.mapRootShare = \"TRUE\" -isolation.tools.dnd.disable = \"FALSE\" -isolation.tools.copy.enable = \"TRUE\" -isolation.tools.paste.enabled = \"TRUE\" - -# serial port -serial0.present = \"${serial}\" -${serialdev} - -# parallel port -parallel0.present = \"${parallel}\" -parallel0.bidirectional = \"${paralbidi}\" -${paraldev}" >>${conffile} - -# set the appropriate permissions for the vmware config file -chmod u+rwx ${conffile} >/dev/null 2>&1 -} - -preferencesheader () -{ -echo ".encoding = \"UTF-8\" -# This configuration file was generated by $0 - -# updates/tips -webUpdate.enabled = \"FALSE\" -pref.downloadPermission = \"deny\" -pref.vmplayer.downloadPermission = \"deny\" -pref.vmplayer.webUpdateOnStartup = \"FALSE\" -pref.tip.startup = \"FALSE\" -hints.hideAll = \"TRUE\" -hint.vmui.showAllUSBDevs = \"FALSE\" - -# configs -prefvmx.defaultVMPath = \"${vmhome}\" -prefvmx.mru.config = \"${conffile}:\" - -# hot keys -pref.hotkey.control = \"true\" -pref.hotkey.alt = \"true\" -pref.hotkey.shift = \"true\" -pref.hotkey.gui = \"true\" -gui.restricted = \"true\" - -# fullscreen/mouse/keyboard -pref.fullscreen.toolbarPixels = \"0\" -pref.vmplayer.fullscreen.autohide = \"TRUE\" -pref.grabOnMouseClick = \"TRUE\" -pref.grabOnKeyPress = \"FALSE\" -pref.motionGrab = \"TRUE\" -pref.motionUngrab = \"TRUE\" -pref.hideCursorOnUngrab = \"TRUE\" -pref.autoFit = \"TRUE\" -pref.autoFitFullScreen = \"fitGuestToHost\" -pref.vmplayer.exit.vmAction = \"poweroff\" -pref.vmplayer.confirmOnExit = \"TRUE\" - -# shared folders -pref.enableAllSharedFolders = \"TRUE\" - -# eula" >${vmhome}/preferences - -# different eula parameters from Workstation 9+/ Player 5+ -case "$vmversion" in - 3.*|4.*|7.*|8.*) - echo " -pref.eula.size = \"2\" -pref.eula.0.appName = \"VMware Player\" -pref.eula.0.buildNumber = \"${vmbuild}\" -pref.eula.1.appName = \"VMware Workstation\" -pref.eula.1.buildNumber = \"${vmbuild}\"" >>${vmhome}/preferences - ;; - 5.*|9.*) - # code - echo " -pref.eula.count = \"2\" -pref.eula0.product = \"VMware Player\" -pref.eula0.build = \"${vmbuild}\" -pref.eula1.product = \"VMware Workstation\" -pref.eula1.build = \"${vmbuild}\"" >>${vmhome}/preferences - ;; -esac - -} - - -# declaration of default variables -################################################################################ - -# VM-ID static (0D), remove if changed to 00 -VM_ID="0D" -# should be dynamic -if [ "x$(which bc)" != "x" ]; then - VM_ID=$(echo "obase=16; $$" | bc) - VM_ID=$(expr substr $VM_ID $(expr ${#VM_ID} - 1) 2) -fi -# temporary disk space for logs, etc... -redodir=/tmp/vmware/${USER}.$$ -# dir for configs and vmem file -confdir=/tmp/vmware/${USER}.$$ -# configfile -conffile="${confdir}/run-vmware.conf" -# diskfile -diskfile=${vmpath} -# users vmware config folder -vmhome="${HOME}/.vmware" - -# get several version infos for vmware/player -. ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf -vmbuild=$buildversion -vmversion=$version - -# VMware start options -# "-X": start in fullscreen -vmopt="-X" - - -# hardware checks -################################################################################ - -# use different network card (default e1000, vlance, vmxnet) -if [ -n "${network_card}" ]; then - network_virtualDev="ethernet0.virtualDev = \"${network_card}\"" -else - network_virtualDev='# using default virtualDev for ethernet0' -fi - -# set standard sound card, overwrite depending on OS (options sb16, es1371, hdaudio) -sound="es1371" - -# check for 3D configuration setting -case "${enable3d}" in - *true*|*yes*) - enable3d="TRUE" - ;; - *) - enable3d="FALSE" - ;; -esac - -# serial/parallel port defined (e.g. "ttyS0, lp0" or "autodetect") -case "$serial" in - tty*) - serialdev="serial0.filename = \"/dev/${serial}\"" - serial="TRUE" - ;; - auto*) - serialdev="serial0.autodetect = \"TRUE\"" - serial="TRUE" - ;; - *) - serialdev="# no serial port configured" - serial="FALSE" - ;; -esac -case "$parallel" in - lp*|parport*) - paraldev="parallel0.filename = \"/dev/${parallel}\"" - paralbidi="TRUE" - parallel="TRUE" - ;; - auto*) - paraldev="parallel0.autodetect = \"TRUE\"" - paralbidi="TRUE" - parallel="TRUE" - ;; - *) - paraldev="# no parallel port configured" - paralbidi="FALSE" - parallel="FALSE" - ;; -esac - -# adjust memory available for vmware guests -#if [ -n "${forcemem}" ]; then -# mem="${forcemem}" -#else -# case "$vmversion" in -# 2.*|6.*) -# permem=30 -# ;; -# 3.*|7.*) -# permem=25 -# ;; -# esac -# if [ "${totalmem}" -ge "2500" ]; then -# permem=40 -# fi -# # check if /tmp is on harddisk -# if grep -qe "/dev/.* /tmp " /proc/mounts ; then -# permem=60 -# id44="1" -# # Hack, if more than 2,5G RAM use 40% of Ram and write vmem into Ram as well -# # (40% vmware | 40% confdir(vmem...) | 20% host -# # VMplayer 2+ issue -# if [ "${totalmem}" -ge "2500" ]; then -# permem=40 -# confdir=/dev/shm/vmware/$USER -# conffile=${confdir}/run-vmware.conf -# mkdir -p /dev/shm/vmware/$USER -# fi -# fi -# mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4) -# if [ "${id44}" = "1" ]; then -# hostmem=$(expr ${totalmem} - ${mem}) -# else -# hostmem=$(expr ${totalmem} - ${mem} - ${mem}) -# fi -#fi - -# check if ide/scsi and hwver of image -# read only the first 30 lines to be shure -imghead=$(head -30 ${diskfile}) -hddrv=$(echo "${imghead}" | grep -m1 -ia "ddb.adapterType" |\ - awk -F '"' '{print $2}') -hwver=$(echo "${imghead}" | grep -m1 -ia "ddb.virtualHWVersion" |\ - awk -F '"' '{print $2}') -case "${hddrv}" in - ide) - ide="TRUE" - scsi="FALSE" - ;; - lsilogic|buslogic) - ide="FALSE" - scsi="TRUE" - ;; -esac - -# write configuration files -################################################################################ - -# create vmware directories -mkdir -p ${redodir} >/dev/null 2>&1 -mkdir -p ${confdir} >/dev/null 2>&1 -mkdir -p ${vmhome}/dndlogs >/dev/null 2>&1 -touch ${vmhome}/dndlogs/dndlog.conf >/dev/null 2>&1 - -# create preferences -preferencesheader - -# create VMware startup file -runvmwareconfheader -# link to conffile if confdir != redodir -ln -s ${conffile} ${redodir}/run-vmware.conf >/dev/null 2>&1 - -# sync is needed to ensure that data is really written to virtual disk -sync - -# own nvram. We need it for floppy drive b, default nvram has just drive a -# TODO: optimize, currently kinda inefficient, too much copys, but we -# don't know which one is installed... -for i in /opt/openslx/plugin-repo/vmware/*; do - cp ${i}/nvram ${confdir}/nvram 2>/dev/null -done - - -# logging and stdout -################################################################################ - -# log script information -writelog "# File created by $0 (VMversion ${vmversion})\n# on $(date)\n" -writelog "Starting with non-persistent mode ...\n" - -# write all results to logfile -# log disksetup -writelog "Directories:" -writelog "\tConfdir:\t${confdir}" -writelog "\tConffile:\t${conffile}" -writelog "\tRedodir:\t${redodir}" -writelog "\tVMhome:\t\t${vmhome}" -writelog "\t/tmp info: \ - $(grep "/tmp " /proc/mounts) $(df -h | grep " /tmp$" | awk '{print $2}')" -# hw setup -writelog "Hardware:" -writelog "\tMAC:\t\t00:50:56:${VM_ID}:${machostpart}" -if [ -n "${network_card}" ]; then - writelog "\tNet Adaptor:\t${network_card}" -fi -writelog "\tMem:\t\t${mem} MB" -# echo nur wenn hostmem gesetzt -[ -n "${hostmem}" ] && writelog "\tHostmem:\t${hostmem} MB" -writelog "\tMax. res.:\t${xres}x${yres}" -writelog "\tCD-ROM1:\t${cdrom0}" -writelog "\tCD-ROM2:\t${cdrom1}" -writelog "\tFloppy_A:\t${floppy0}" -if [ "${serial}" = "TRUE" ]; then - writelog "\tSerial Port:\t${serialdev}" -fi -if [ "${parallel}" = "TRUE" ]; then - writelog "\tParallel Port:\t${paraldev}" -fi -# image -writelog "Diskimage:" -writelog "\tDiskfile:\t${diskfile}" -writelog "\tDisktype:\t${hddrv}" -writelog "\tHWVersion:\t${hwver}" -writelog "\tVMostype:\t${vmostype}" -# misc -writelog "Misc:" -writelog "\tDisplayname:\t${displayname}" -if [ "${cap3d}" = "TRUE" -a "${enable3d}" = "TRUE" ]; then - writelog "\t3D Graphics:\tenabled" -fi -# empty line at end -writelog "" - - -# finally set env for run-virt.sh -################################################################################ - -# 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 -s /etc/vmware/smb.conf - sudo /usr/sbin/smbd -s /etc/vmware/smb.conf -fi - -# using the modified version of the wrapper script -VIRTCMD="${OPENSLX_DEFAULT_BINDIR}/vmplayer" -VIRTCMDOPTS="${vmopt} ${conffile}" -RMDIRS="${redodir} ${conffile}" diff --git a/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/run-virt.sh b/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/run-virt.sh deleted file mode 120000 index 39d83f46..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/run-virt.sh +++ /dev/null @@ -1 +0,0 @@ -/opt/openslx/plugin-repo/vmchooser/run-virt.sh \ No newline at end of file diff --git a/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmchooser b/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmchooser deleted file mode 120000 index b247c383..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmchooser +++ /dev/null @@ -1 +0,0 @@ -/opt/openslx/plugin-repo/vmchooser/vmchooser \ No newline at end of file diff --git a/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmplayer b/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmplayer deleted file mode 100755 index c9b57a65..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmplayer +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# written by OpenSLX-plugin 'vmware' in Stage1 -# radically simplified version of the original script vmplayer by VMware Inc. -PREFIX=/usr/lib/vmware # depends on the vmware location -exec "$PREFIX"'/lib/wrapper-gtk24.sh' \ - "$PREFIX"'/lib' \ - "$PREFIX"'/bin/vmplayer' \ - "$PREFIX"'/libconf' "$@" diff --git a/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmware b/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmware deleted file mode 100755 index 8b568f53..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/vmware +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# written by OpenSLX-plugin 'vmware' in Stage1 -# radically simplified version of the original script vmware by VMware Inc. -PREFIX=/usr/lib/vmware # depends on the vmware location -exec "$PREFIX"'/lib/wrapper-gtk24.sh' \ - "$PREFIX"'/lib' \ - "$PREFIX"'/bin/vmware' \ - "$PREFIX"'/libconf' "$@" diff --git a/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/xmlfilter.sh b/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/xmlfilter.sh deleted file mode 120000 index 809dc7b7..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/var/opt/openslx/bin/xmlfilter.sh +++ /dev/null @@ -1 +0,0 @@ -/opt/openslx/plugin-repo/vmchooser/xmlfilter.sh \ No newline at end of file diff --git a/remote/modules/vmchooser/vmchooser-temp/vmchooser/default.desktop b/remote/modules/vmchooser/vmchooser-temp/vmchooser/default.desktop deleted file mode 100755 index 91540228..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/vmchooser/default.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=virtual machine chooser (default) -Name[de]=Virtuelle Maschine auswählen -Comment=This session starts the vm session chooser -Comment[de]=Diese Sitzung startet das Auswahlmenü für die vorhandenen Sitzungen -Exec=/opt/openslx/plugin-repo/vmchooser/vmchooser -TryExec=/opt/openslx/plugin-repo/vmchooser/vmchooser -Icon= -Type=Application diff --git a/remote/modules/vmchooser/vmchooser-temp/vmchooser/mesgdisp b/remote/modules/vmchooser/vmchooser-temp/vmchooser/mesgdisp deleted file mode 100755 index 41e3721c..00000000 Binary files a/remote/modules/vmchooser/vmchooser-temp/vmchooser/mesgdisp and /dev/null differ diff --git a/remote/modules/vmchooser/vmchooser-temp/vmchooser/printer.sh b/remote/modules/vmchooser/vmchooser-temp/vmchooser/printer.sh deleted file mode 100755 index 8f1d5ffa..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/vmchooser/printer.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -#echo " some pseudo printer " - -for(( i=0; $i<10; i=$i+1)); do - echo -e "printserver$i\tprinter$i\tPrinter Description $i" -done - -echo -e "printserver.ruf.uni-freiburg.de\treal-printer-name\tSome really long printer Description" - diff --git a/remote/modules/vmchooser/vmchooser-temp/vmchooser/scanner.sh b/remote/modules/vmchooser/vmchooser-temp/vmchooser/scanner.sh deleted file mode 100755 index dcb94c68..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/vmchooser/scanner.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - - -echo -e "scanserver\tscanner1hp\tThis is a test Scanner" diff --git a/remote/modules/vmchooser/vmchooser-temp/vmchooser/smb.conf b/remote/modules/vmchooser/vmchooser-temp/vmchooser/smb.conf deleted file mode 100755 index ec757ce4..00000000 --- a/remote/modules/vmchooser/vmchooser-temp/vmchooser/smb.conf +++ /dev/null @@ -1,25 +0,0 @@ -# basic samba configuration file for OpenSLX host-internal networking -[global] - workgroup = OPENSLX - netbios name = HOMESERVER - security = SHARE - server string = Home and Print Provider - bind interfaces only = Yes - interfaces = NWIF - pid directory = PIDDIR - -[userhome] - comment = Home Directory of USER - path = /home/USER - create mask = 0700 - guest ok = No - read only = No - -[scratch] - comment = Host System Temp Folder - path = /tmp - create mask = 0700 - guest ok = Yes - read only = No - browseable = Yes - diff --git a/remote/targets/stage32/consolekit b/remote/targets/stage32/consolekit deleted file mode 120000 index 261968c7..00000000 --- a/remote/targets/stage32/consolekit +++ /dev/null @@ -1 +0,0 @@ -../../modules/consolekit \ No newline at end of file -- cgit v1.2.3-55-g7522