diff options
author | Jakub Jelinek <jakub@redhat.com> | 2004-12-19 23:47:01 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2004-12-19 23:47:01 +0000 |
commit | 973900e75930ec6c03baa4dddc45c55d2a43ce24 (patch) | |
tree | 1f7d257e9fc824112d228c9249b224a1929f3723 /fedora/glibc_post_upgrade.c | |
parent | a7008c8e9dec89809ff552c117a008f49faf72b4 (diff) |
2.3.4-1cvs/fedora-glibc-2_3_4-1
Diffstat (limited to 'fedora/glibc_post_upgrade.c')
-rw-r--r-- | fedora/glibc_post_upgrade.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fedora/glibc_post_upgrade.c b/fedora/glibc_post_upgrade.c index e0d0d082f2..4b7b806ee7 100644 --- a/fedora/glibc_post_upgrade.c +++ b/fedora/glibc_post_upgrade.c @@ -116,6 +116,12 @@ main (void) char linkbuf[64], *linkp; int linklen; + /* If installing bi-arch glibc, rpm sometimes doesn't unpack all files + before running one of the lib's %post scriptlet. /sbin/ldconfig will + then be run by the other arch's %post. */ + if (access ("/sbin/ldconfig", X_OK)) + break; + verbose_exec (110, "/sbin/ldconfig", "/sbin/ldconfig"); rerun_ldconfig = 0; @@ -151,9 +157,11 @@ main (void) } while (rerun_ldconfig && ++rerun_cnt < 2); - if (! utimes (GCONV_MODULES_CACHE, NULL)) + if (! utimes (GCONV_MODULES_DIR "/gconv-modules.cache", NULL)) { - verbose_exec (113, "/usr/sbin/iconvconfig", "/usr/sbin/iconvconfig"); + verbose_exec (113, "/usr/sbin/iconvconfig", "/usr/sbin/iconvconfig", + "-o", GCONV_MODULES_DIR"/gconv-modules.cache", + "--nostdlib", GCONV_MODULES_DIR); } /* Check if telinit is available and the init fifo as well. */ |