diff options
| -rw-r--r-- | installer/OpenSLX/OSExport/BlockDevice/DNBD2.pm | 4 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 2 | ||||
| -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 |
5 files changed, 11 insertions, 7 deletions
diff --git a/installer/OpenSLX/OSExport/BlockDevice/DNBD2.pm b/installer/OpenSLX/OSExport/BlockDevice/DNBD2.pm index 1ad9471e..25e112ee 100644 --- a/installer/OpenSLX/OSExport/BlockDevice/DNBD2.pm +++ b/installer/OpenSLX/OSExport/BlockDevice/DNBD2.pm @@ -81,9 +81,9 @@ sub showExportConfigInfo "dnbd2-server /etc/dnbd2/server.conf\n" ), "Create or modify a config file like /etc/dnbd2/server.conf, looking like:", - "<server>\n", + "\n# dnbd2 server configuration\n<server>\n", "$export->{port}\n", - "$self->{fs}->{'export-path'}\n", + "$self->{fs}->{'export-path'}\n\n", '#' x 80, "\n"; return; } diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index 9eee6ce0..b5d833a9 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -63,6 +63,8 @@ use vars qw(%supportedDistros); 'ubuntu-8.10_amd64' => 'clone,update,shell', 'ubuntu-9.04' => 'clone,install,update,shell', 'ubuntu-9.04_amd64' => 'clone,update,shell', + 'ubuntu-9.10' => 'clone,update,shell', + 'ubuntu-9.10_amd64' => 'clone,update,shell', ); my %localHttpServers; 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 |