diff options
| author | Manuel Schneider | 2013-07-02 17:05:22 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2013-07-02 17:05:22 +0200 |
| commit | 3b8a99b9222cb0326b9c9bd0c94ec5c8c11f34db (patch) | |
| tree | 97c3c8407e7770174da35e140ba908f573b187e1 /remote | |
| parent | Beamerscript prototype added. (diff) | |
| parent | Merge branch 'master' of dnbd3:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-3b8a99b9222cb0326b9c9bd0c94ec5c8c11f34db.tar.gz tm-scripts-3b8a99b9222cb0326b9c9bd0c94ec5c8c11f34db.tar.xz tm-scripts-3b8a99b9222cb0326b9c9bd0c94ec5c8c11f34db.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/debug/debug.conf | 8 | ||||
| -rw-r--r-- | remote/modules/german/german.conf | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 9 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper | 1 |
4 files changed, 21 insertions, 7 deletions
diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/debug.conf index feb09723..8728c4bf 100644 --- a/remote/modules/debug/debug.conf +++ b/remote/modules/debug/debug.conf @@ -2,6 +2,9 @@ REQUIRED_INSTALLED_PACKAGES=" curl ltrace nano + fontconfig + fonts-config + xset " REQUIRED_BINARIES=" strace @@ -10,4 +13,9 @@ REQUIRED_BINARIES=" setterm curl nano + fc-cache + fc-query + fonts-config + xset + locale " diff --git a/remote/modules/german/german.conf b/remote/modules/german/german.conf index ec22c760..5b27bed0 100644 --- a/remote/modules/german/german.conf +++ b/remote/modules/german/german.conf @@ -1,7 +1,11 @@ -REQUIRED_CONTENT_PACKAGES="" +REQUIRED_INSTALLED_PACKAGES=" + libX11-data" +REQUIRED_CONTENT_PACKAGES=" + libX11-data" +REQUIRED_LIBRARIES="libX11-data" REQUIRED_BINARIES="" REQUIRED_FILES="" REQUIRED_DIRECTORIES=" - /usr/lib/locale/de_DE.utf8 + /usr/lib/locale/de_DE.utf8 + /usr/share/X11 " - diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include index e50ed992..9b0fea91 100755..100644 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include @@ -117,8 +117,9 @@ MemAllowAutoScaleDown = "FALSE" MemTrimRate = "-1" # ide-disks - -ide0:0.mode = \"independent-${diskmode}\" +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" @@ -133,7 +134,7 @@ scsi0.present = "$scsi" scsi0:0.present = "$scsi" scsi0:0.fileName = "$diskfile" scsi0.virtualDev = "$hddrv" -scsi0:0.mode = \"independent-${diskmode}\" +scsi0:0.mode = "independent-nonpersistent" # floppies floppy0.present = "$floppy0" @@ -446,7 +447,7 @@ cp "/etc/openslx/vmware/nvram" "$confdir/nvram" 2>/dev/null # log script information writelog "# File created by $0 (VMversion ${vmversion})\n# on $(date)\n" -writelog "Starting with ${diskmode} mode ...\n" +writelog "Starting with non-persistent mode ...\n" # write all results to logfile # log disksetup diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper index f52db58f..4d51fc15 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper @@ -31,6 +31,7 @@ REQUIRED_FILES=" /etc/networks /etc/netconfig /usr/share/X11/app-defaults/Xvidtune + /etc/fonts/fonts.conf " REQUIRED_KERNEL_MODULES=" kernel/drivers/cpufreq kernel/drivers/memstick |