From 57cfc117f0cd7d1162a23788d2d3d7746ec91c1d Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Thu, 24 Mar 2016 15:24:49 +0100
Subject: [setup_virtual_floppy] geraffel.ini -> openslx.ini, hostres.txt ->
 HOSTRES.TXT

---
 .../data/opt/openslx/scripts/includes/setup_virtual_floppy.inc      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'remote/modules/run-virt/data')

diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
index 09430718..d36d0d6d 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
@@ -26,7 +26,7 @@ fi
 RESOLUTION=$(xrandr | grep -o -E 'connected\s*(primary)?\s*[0-9]+x[0-9]+\+0\+0' \
 	| grep -o -E -m1 '[0-9]+x[0-9]+')
 
-cat > "${TMPDIR}/geraffel.ini" <<-HIER
+cat > "${TMPDIR}/openslx.ini" <<-HIER
 [openslx]
 resolution=${RESOLUTION}
 createMissingRemap=${SHARE_CREATE_MISSING_REMAP}
@@ -41,8 +41,8 @@ media=${SHARE_MEDIA}
 other=${SHARE_OTHER}
 HIER
 
-# Legacy: hostres.txt
-cat > "${TMPDIR}/hostres.txt" <<-HIER
+# Legacy: HOSTRES.TXT
+cat > "${TMPDIR}/HOSTRES.TXT" <<-HIER
 ${RESOLUTION}
 This file is deprecated! Use geraffel.ini
 HIER
-- 
cgit v1.2.3-55-g7522


From 733f5da244ceb4dd43c7351c262f11decf7e31f4 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Thu, 24 Mar 2016 15:28:26 +0100
Subject: [run-virt] (setup_virt_floppy)Ahem, check-in too soon, corr.

---
 .../data/opt/openslx/scripts/includes/setup_virtual_floppy.inc      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'remote/modules/run-virt/data')

diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
index d36d0d6d..f6bcb4da 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
@@ -44,7 +44,7 @@ HIER
 # Legacy: HOSTRES.TXT
 cat > "${TMPDIR}/HOSTRES.TXT" <<-HIER
 ${RESOLUTION}
-This file is deprecated! Use geraffel.ini
+This file is deprecated! Use openslx.ini
 HIER
 
 # Create file for network shares to mount
@@ -65,8 +65,8 @@ if pwdaemon --query "${TMPHOME}/.pwsocket" > "${SHARES}"; then
 fi
 
 # Copy all them files into floppy image
-mcopy -i "${FLOPPYIMG}" "${TMPDIR}/geraffel.ini" "${TMPDIR}/hostres.txt" "${SHARES}" "::/"
+mcopy -i "${FLOPPYIMG}" "${TMPDIR}/openslx.ini" "${TMPDIR}/HOSTRES.TXT" "${SHARES}" "::/"
 mcopy -i "${FLOPPYIMG}" "$VMCHOOSER_DIR/data/openslx.exe" "::/"
-rm -f -- "${SHARES}" "${TMPDIR}/geraffel.ini" "${TMPDIR}/hostres.txt"
+rm -f -- "${SHARES}" "${TMPDIR}/openslx.ini" "${TMPDIR}/HOSTRES.TXT"
 unset SHARES VAR NETHOME
 
-- 
cgit v1.2.3-55-g7522


From e902ef9dd878f0ba2ce720c719263cff2bb7ee2d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 24 Mar 2016 17:29:02 +0100
Subject: [run-virt] geraffel.ini -> openslx.ini

---
 .../data/opt/openslx/vmchooser/data/openslx.exe     | Bin 58368 -> 58368 bytes
 remote/modules/run-virt/winres.c                    |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'remote/modules/run-virt/data')

diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
index 4a2c62af..f8349ae9 100755
Binary files a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe and b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe differ
diff --git a/remote/modules/run-virt/winres.c b/remote/modules/run-virt/winres.c
index bc4f427d..626a1048 100644
--- a/remote/modules/run-virt/winres.c
+++ b/remote/modules/run-virt/winres.c
@@ -40,8 +40,8 @@ typedef struct {
 static const ssize_t KEYLEN = 16;
 #define DRIVEMAX (100)
 #define LOGFILELEN (300)
-#define SETTINGS_FILE "B:\\GERAFFEL.INI"
-#define SETTINGS_FILE_W L"B:\\GERAFFEL.INI"
+#define SETTINGS_FILE "B:\\OPENSLX.INI"
+#define SETTINGS_FILE_W L"B:\\OPENSLX.INI"
 
 static BOOL bGetShares = FALSE;
 static netdrive_t drives[DRIVEMAX];
-- 
cgit v1.2.3-55-g7522