diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-04-10 19:21:13 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-04-10 19:21:13 +0000 |
| commit | b0c50524f1fb93adbd52e9950f92650e020b0d59 (patch) | |
| tree | fd9af5238c7ebb9bb27ffafb3e47be9ed5ca2680 /fedora/glibc_post_upgrade.c | |
| parent | 3a2e541ba348de2bbab7b65328694403e61e5dff (diff) | |
Updated to fedora-glibc-20080410T1907
Diffstat (limited to 'fedora/glibc_post_upgrade.c')
| -rw-r--r-- | fedora/glibc_post_upgrade.c | 7 |
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. */ |