diff options
| author | Dirk von Suchodoletz | 2009-08-12 19:55:22 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-08-12 19:55:22 +0200 |
| commit | d58baafa664cf2ecb4f76dfcf91e54dcc1467f9f (patch) | |
| tree | cd8e3bfd943c5398c2e11cc76dce6544b533decf /os-plugins | |
| parent | Changes to make work qemukvm initially ... (diff) | |
| download | core-d58baafa664cf2ecb4f76dfcf91e54dcc1467f9f.tar.gz core-d58baafa664cf2ecb4f76dfcf91e54dcc1467f9f.tar.xz core-d58baafa664cf2ecb4f76dfcf91e54dcc1467f9f.zip | |
Small fixes ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3085 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm | 3 | ||||
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm | 3 | ||||
| -rw-r--r-- | os-plugins/plugins/qemukvm/XX_qemukvm.sh | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm index bb08489a..3d451e9e 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm @@ -144,7 +144,8 @@ sub _setupCommonDmScript echo -e '#!/bin/sh\n#\n# modified by desktop plugin in Stage3\n#\n # remove safely any remaining files of the leaving user in /tmp ( su -c "rm -rf /tmp/*" - $USER - echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null ) & + echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null + chmod 0400 /tmp/files.removed ) & . /etc/X11/xdm/Xreset.system' >/mnt/etc/X11/xdm/Xreset chmod a+x /mnt/etc/X11/xdm/Xreset* diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm index f86d7f02..0a2b7e36 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm @@ -159,7 +159,8 @@ sub setupKDMScript echo -e '#! /bin/sh\n#\n# modified by desktop plugin in Stage3\n#\n # remove safely any remaining files of the leaving user in /tmp ( su -c "rm -rf /tmp/*" - $USER - echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null ) & + echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null + chmod 0400 /tmp/files.removed ) & . /etc/kde$kdmver/kdm/Xreset.system' >/mnt/etc/kde$kdmver/kdm/Xreset chmod a+x /mnt/etc/kde$kdmver/kdm/Xreset* diff --git a/os-plugins/plugins/qemukvm/XX_qemukvm.sh b/os-plugins/plugins/qemukvm/XX_qemukvm.sh index e9af0f10..c5efd89b 100644 --- a/os-plugins/plugins/qemukvm/XX_qemukvm.sh +++ b/os-plugins/plugins/qemukvm/XX_qemukvm.sh @@ -28,7 +28,7 @@ interface NWIF offer_time 6000 # The location of the leases file -lease_file /var/lib/misc/udhcpd.leases +lease_file /var/lib/qemu/udhcpd.leases # The location of the pid file pidfile /var/run/udhcpd.pid @@ -112,8 +112,8 @@ ${qemukvm_imagesrc}." nonfatal write_udhcpd_conf /mnt/etc/opt/openslx/udhcpd.qemukvm # for the busybox dhcp server - testmkd /mnt/var/lib/misc - touch /mnt/var/lib/misc/udhcpd.leases + testmkd /mnt/var/lib/qemu + touch /mnt/var/lib/qemu/udhcpd.leases # copy the /etc/qemu-ifup script and enable extended rights for running # the emulator via sudo |