From e9da0bc5afae832010e174688df20defc314d852 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 26 Nov 2013 14:10:10 +0100 Subject: [vmchooser] Change path specs --- .../data/opt/openslx/etc/vmchooser/openslx.exe | Bin 12800 -> 0 bytes .../data/opt/openslx/etc/vmchooser/smb.conf | 25 --------------------- .../data/opt/openslx/etc/vmchooser/vmchooser.conf | 4 ---- .../themes/bwlehrpool/bwlehrpool-left.png | Bin 5361 -> 0 bytes .../themes/bwlehrpool/bwlehrpool-right.png | Bin 3390 -> 0 bytes .../vmchooser/themes/bwlehrpool/bwlehrpool.ini | 4 ---- .../vmchooser/themes/openslx/openslx-left.png | Bin 9187 -> 0 bytes .../vmchooser/themes/openslx/openslx-right.png | Bin 3390 -> 0 bytes .../usr/share/vmchooser/themes/openslx/openslx.ini | 4 ---- .../vmchooser/themes/planets/planets-left.png | Bin 11337 -> 0 bytes .../vmchooser/themes/planets/planets-right.png | Bin 3082 -> 0 bytes .../usr/share/vmchooser/themes/planets/planets.ini | 4 ---- .../data/opt/openslx/vmchooser/config/smb.conf | 25 +++++++++++++++++++++ .../opt/openslx/vmchooser/config/vmchooser.conf | 4 ++++ .../data/opt/openslx/vmchooser/data/openslx.exe | Bin 0 -> 12800 bytes .../themes/bwlehrpool/bwlehrpool-left.png | Bin 0 -> 5361 bytes .../themes/bwlehrpool/bwlehrpool-right.png | Bin 0 -> 3390 bytes .../vmchooser/themes/bwlehrpool/bwlehrpool.ini | 4 ++++ .../vmchooser/themes/openslx/openslx-left.png | Bin 0 -> 9187 bytes .../vmchooser/themes/openslx/openslx-right.png | Bin 0 -> 3390 bytes .../openslx/vmchooser/themes/openslx/openslx.ini | 4 ++++ .../vmchooser/themes/planets/planets-left.png | Bin 0 -> 11337 bytes .../vmchooser/themes/planets/planets-right.png | Bin 0 -> 3082 bytes .../openslx/vmchooser/themes/planets/planets.ini | 4 ++++ remote/modules/vmchooser/vmchooser.build | 4 ++-- 25 files changed, 43 insertions(+), 43 deletions(-) delete mode 100755 remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe delete mode 100644 remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/smb.conf delete mode 100644 remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/vmchooser.conf delete mode 100644 remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-left.png delete mode 100644 remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-right.png delete mode 100644 remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool.ini delete mode 100644 remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-left.png delete mode 100644 remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-right.png delete mode 100644 remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx.ini delete mode 100644 remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-left.png delete mode 100644 remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-right.png delete mode 100644 remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets.ini create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/config/smb.conf create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/config/vmchooser.conf create mode 100755 remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-left.png create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-right.png create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool.ini create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-left.png create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-right.png create mode 100644 remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets.ini (limited to 'remote/modules') diff --git a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe b/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe deleted file mode 100755 index e016f407..00000000 Binary files a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe and /dev/null differ diff --git a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/smb.conf b/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/smb.conf deleted file mode 100644 index ec757ce4..00000000 --- a/remote/modules/vmchooser/data/opt/openslx/etc/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/modules/vmchooser/data/opt/openslx/etc/vmchooser/vmchooser.conf b/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/vmchooser.conf deleted file mode 100644 index 203f125b..00000000 --- a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/vmchooser.conf +++ /dev/null @@ -1,4 +0,0 @@ -pool=default -theme=bwlehrpool -pvs=0 -path=/mnt/vmstore diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-left.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-left.png deleted file mode 100644 index c9d8ab0d..00000000 Binary files a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-left.png and /dev/null differ diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-right.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-right.png deleted file mode 100644 index 8ca9347b..00000000 Binary files a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-right.png and /dev/null differ diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool.ini b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool.ini deleted file mode 100644 index 90d00617..00000000 --- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool.ini +++ /dev/null @@ -1,4 +0,0 @@ -background-color=#ffffff -image-right=bwlehrpool-right.png -image-left=bwlehrpool-left.png - diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-left.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-left.png deleted file mode 100644 index 900dd867..00000000 Binary files a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-left.png and /dev/null differ diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-right.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-right.png deleted file mode 100644 index 8ca9347b..00000000 Binary files a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-right.png and /dev/null differ diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx.ini b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx.ini deleted file mode 100644 index 57a22821..00000000 --- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx.ini +++ /dev/null @@ -1,4 +0,0 @@ -background-color=#ffffff -image-right=openslx-right.png -image-left=openslx-left.png - diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-left.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-left.png deleted file mode 100644 index c8736b72..00000000 Binary files a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-left.png and /dev/null differ diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-right.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-right.png deleted file mode 100644 index e21f0d8b..00000000 Binary files a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-right.png and /dev/null differ diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets.ini b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets.ini deleted file mode 100644 index d9aa17f6..00000000 --- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets.ini +++ /dev/null @@ -1,4 +0,0 @@ -background-color=#ffffff -image-right=planets-right.png -image-left=planets-left.png - diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/config/smb.conf b/remote/modules/vmchooser/data/opt/openslx/vmchooser/config/smb.conf new file mode 100644 index 00000000..ec757ce4 --- /dev/null +++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/config/smb.conf @@ -0,0 +1,25 @@ +# 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/modules/vmchooser/data/opt/openslx/vmchooser/config/vmchooser.conf b/remote/modules/vmchooser/data/opt/openslx/vmchooser/config/vmchooser.conf new file mode 100644 index 00000000..203f125b --- /dev/null +++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/config/vmchooser.conf @@ -0,0 +1,4 @@ +pool=default +theme=bwlehrpool +pvs=0 +path=/mnt/vmstore diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe new file mode 100755 index 00000000..e016f407 Binary files /dev/null and b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe differ diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-left.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-left.png new file mode 100644 index 00000000..c9d8ab0d Binary files /dev/null and b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-left.png differ diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-right.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-right.png new file mode 100644 index 00000000..8ca9347b Binary files /dev/null and b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-right.png differ diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool.ini b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool.ini new file mode 100644 index 00000000..90d00617 --- /dev/null +++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool.ini @@ -0,0 +1,4 @@ +background-color=#ffffff +image-right=bwlehrpool-right.png +image-left=bwlehrpool-left.png + diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png new file mode 100644 index 00000000..900dd867 Binary files /dev/null and b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png differ diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png new file mode 100644 index 00000000..8ca9347b Binary files /dev/null and b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png differ diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini new file mode 100644 index 00000000..57a22821 --- /dev/null +++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini @@ -0,0 +1,4 @@ +background-color=#ffffff +image-right=openslx-right.png +image-left=openslx-left.png + diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-left.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-left.png new file mode 100644 index 00000000..c8736b72 Binary files /dev/null and b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-left.png differ diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-right.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-right.png new file mode 100644 index 00000000..e21f0d8b Binary files /dev/null and b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-right.png differ diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets.ini b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets.ini new file mode 100644 index 00000000..d9aa17f6 --- /dev/null +++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets.ini @@ -0,0 +1,4 @@ +background-color=#ffffff +image-right=planets-right.png +image-left=planets-left.png + diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/vmchooser.build index 0e68eea1..58f5986e 100644 --- a/remote/modules/vmchooser/vmchooser.build +++ b/remote/modules/vmchooser/vmchooser.build @@ -13,9 +13,9 @@ build() { # patch globals.cpp and globals.h to use standardised paths /opt/openslx/... if ! grep -q VMCHOOSER_SCRIPTS_PATH "$SRCDIR/src/globals.h"; then sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"/g' "${SRCDIR}"/src/globals.h - sed -i 's/^#define VMCHOOSER_ETC_BASE_PATH.*/#define VMCHOOSER_ETC_BASE_PATH "\/opt\/openslx\/etc\/vmchooser"/g' "${SRCDIR}"/src/globals.h + sed -i 's/^#define VMCHOOSER_ETC_BASE_PATH.*/#define VMCHOOSER_ETC_BASE_PATH "\/opt\/openslx\/vmchooser\/config"/g' "${SRCDIR}"/src/globals.h sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"\n#define VMCHOOSER_SCRIPTS_PATH "\/opt\/openslx\/scripts"/g' "${SRCDIR}"/src/globals.h - sed -i 's/^#define VMCHOOSER_THEME_BASE.*/#define VMCHOOSER_THEME_BASE "\/opt\/openslx\/usr\/share\/vmchooser\/themes"/g' "${SRCDIR}"/src/globals.h + sed -i 's/^#define VMCHOOSER_THEME_BASE.*/#define VMCHOOSER_THEME_BASE "\/opt\/openslx\/vmchooser\/themes"/g' "${SRCDIR}"/src/globals.h sed -i 's/^QString binPath(VMCHOOSER_BIN_PATH);/QString binPath(VMCHOOSER_BIN_PATH);\nQString scriptsPath(VMCHOOSER_SCRIPTS_PATH);/g' "${SRCDIR}"/src/globals.cpp sed -i 's/^QString runVmScript(binPath + "\/run-virt.sh");/QString runVmScript(scriptsPath + "\/vmchooser-run_virt");/g' "${SRCDIR}"/src/globals.cpp -- cgit v1.2.3-55-g7522