summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-01-21 19:44:52 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-01-21 19:44:52 +0000
commitfa28b015e5008d06278194f8dd6269e28ddb327d (patch)
treefdd3c45f264ebe31f4b8135f1f6967f3ed4e1c07 /sys-fs/udev
parentRevision bump to propagate all the filechanges and fix also bug#443546. (diff)
downloadgentoo-2-fa28b015e5008d06278194f8dd6269e28ddb327d.tar.gz
gentoo-2-fa28b015e5008d06278194f8dd6269e28ddb327d.tar.bz2
gentoo-2-fa28b015e5008d06278194f8dd6269e28ddb327d.zip
Use plain bash instead of calling external executable grep in fstab check by Arfrever
(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs/udev')
-rw-r--r--sys-fs/udev/ChangeLog7
-rw-r--r--sys-fs/udev/udev-197-r4.ebuild4
-rw-r--r--sys-fs/udev/udev-9999.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 9fd046a0c172..3c1ae30003e8 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.792 2013/01/21 18:56:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.793 2013/01/21 19:44:52 ssuominen Exp $
+
+ 21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r4.ebuild,
+ udev-9999.ebuild:
+ Use plain bash instead of calling external executable grep in fstab check by
+ Arfrever
21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r3.ebuild,
udev-197-r4.ebuild, udev-9999.ebuild:
diff --git a/sys-fs/udev/udev-197-r4.ebuild b/sys-fs/udev/udev-197-r4.ebuild
index 7e3396f5fa78..fd930375a76a 100644
--- a/sys-fs/udev/udev-197-r4.ebuild
+++ b/sys-fs/udev/udev-197-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.8 2013/01/21 19:05:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.9 2013/01/21 19:44:52 ssuominen Exp $
EAPI=4
@@ -457,7 +457,7 @@ pkg_postinst()
fi
local fstab="${ROOT}"etc/fstab
- if $(grep -qs ^udev "${fstab}"); then
+ if [[ $(<"${fstab}") =~ (^|$'\n')udev ]]; then
ewarn "You should review and/or remove your udev starting line from ${fstab}"
ewarn "Not doing so might result in unbootable system."
ewarn "You have been warned. For details, see:"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 34b682eaed5d..c73431cb10fa 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.150 2013/01/21 19:05:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.151 2013/01/21 19:44:52 ssuominen Exp $
EAPI=4
@@ -457,7 +457,7 @@ pkg_postinst()
fi
local fstab="${ROOT}"etc/fstab
- if $(grep -qs ^udev "${fstab}"); then
+ if [[ $(<"${fstab}") =~ (^|$'\n')udev ]]; then
ewarn "You should review and/or remove your udev starting line from ${fstab}"
ewarn "Not doing so might result in unbootable system."
ewarn "You have been warned. For details, see:"