Upstart fixes

diff --git a/init/lang/en b/init/lang/en
index 9fe0602..26db627 100644 (file)
--- a/init/lang/en
+++ b/init/lang/en
@@ -47,7 +47,7 @@ index_uname=Service name
 index_udesc=Service description
 index_uboot=Start at boot?
 index_ustatus=Running now?
-index_uadd=Create a new service.
+index_uadd=Create a new upstart service.
 
 edit_title=Edit Action
 create_title=Create Action
@@ -206,6 +206,7 @@ upstart_eclash=A service with the same name already exists
 upstart_edesc=Missing service description
 upstart_eserver=No server command entered
 upstart_eserver2=Server command does not exist
+upstart_eserver3=Only one server command can be entered
 upstart_return=upstart service
 
 __norefs=1

diff --git a/init/save_upstart.cgi b/init/save_upstart.cgi
index a8d257e..2bb54fd 100755 (executable)
--- a/init/save_upstart.cgi
+++ b/init/save_upstart.cgi
@@ -40,6 +40,7 @@ elsif ($in{'new'}) {
        $in{'server'} =~ /\S/ || &error($text{'upstart_eserver'});
        ($bin, $args) = split(/\s+/, $in{'server'});
        &has_command($bin) || &error($text{'upstart_eserver2'});
+       $in{'server'} =~ /;|\&\&|\|\|/ && &error($text{'upstart_eserver3'});
        $in{'prestart'} =~ s/\r//g;
 
        # Create the config file