[arch-commits] Commit in glibc/trunk (glibc.install)

[Allan McRae]

    Date: Thursday, September 6, 2012 @ 21:16:18
  Author: allan
Revision: 166369

do not run init with systemd

Modified:
  glibc/trunk/glibc.install

---------------+
 glibc.install |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: glibc.install
===================================================================
--- glibc.install	2012-09-07 01:12:26 UTC (rev 166368)
+++ glibc.install	2012-09-07 01:16:18 UTC (rev 166369)
@@ -2,19 +2,19 @@
 filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
 
 post_upgrade() {
-  sbin/ldconfig -r .
-  [ -x sbin/init ] && sbin/init u
-  usr/sbin/locale-gen
+  ldconfig -r .
+  [[ ! -e sys/fs/cgroup/systemd && -x sbin/init ]] && init u
+  locale-gen
   
-  [ -x usr/bin/install-info ] || return 0
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
-    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
 pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
-    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }