[gentoo-commits] proj/genkernel:xake commit in: defaults/

["Peter Hjalmarsson" <xake@rymdraket.net>]

commit:     4f3fb890795bce02be5a8f27f87e66c4796a3541
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Thu Mar 24 12:33:03 2011 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
CommitDate: Thu Mar 24 12:33:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4f3fb890

Use the same options for proc and sysfs as Gentoo/OpenRC uses

---
 defaults/initrd.scripts |    2 +-
 defaults/linuxrc        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4a12b73..b228a77 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -210,7 +210,7 @@ cache_cd_contents() {
 }
 
 mount_sysfs() {
-	mount -t sysfs /sys /sys >/dev/null 2>&1
+	mount -t sysfs sysfs /sys -o noexec,nosuid,nodev >/dev/null 2>&1
 	ret=$?
 	[ ${ret} -eq 0 ] || bad_msg "Failed to mount /sys!"
 }

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 64bb150..f5802d7 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -20,7 +20,7 @@ then
 	exit 1
 fi
 
-mount -t proc proc /proc >/dev/null 2>&1
+mount -t proc -o noexec,nosuid,nodev proc /proc >/dev/null 2>&1
 mount -o remount,rw / >/dev/null 2>&1
 
 # Set up symlinks