[LON-CAPA-cvs] cvs: doc /install/linux install.pl

raeburn raeburn@source.lon-capa.org
Tue, 31 May 2011 13:29:46 -0000


raeburn		Tue May 31 13:29:46 2011 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - systemd replacing sysvinit in Fedora 15. 
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.18 doc/install/linux/install.pl:1.19
--- doc/install/linux/install.pl:1.18	Tue May 31 03:06:20 2011
+++ doc/install/linux/install.pl	Tue May 31 13:29:46 2011
@@ -72,7 +72,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.18 2011/05/31 03:06:20 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.19 2011/05/31 13:29:46 raeburn Exp $'."\n";
 }
 
 #
@@ -500,6 +500,17 @@
     my $nrlstr = join('',@norunlevels);
     foreach my $type ('apache','mysql','ntp','cups','memcached') {
         my $service = $daemon{$type};
+        if ($type eq 'ntp') {
+            if ($distro =~ /^(?:fedora)(\d+)/) {
+                my $version = $1;
+                if ($version >= 15) {
+                    if (!-l "/etc/systemd/system/multi-user.target.wants/ntpd.service") {
+                        $needfix{$type} = 'systemctl enable ntpd.service';
+                    }
+                    next;
+                }
+            }
+        }
         my $command = $checker_bin.' --list '.$service.' 2>/dev/null';
         if ($type eq 'cups') { 
             if ($distro =~ /^(?:debian|ubuntu)(\d+)/) {