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

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

[Sebastian Pipping]

commit:     e8ffab000021c9934be3af9f6ee29057aca7462a
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Tue Feb  1 18:33:57 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 03:07:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e8ffab00

Update options for devtmpfs

Options copied from /etc/init.d/udev-mount as that script does not
sanitize or even tuch the options.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 034696b..ee26918 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -310,7 +310,8 @@ runmdev() {
 	# Use devtmpfs if enabled in kernel,
 	# else busybox udev replacement
 	if grep -qs devtmpfs /proc/filesystems ; then
-		mount -t devtmpfs devtmpfs /dev
+		# Options copied from /etc/init.d/udev-mount, should probably be kept in sync
+		mount -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev
 	else
 		mdev -s
 	fi

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

[Sebastian Pipping]

commit:     cb24bedd073f23ac518bc1c0b79aec4593db2817
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Tue Feb  1 18:34:54 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 03:07:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=cb24bedd

Move dev to chroot

This can be considered good practice, likely less chance that nodes
created in the ramdisk disapperes when switching root.
Some applications (mostly debugging/benchmarking) also needs this to
survive the switch_root.

---
 defaults/linuxrc |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ee33a35..88eed00 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -725,10 +725,14 @@ cd "${CHROOT}"
 mkdir "${CHROOT}/proc" "${CHROOT}/sys" 2>/dev/null
 echo -ne "${BOLD}.${NORMAL}"
 
-# If devtmpfs is mounted assume genkernel mounted it at /dev and try unmounting it
+# 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 devtmpfs /proc/mounts
 then
-	umount /dev || echo '*: Failed to unmount the devtmpfs /dev!'
+	if ! mount --move /dev "${CHROOT}"/dev
+	then
+		umount -a -t devtmpfs || echo '*: Failed to move and unmount the devtmpfs /dev!'
+	fi
 fi
 
 umount /sys || echo '*: Failed to unmount the ramdisk /sys!'

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

[Sebastian Pipping]

commit:     763fd09bacda81255d1244c767e921cfc48b9032
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Feb  7 03:09:25 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 03:09:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=763fd09b

Remove "-a" from call to umount

---
 defaults/linuxrc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 88eed00..b42070c 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -731,7 +731,7 @@ if grep -qs devtmpfs /proc/mounts
 then
 	if ! mount --move /dev "${CHROOT}"/dev
 	then
-		umount -a -t devtmpfs || echo '*: Failed to move and unmount the devtmpfs /dev!'
+		umount -t devtmpfs || echo '*: Failed to move and unmount the devtmpfs /dev!'
 	fi
 fi
 

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

[Sebastian Pipping]

commit:     398d7ba5acf5ca5d3c9777aff108b3897649822c
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Mon Feb  7 15:02:41 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 18:44:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=398d7ba5

Use tmpfs if devtmpfs is not available

This makes the ramdisk always mount some kind of /dev,
and then try to move it to the new root.
This unbreaks handling of nodes created pre-udev likefor example lvm does.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index ee26918..1fda57d 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -308,13 +308,15 @@ run_shell() {
 
 runmdev() {
 	# Use devtmpfs if enabled in kernel,
-	# else busybox udev replacement
+	# else tmpfs. Always run mdev just in case
+	devfs=tmpfs
 	if grep -qs devtmpfs /proc/filesystems ; then
-		# Options copied from /etc/init.d/udev-mount, should probably be kept in sync
-		mount -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev
-	else
-		mdev -s
+		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
+	mdev -s
 }
 
 test_success() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index b42070c..f1e124b 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -727,11 +727,11 @@ 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 devtmpfs /proc/mounts
+if grep -qs "/dev " /proc/mounts
 then
 	if ! mount --move /dev "${CHROOT}"/dev
 	then
-		umount -t devtmpfs || echo '*: Failed to move and unmount the devtmpfs /dev!'
+		umount /dev || echo '*: Failed to move and unmount the ramdisk /dev!'
 	fi
 fi
 

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

[Sebastian Pipping]

commit:     c3165cd02f00a2e27656acb93df26e7b4276d8d2
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Feb  7 18:47:10 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 18:47:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c3165cd0

Apply mdev primer of busybox

---
 defaults/initrd.scripts |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 1fda57d..6bfdc05 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -316,6 +316,10 @@ runmdev() {
 
 	# 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
+
+	# http://git.busybox.net/busybox/plain/docs/mdev.txt
+	mkdir /dev/pts
+	mount -t devpts devpts /dev/pts
 	mdev -s
 }
 

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

[Sebastian Pipping]

commit:     2deeaba70b67b54f7bff26d74df35a6730ca047f
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Feb  7 18:49:36 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 19:07:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2deeaba7

Add error message output

---
 defaults/initrd.scripts |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 6bfdc05..d630869 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -315,12 +315,13 @@ runmdev() {
 	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
+	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
-	mdev -s
+	mount -t devpts devpts /dev/pts  || bad_msg "Failed to mount /dev/pts"
+	mdev -s  || bad_msg "Failed recive dynamic updates from mdev"
 }
 
 test_success() {

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

[Sebastian Pipping]

commit:     23fd924325de6c9ffd0fbfbbff8da67bbf68a0ea
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Feb  7 19:20:49 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 19:20:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=23fd9243

Fix error message

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d630869..249b721 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -321,7 +321,7 @@ runmdev() {
 	# 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 recive dynamic updates from mdev"
+	mdev -s  || bad_msg "Failed to receive dynamic updates from mdev"
 }
 
 test_success() {

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

[Sebastian Pipping]

commit:     5e07592a758954bc72ce3f955fda1160794f46a2
Author:     craig <craig <AT> haquarter <DOT> de>
AuthorDate: Sun Oct 10 22:49:12 2010 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 16:57:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5e07592a

iBFT: fix iscsi_noibft

---
 defaults/linuxrc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ae0535b..61efc95 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}"`

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

[Sebastian Pipping]

commit:     d9f46bb5131266f979734895feaaf921f49d30af
Author:     craig <craig <AT> haquarter <DOT> de>
AuthorDate: Sun Oct 10 22:21:05 2010 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 16:56:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d9f46bb5

Add iBFT support for iSCSI

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 249b721..f7f01de 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -689,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 f1e124b..ae0535b 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -294,7 +294,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

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

[Sebastian Pipping]

commit:     665c3ecff6cb6584ef1c0a3eb867acc5ea3944e3
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Wed Feb 23 06:14:04 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 09:27:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=665c3ecf

Do not mess with MDADMs auto-detect

Only reason for this logic is to limit what entries in /proc/partitions
mdadm scans for arrays.
However this seems to break raids in containers (example Intel fakeraids)
as those containers are never scanned for arrays.
(On my system it activates /dev/md/imsm0, but never /dev/md/Gentoo_0 which
is the real RAID with the removed logic)
If someone has something dead-slow they do not want scanned for raids,
it is better if they specify their own mdadm.conf.
If someone finds an example of something that mdadm scans for arrays that
is not supposed to be scanned, we may handle that then.

---
 defaults/initrd.scripts |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f7f01de..dd44429 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -621,11 +621,6 @@ startVolumes() {
 	
 	if [ "${USE_MDADM}" = '1' ]
 	then
-		if [ ! -e '/etc/mdadm.conf' ]
-		then
-			echo "DEVICE /dev/sd[a-z]* /dev/hd[a-z]*" >/etc/mdadm.conf
-			/sbin/mdadm --examine --scan >>/etc/mdadm.conf
-		fi
 		/sbin/mdadm --assemble --scan
 	fi