Merge branch 'experimental' using --no-ff

4 files changed, 67 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 60c28458..4bec97b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,25 @@
 # Distributed under the GPL v2
 # $Id$
 
+  09 Feb 2011; Sebastian Pipping <sping@gentoo.org> genkernel.conf:
+  Add SPLASH and SPLASH_THEME to genkernel.conf (bug #268468)
+
+  Special thanks:
+  - PhobosK
+
+  08 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
+  Add iBFT support for iSCSI (bug #314575)
+
+  Special thanks:
+  - Stefan Behte
+
+  7 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
+  Use devtmpfs/tmpfs for /dev (bug #353024)
+  Rescue devtmpfs /dev over to chroot (bug #353024, bug #344407)
+
+  Special thanks:
+  - Peter Hjalmarsson
+
   31 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.12.6
 
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index cfe3abd5..f7f01ded 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -307,8 +307,21 @@ run_shell() {
 }
 
 runmdev() {
-	# busybox udev replacement
-	mdev -s
+	# Use devtmpfs if enabled in kernel,
+	# else tmpfs. Always run mdev just in case
+	devfs=tmpfs
+	if grep -qs devtmpfs /proc/filesystems ; then
+		devfs=devtmpfs
+	fi
+
+	# Options copied from /etc/init.d/udev-mount, should probably be kept in sync
+	mount -t $devfs -o "exec,nosuid,mode=0755,size=10M" udev /dev \
+		|| bad_msg "Failed to mount /dev as ${devfs}"
+
+	# http://git.busybox.net/busybox/plain/docs/mdev.txt
+	mkdir /dev/pts
+	mount -t devpts devpts /dev/pts  || bad_msg "Failed to mount /dev/pts"
+	mdev -s  || bad_msg "Failed to receive dynamic updates from mdev"
 }
 
 test_success() {
@@ -676,10 +689,16 @@ startVolumes() {
 }
 
 startiscsi() {
+	
+	if [ ! -n "${ISCSI_NOIBFT}" ]
+	then
+		good_msg "Activating iSCSI via iBFT"
+		iscsistart -b
+	fi
 
 	if [ -n "${ISCSI_INITIATORNAME}" ] && [ -n "${ISCSI_TARGET}" ] && [ -n "${ISCSI_ADDRESS}" ]
 	then
-		good_msg "Activating iSCSI"
+		good_msg "Activating iSCSI via cmdline"
 
 		if [ "${ISCSI_TGPT}" ]
 		then
diff --git a/defaults/linuxrc b/defaults/linuxrc
index ecfb546a..61efc953 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -178,6 +178,9 @@ do
 		iscsi_debug\=*)
 			ISCSI_DEBUG=`parse_opt "${x}"`
 		;;
+		iscsi_noibft)
+			ISCSI_NOIBFT=1
+		;;
 		# Crypto
 		crypt_root\=*)
 			CRYPT_ROOT=`parse_opt "${x}"`
@@ -294,7 +297,10 @@ start_dev_mgr
 [ "${DO_slowusb}" ] && sleep 10
 
 # Start iSCSI
-startiscsi
+if [ -e /bin/iscsistart ]
+then
+	startiscsi
+fi
 
 # Setup btrfs, see bug 303529
 setup_btrfsctl
@@ -724,6 +730,17 @@ fi
 cd "${CHROOT}"
 mkdir "${CHROOT}/proc" "${CHROOT}/sys" 2>/dev/null
 echo -ne "${BOLD}.${NORMAL}"
+
+# If devtmpfs is mounted, try move it to the new root
+# If that fails, try to unmount all possible mounts of devtmpfs as stuff breaks otherwise
+if grep -qs "/dev " /proc/mounts
+then
+	if ! mount --move /dev "${CHROOT}"/dev
+	then
+		umount /dev || echo '*: Failed to move and unmount the ramdisk /dev!'
+	fi
+fi
+
 umount /sys || echo '*: Failed to unmount the ramdisk /sys!'
 umount /proc || echo '*: Failed to unmount the ramdisk /proc!'
 echo -e "${BOLD}.${NORMAL}"
diff --git a/genkernel.conf b/genkernel.conf
index 3f52a322..779d71f4 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -93,6 +93,14 @@ DISKLABEL="yes"
 # Add new kernel to grub?
 # BOOTLOADER="grub"
 
+# Enable splashutils in early space (initrd). Default is "no".
+# SPLASH="yes"
+
+# Use this splash theme. If commented out - the "default" name theme is used.
+# Also, SPLASH="yes" needs to be enabled for this one to one work.
+# This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).
+# SPLASH_THEME="gentoo"
+
 # =========Low Level Compile Settings=========
 #
 # GNU Make to use for kernel.  See also the --kernel-make command line option.