diff options
| author | Jonathan Bauer | 2014-01-21 15:01:19 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-01-21 15:01:19 +0100 |
| commit | b17d1a8cae1e369d71bcc99ca9521387eeca662b (patch) | |
| tree | 0876f4639fb25561ed351d1d1f2b642334e5da9f /remote | |
| parent | [remote/setup_target] only export remote/builds to /export/build if it (diff) | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-b17d1a8cae1e369d71bcc99ca9521387eeca662b.tar.gz tm-scripts-b17d1a8cae1e369d71bcc99ca9521387eeca662b.tar.xz tm-scripts-b17d1a8cae1e369d71bcc99ca9521387eeca662b.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
4 files changed, 16 insertions, 2 deletions
diff --git a/remote/modules/idleaction/idleaction.conf.opensuse b/remote/modules/idleaction/idleaction.conf.opensuse index 3aff5af0..d368cbd8 100644 --- a/remote/modules/idleaction/idleaction.conf.opensuse +++ b/remote/modules/idleaction/idleaction.conf.opensuse @@ -1,6 +1,6 @@ REQUIRED_INSTALLED_PACKAGES=" libX11-devel - libXss-devel + libXScrnSaver-devel xorg-x11-proto-devel " diff --git a/remote/modules/smartctl/smartctl.conf.opensuse b/remote/modules/smartctl/smartctl.conf.opensuse new file mode 100644 index 00000000..d699f2f0 --- /dev/null +++ b/remote/modules/smartctl/smartctl.conf.opensuse @@ -0,0 +1,6 @@ +REQUIRED_CONTENT_PACKAGES=" + smartmontools +" +REQUIRED_INSTALLED_PACKAGES=" + smartmontools +" diff --git a/remote/modules/vmware/data/etc/vmware/config b/remote/modules/vmware/data/etc/vmware/config index eb5d01c0..c76cc885 100644 --- a/remote/modules/vmware/data/etc/vmware/config +++ b/remote/modules/vmware/data/etc/vmware/config @@ -2,3 +2,8 @@ prefvmx.minVmMemPct = "100" prefvmx.useRecommendedLockedMemSize = "TRUE" libdir = "/usr/lib/vmware" +mks.ctlAltDel.ignore = "TRUE" +mks.fullscreen.allowScreenSaver = "TRUE" +fullScreenSwitch.onSeparateDesktop = "TRUE" +msg.autoAnswer = "TRUE" + diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 index abc28f73..d0a3bc29 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 @@ -50,7 +50,9 @@ else fi echo "Appending $MOUNTPOINT to /" -if ! mount -o "remount,add:1:$MOUNTPOINT=ro" /; then +if mount -o "remount,append:$MOUNTPOINT=ro" /; then + cp -r "${MOUNTPOINT}/"etc/ld.* /etc/ || echo "Could not really copy full blown ldconfig from stage4 to live system" +else slxlog --echo "mount-stage4" "Could not append mounted stage4 at '$MOUNTPOINT' to aufs at /" exit 1 fi @@ -62,3 +64,4 @@ systemctl reload dbus.service systemctl start stage4.target & exit 0 + |