Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/
Date: Sun, 01 Jul 2012 21:09:59
Message-Id: 1341176775.1ad426d24f94706e8578a5a0f0d0457405abc06c.WilliamH@gentoo
1 commit: 1ad426d24f94706e8578a5a0f0d0457405abc06c
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 1 21:06:15 2012 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 1 21:06:15 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=1ad426d2
7
8 udev-mount: remove selinux code
9
10 I was advised that this code is no longer needed since this issue is
11 being controlled by the selinux policy.
12 Thanks to Sven Vermeulen.
13
14 ---
15 init.d/udev-mount | 10 ----------
16 1 files changed, 0 insertions(+), 10 deletions(-)
17
18 diff --git a/init.d/udev-mount b/init.d/udev-mount
19 index ab58c3d..fa3afb3 100644
20 --- a/init.d/udev-mount
21 +++ b/init.d/udev-mount
22 @@ -62,14 +62,12 @@ seed_dev()
23 # udevd will dup its stdin/stdout/stderr to /dev/null
24 # and we do not want a file which gets buffered in ram
25 [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
26 - ${HAVE_SELINUX} && restorecon /dev/null
27
28 # so udev can add its start-message to dmesg
29 [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
30
31 # Create problematic directories
32 mkdir -p /dev/pts /dev/shm
33 - ${HAVE_SELINUX} && restorecon -R /dev >/dev/null
34 return 0
35 }
36
37 @@ -77,14 +75,6 @@ start()
38 {
39 mount_dev_directory || return 1
40
41 - # Selinux lovin; /selinux should be mounted by selinux-patched init
42 - if [ -x /sbin/restorecon -a -c /selinux/null ]; then
43 - HAVE_SELINUX=true
44 - restorecon /dev > /selinux/null
45 - else
46 - HAVE_SELINUX=false
47 - fi
48 -
49 seed_dev
50 return 0
51 }