summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-03-26 17:43:31 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-03-26 17:43:31 +0000
commit14cbb6ffabec3f3f57f1845ceda3494b267f9123 (patch)
tree883819038c3e2163e19b9d43e777f755c482d630 /sys-fs
parentNew ebuild for logmerge, suggested by Grant. Fixes bug #461316. (diff)
downloadgentoo-2-14cbb6ffabec3f3f57f1845ceda3494b267f9123.tar.gz
gentoo-2-14cbb6ffabec3f3f57f1845ceda3494b267f9123.tar.bz2
gentoo-2-14cbb6ffabec3f3f57f1845ceda3494b267f9123.zip
Remove separate /usr warning since it doesn't belong to sys-fs/udev anymore since we install it to / instead of /usr and it's not sys-fs/udev's problem if something from /usr gets used in early boot, like keymaps from sys-apps/kbd or net-wireless/bluez for bluetooth keyboard, wrt bug #463386.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/udev/ChangeLog8
-rw-r--r--sys-fs/udev/udev-9999.ebuild29
2 files changed, 8 insertions, 29 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index ccf6717d7448..f47bd64613d4 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
# 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.876 2013/03/24 17:04:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.877 2013/03/26 17:43:31 ssuominen Exp $
+
+ 26 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Remove separate /usr warning since it doesn't belong to sys-fs/udev anymore
+ since we install it to / instead of /usr and it's not sys-fs/udev's problem
+ if something from /usr gets used in early boot, like keymaps from
+ sys-apps/kbd or net-wireless/bluez for bluetooth keyboard, wrt bug #463386.
24 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> -udev-198-r5.ebuild:
old
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index f457868ba839..156900a92ea0 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.207 2013/03/24 09:26:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.208 2013/03/26 17:43:31 ssuominen Exp $
EAPI=5
@@ -361,15 +361,6 @@ pkg_preinst() {
preserve_old_lib /{,usr/}$(get_libdir)/libudev$(get_libname 0)
}
-# This function determines if a directory is a mount point.
-# It was lifted from dracut.
-ismounted() {
- while read a m a; do
- [[ $m = $1 ]] && return 0
- done < "${ROOT}"/proc/mounts
- return 1
-}
-
pkg_postinst() {
mkdir -p "${ROOT}"run
@@ -392,24 +383,6 @@ pkg_postinst() {
einfo "Removed unneeded file ${old_dm_rules}"
fi
- if ismounted /usr; then
- ewarn
- ewarn "Your system has /usr on a separate partition. This means"
- ewarn "you will need to use an initramfs to pre-mount /usr before"
- ewarn "udev runs."
- ewarn
- ewarn "If this is not set up before your next reboot, udev may work;"
- ewarn "However, you also may experience failures which are very"
- ewarn "difficult to troubleshoot."
- ewarn
- ewarn "For a more detailed explanation, see the following URL:"
- ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
- ewarn
- ewarn "For more information on setting up an initramfs, see the"
- ewarn "following URL:"
- ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml"
- fi
-
local fstab="${ROOT}"etc/fstab dev path fstype rest
while read -r dev path fstype rest; do
if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then