[gentoo-commits] gentoo-x86 commit in scripts: bootstrap.sh

[William Hubbs (williamh)]

williamh    14/03/13 16:11:27

  Modified:             bootstrap.sh
  Log:
  We should attempt to source /lib/gentoo/functions.sh before we attempt
  to source /etc/init.d/functions.sh.
  Also, we should unconditionally define our own esyslog function.
  This is for bug #504376.

Revision  Changes    Path
1.98                 scripts/bootstrap.sh

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/scripts/bootstrap.sh?rev=1.98&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/scripts/bootstrap.sh?rev=1.98&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/scripts/bootstrap.sh?r1=1.97&r2=1.98

Index: bootstrap.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- bootstrap.sh        27 Jun 2013 21:04:49 -0000      1.97
+++ bootstrap.sh        13 Mar 2014 16:11:27 -0000      1.98
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.97 2013/06/27 
21:04:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.98 2014/03/13 
16:11:27 williamh Exp $
 
 # people who were here:
 # (drobbins, 06 Jun 2003)
@@ -12,23 +12,26 @@
 # (azarah, Mar 2005)
 # (uberlord, May 2007)
 # (kumba, May 2007)
+# (williamh, Mar 2014)
 
 # sanity check
 [[ -e /etc/profile ]] && . /etc/profile
 
-if [[ -e /etc/init.d/functions.sh ]] ; then
+if [[ -e /lib/gentoo/functions.sh ]] ; then
+       source /lib/gentoo/functions.sh
+       elif [[ -e /etc/init.d/functions.sh ]] ; then
        source /etc/init.d/functions.sh
-
-       # Use our own custom script, else logger cause things to
-       # 'freeze' if we do not have a system logger running
-       esyslog() {
-               :
-       }
 else
        eerror() { echo "!!! $*"; }
        einfo() { echo "* $*"; }
 fi
 
+# Use our own custom script, else logger cause things to
+# 'freeze' if we do not have a system logger running
+esyslog() {
+       :
+}
+
 show_status() {
        local num=$1
        shift
@@ -52,7 +55,7 @@
        env "$@"
 }
 
-cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.97 
2013/06/27 21:04:49 zmedico Exp $"
+cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.98 
2014/03/13 16:11:27 williamh Exp $"
 cvsver=${cvsver##*,v }
 cvsver=${cvsver%%Exp*}
 cvsyear=${cvsver#* }