summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-02-23 14:23:03 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-02-23 14:23:03 +0000
commit70de7cb7b3bab191223ba4807de294c2bdb792ae (patch)
tree05a4a82d4045f981d99bd0718abc9ec03623e955 /sys-libs
parentVersion bump, closes bug 51887 - thanks to Castelão <castelao@oceanologia.net>. (diff)
downloadgentoo-2-70de7cb7b3bab191223ba4807de294c2bdb792ae.tar.gz
gentoo-2-70de7cb7b3bab191223ba4807de294c2bdb792ae.tar.bz2
gentoo-2-70de7cb7b3bab191223ba4807de294c2bdb792ae.zip
Fix error printing. Remove sourcing of functions.sh.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/device-mapper/ChangeLog5
-rw-r--r--sys-libs/device-mapper/files/dm-start.sh6
2 files changed, 6 insertions, 5 deletions
diff --git a/sys-libs/device-mapper/ChangeLog b/sys-libs/device-mapper/ChangeLog
index a4dd73d99bf3..8964f78529cb 100644
--- a/sys-libs/device-mapper/ChangeLog
+++ b/sys-libs/device-mapper/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/device-mapper
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/ChangeLog,v 1.26 2005/02/23 04:06:58 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/ChangeLog,v 1.27 2005/02/23 14:23:03 azarah Exp $
+
+ 23 Feb 2005; Martin Schlemmer <azarah@gentoo.org> files/dm-start.sh:
+ Fix error printing. Remove sourcing of functions.sh.
*device-mapper-1.00.19-r2 (23 Feb 2005)
diff --git a/sys-libs/device-mapper/files/dm-start.sh b/sys-libs/device-mapper/files/dm-start.sh
index 8aab03c36358..77408813fd38 100644
--- a/sys-libs/device-mapper/files/dm-start.sh
+++ b/sys-libs/device-mapper/files/dm-start.sh
@@ -1,5 +1,5 @@
# /lib/rcscripts/addons/dm-start.sh: Setup DM volumes at boot
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/files/dm-start.sh,v 1.1 2005/02/23 04:06:58 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/files/dm-start.sh,v 1.2 2005/02/23 14:23:03 azarah Exp $
# char **get_new_dm_volumes(void)
#
@@ -52,8 +52,6 @@ is_empty_dm_volume() {
return 1
}
-source /sbin/functions.sh
-
if [[ -x /sbin/dmsetup && -c /dev/mapper/control && -f /etc/dmtab ]]; then
[[ -n $(get_new_dm_volumes) ]] && \
einfo " Setting up device-mapper volumes:"
@@ -65,7 +63,7 @@ if [[ -x /sbin/dmsetup && -c /dev/mapper/control && -f /etc/dmtab ]]; then
ebegin " Creating volume: ${volume}"
if ! eval ${x} &>/dev/null; then
- eerror " Error creating volume: ${volume}"
+ eend 1 " Error creating volume: ${volume}"
# dmsetup still adds an empty volume in some cases,
# so lets remove it
is_empty_dm_volume "${volume}" && \