summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinitramfs/stage3-stuff/init2
-rw-r--r--os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm6
-rw-r--r--os-plugins/plugins/vmchooser/files/vmchooser.sh2
3 files changed, 7 insertions, 3 deletions
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index bd917fce..c6c7348c 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -950,7 +950,7 @@ killall klogd 2>/dev/null
/mnt/var/log/messages 2>/dev/null
# if no syslog plugin was configured, start the daemon again writing to no
# logfile directly (useless fake test as placeholder)
-#[ ! -e syslog ] && syslogd -O /mnt/var/log/testfile
+[ ! -d /mnt/opt/openslx/plugin-repo/syslog/ ] && syslogd -O /mnt/var/log/testfile
# move /dev and unmount /proc and unset all old, unneeded environment
# variables
diff --git a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm
index 74239472..6227d303 100644
--- a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm
+++ b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm
@@ -200,10 +200,14 @@ sub _setupSyslogNG
};
destination console_all {
file("/dev/tty10");
- };
+ };
+ destination default_logfile {
+ file("/var/log/messages");
+ };
log {
source(all);
destination(console_all);
+ destination(default_logfile);
};
END
diff --git a/os-plugins/plugins/vmchooser/files/vmchooser.sh b/os-plugins/plugins/vmchooser/files/vmchooser.sh
index ad4125f1..ad4f387e 100644
--- a/os-plugins/plugins/vmchooser/files/vmchooser.sh
+++ b/os-plugins/plugins/vmchooser/files/vmchooser.sh
@@ -5,5 +5,5 @@ if [ -e "/etc/opt/openslx/vmchooser-stage3.conf" ]; then
fi
-/opt/openslx/plugin-repo/vmchooser/vmchooser -p ${vmchooser_xmlpath}
+/opt/openslx/plugin-repo/vmchooser/vmchooser -p${vmchooser_xmlpath}