about summary refs log tree commit diff
path: root/fedora/glibc_post_upgrade.c
diff options
context:
space:
mode:
Diffstat (limited to 'fedora/glibc_post_upgrade.c')
-rw-r--r--fedora/glibc_post_upgrade.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fedora/glibc_post_upgrade.c b/fedora/glibc_post_upgrade.c
index d73096cdec..4358b90a76 100644
--- a/fedora/glibc_post_upgrade.c
+++ b/fedora/glibc_post_upgrade.c
@@ -167,8 +167,11 @@ main (void)
 		    "--nostdlib", iconv_dir);
     }
 
-  /* Check if telinit is available and the init fifo as well.  */
-  if (access ("/sbin/telinit", X_OK) || access ("/dev/initctl", F_OK))
+  /* Check if telinit is available and either SysVInit fifo,
+     or upstart telinit.  */
+  if (access ("/sbin/telinit", X_OK)
+      || (access ("/dev/initctl", F_OK)
+	  && access ("/sbin/initctl", X_OK)))
     _exit (0);
   /* Check if we are not inside of some chroot, because we'd just
      timeout and leave /etc/initrunlvl.  */