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

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

[Amadeusz Żołnowski]

commit:     3cac23cc3443e936fe24ba5900c086aa24a42ea9
Author:     Amadeusz Żołnowski <aidecoe <AT> aidecoe <DOT> name>
AuthorDate: Thu May 12 14:26:15 2011 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu May 12 14:26:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3cac23cc

added hpsa to defaults/modules_load; fixes bug #363369

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

diff --git a/defaults/modules_load b/defaults/modules_load
index 3365b97..31f534b 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai
 # Hardware (IDE/SCSI/SATA)
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx"
 MODULES_WAITSCAN="scsi_wait_scan"
 
 # Hardware (Network)

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

[Sebastian Pipping]

commit:     6a00d8677ac6a1be4ddb4c5021ebfe0e94a623ed
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue May 31 18:47:42 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue May 31 18:48:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6a00d867

Rename internal function whereis to prompt_user

.. to avoid confustion with whereis(1) from sys-apps/util-linux

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b228a77..37a7eb4 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -377,7 +377,7 @@ crypt_filter() {
 	fi
 }
 
-whereis(){
+prompt_user(){
 	# $1 = variable whose value is the path (examples: "REAL_ROOT",
 	#      "LUKS_KEYDEV")
 	# $2 = label
@@ -386,7 +386,7 @@ whereis(){
 	eval local oldvalue='$'${1}
 
 	[ \( $# != 2 \) -a \( $# != 3 \) ] && \
-		bad_msg "Bad invocation of function whereis, please file a bug \
+		bad_msg "Bad invocation of function prompt_user, please file a bug \
 		report with this message" && exit 1
 	[ -n "${3}" ] && local explnt=" or : ${3}" || local explnt="."
 	
@@ -771,15 +771,15 @@ openLUKS() {
 			run_shell
 		elif [ ${DEV_ERROR} -eq 1 ]
 		then
-			whereis "LUKS_DEVICE" "${LUKS_NAME}"
+			prompt_user "LUKS_DEVICE" "${LUKS_NAME}"
 			DEV_ERROR=0
 		elif [ ${KEY_ERROR} -eq 1 ]
 		then
-			whereis "LUKS_KEY" "${LUKS_NAME} key"
+			prompt_user "LUKS_KEY" "${LUKS_NAME} key"
 			KEY_ERROR=0
 		elif [ ${KEYDEV_ERROR} -eq 1 ]
 		then
-			whereis "LUKS_KEYDEV" "${LUKS_NAME} key device"
+			prompt_user "LUKS_KEYDEV" "${LUKS_NAME} key device"
 			KEYDEV_ERROR=0
 		else
 			case "${LUKS_DEVICE}" in

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 51c4529..94a2ccd 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -455,7 +455,7 @@ do
 					good_msg "Detected real_root=${ROOT_DEV}"
 					REAL_ROOT="${ROOT_DEV}"
 				else
-					whereis "REAL_ROOT" "root block device"
+					prompt_user "REAL_ROOT" "root block device"
 					got_good_root=0
 					continue
 				fi
@@ -465,7 +465,7 @@ do
 		if [ "${REAL_ROOT}" = '' ]
 		then
 			# No REAL_ROOT determined/specified. Prompt user for root block device.
-			whereis "REAL_ROOT" "root block device"
+			prompt_user "REAL_ROOT" "root block device"
 			got_good_root=0
 
 		# Check for a block device or /dev/nfs

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

[Peter Hjalmarsson]

commit:     eec4397e4125a29119279c9296de8e310adc8599
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Wed Jun  8 15:49:23 2011 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
CommitDate: Wed Jun  8 15:49:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=eec4397e

Check content of $REAL_ROOT/dev after we are done with it

Removes error message about missing /dev/console and /dev/null

---
 defaults/linuxrc |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ad6d780..57f26fd 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -725,13 +725,6 @@ fi
 verbose_kmsg
 
 echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}"
-if [ ! -e "${CHROOT}/dev/console" ] || [ ! -e "${CHROOT}/dev/null" ]
-then
-	echo -ne "${BAD}>>${NORMAL}${BOLD} ERROR: your real /dev is missing files required to boot (console and null)${NORMAL}"
-elif [ -e /etc/initrd.splash -a ! -e "${CHROOT}/dev/tty1" ]
-then
-	echo -ne "${BAD}>>${NORMAL}${BOLD} ERROR: your real /dev is missing tty1, which is required for splash${NORMAL}"
-fi
 
 cd "${CHROOT}"
 mkdir "${CHROOT}/proc" "${CHROOT}/sys" 2>/dev/null
@@ -750,6 +743,14 @@ do
 	fi
 done
 
+if [ ! -e "${CHROOT}/dev/console" ] || [ ! -e "${CHROOT}/dev/null" ]
+then
+	echo -ne "${BAD}>>${NORMAL}${BOLD} ERROR: your real /dev is missing files required to boot (console and null)${NORMAL}"
+elif [ -e /etc/initrd.splash -a ! -e "${CHROOT}/dev/tty1" ]
+then
+	echo -ne "${BAD}>>${NORMAL}${BOLD} ERROR: your real /dev is missing tty1, which is required for splash${NORMAL}"
+fi
+
 echo -e "${BOLD}.${NORMAL}"
 
 exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}"

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

[Robin H. Johnson]

commit:     a487275640780e3684d444444e6b75b45e4768b3
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 07:44:52 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 07:44:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a4872756

Removing dangling backtick to make script work.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 01d5cf9..f58bbb5 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -110,7 +110,7 @@ do
 		# Module no-loads
 		doload=*)
 			MDOLIST=${x#*=}
-			MDOLIST=$(echo ${MDOLIST} | sed -e 's/,/ /g'`)
+			MDOLIST=$(echo ${MDOLIST} | sed -e 's/,/ /g')
 		;;
 		nodetect)
 			NODETECT=1

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

[Robin H. Johnson]

commit:     00b5b3ab6603191c5a2e652b26595ab7aa5db188
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 22:43:47 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 22:43:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=00b5b3ab

Allow real_root to point to LVM-created symlinks.

Needed to unbreak root-on-LVM on my laptop.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index da8cb01..b6b01ca 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -648,6 +648,11 @@ startVolumes() {
 
 			# To activate volumegroups on all devices in the cache
 			lvm_commands="${lvm_commands} \nvgchange -ay --sysinit"
+			
+			# To create symlinks so users can use real_root=/dev/vg/root
+			# This needs to run after vgchange, using vgchange --mknodes is too
+			# early.
+			lvm_commands="${lvm_commands} \nvgmknodes --ignorelockingfailure"
 
 			# And finally execute it all (/proc/... needed if lvm is compiled without readline)
 			good_msg "Scanning for and activating Volume Groups"

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

[Robin H. Johnson]

commit:     953c7e5b42492c3d5746c3c9857208024d827f0a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 02:16:27 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 02:16:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=953c7e5b

Awk support in busybox is needed for initramfs setup code (to parse fstab).

---
 defaults/busy-config |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index a1f6858..fe53990 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -287,8 +287,8 @@ CONFIG_WHICH=y
 #
 # Editors
 #
-# CONFIG_AWK is not set
-# CONFIG_FEATURE_AWK_MATH is not set
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=n
 # CONFIG_CMP is not set
 # CONFIG_DIFF is not set
 # CONFIG_FEATURE_DIFF_BINARY is not set

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

[Robin H. Johnson]

commit:     ae2a061ca74e33d0b1ecfc32c778d0b3f9970c12
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 02:29:48 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 02:29:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ae2a061c

Disable the /usr mount code until OpenRC section is ready, so that it goes to read-write properly. It was usable in systemd already...

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 599c0d1..6bdaea1 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -702,10 +702,14 @@ else
 fi
 
 # Mount the additional things as required by udev & systemd
-if [ ! -f ${NEW_ROOT}/etc/initramfs.mounts ]; then
-	fslist="/usr"
-else
+if [ -f ${NEW_ROOT}/etc/initramfs.mounts ]; then
 	fslist=$(get_mounts_list)
+else
+	# Disabled until the new OpenRC is ready to go.
+	# Otherwise users will get /usr mounted RO, and it will NOT transition to
+	# RW correctly.
+	#fslist="/usr" 
+	fslist=""
 fi
 
 for fs in $fslist; do

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

[Sebastian Pipping]

commit:     8c76eb9e512d90c1d9170bb7318a3c47a67497bd
Author:     Rick Farina <sidhayn <AT> gmail <DOT> com>
AuthorDate: Fri Feb  3 04:57:47 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 14:13:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=8c76eb9e

Add sdcard device support

built in sd card readers are called /dev/mmcblk* which was not
supported. This patch fixes that issue.

Signed-of-By: Rick Farina <sidhayn <AT> gmail.com>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 89629e9..4f71a88 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -88,7 +88,7 @@ findmediamount() {
 				# don't skip device mapper devices. Even the craziest scenario
 				# deserves a fair chance.
 				#
-				for part in `ls /sys/block/${bsn}/${bsn}[0-9]* 2>/dev/null`
+				for part in `ls /sys/block/${bsn}/${bsn}*[0-9]* 2>/dev/null`
 				do
 					skip=1
 					break;
@@ -143,6 +143,8 @@ devicelist(){
 	DEVICES="$DEVICES /dev/ubd* /dev/ubd/*"
 	# iSeries devices
 	DEVICES="$DEVICES /dev/iseries/vcd*"
+	# builtin mmc/sd card reader devices
+	DEVICES="$DEVICES /dev/mmcblk* /dev/mmcblk*/*"
 	echo ${DEVICES}
 }
 

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

[Robin H. Johnson]

commit:     277259282e5724d47011bbb318001c0da4a014ee
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 19:36:35 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 19:36:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=27725928

Enable live mounting of /usr. Was supposed to have been in 3.4.25.

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 528f58d..b883155 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -771,11 +771,7 @@ fi
 if [ -f ${NEW_ROOT}/etc/initramfs.mounts ]; then
 	fslist=$(get_mounts_list)
 else
-	# Disabled until the new OpenRC is ready to go.
-	# Otherwise users will get /usr mounted RO, and it will NOT transition to
-	# RW correctly.
-	#fslist="/usr" 
-	fslist=""
+	fslist="/usr" 
 fi
 
 for fs in $fslist; do

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

[Sebastian Pipping]

commit:     0584c96ca68fd2afe19cec19c35f929e068d5609
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Mar 16 21:13:04 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 21:13:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0584c96c

Extract function do_rundebugshell

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 0e1e5f9..8ce8ac6 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1000,12 +1000,16 @@ setup_md_device() {
 	fi
 }
 
+do_rundebugshell() {
+	good_msg 'Type "exit" to continue with normal bootup.'
+	[ -x /bin/sh ] && /bin/sh || /bin/ash
+}
+
 rundebugshell() {
 	if [ -n "$DEBUG" ]
 	then
 		good_msg 'Starting debug shell as requested by "debug" option.'
-		good_msg 'Type "exit" to continue with normal bootup.'
-		[ -x /bin/sh ] && /bin/sh || /bin/ash
+		do_rundebugshell
 	fi
 }
 

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

[Sebastian Pipping]

commit:     3ca4d178740a05e1016a7032f8df16da78b65b95
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Mar 16 22:34:45 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 22:34:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3ca4d178

Message cosmetics

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 8ce8ac6..f504c3f 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -97,7 +97,7 @@ findmediamount() {
 				then
 					continue
 				fi
-				good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT}
+				good_msg "Attempting to mount media: ${x}" ${CRYPT_SILENT}
 
 				mount -r -t ${CDROOT_TYPE} ${x} ${mntcddir} >/dev/null 2>&1
 				if [ "$?" = '0' ]

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

[Sebastian Pipping]

commit:     391a9b996934f1590fb663674ddbb1bff1cb60aa
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Apr  7 21:17:50 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 04:08:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=391a9b99

Move ZFS binary check outside of commandline loop

---
 defaults/linuxrc |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 9ac2c7c..4a16462 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -97,16 +97,11 @@ do
 			USE_DMRAID_NORMAL=1
 		;;
 		dozfs*)
-			if [ ! -x /sbin/zfs ]; then
-				USE_ZFS=0
-				bad_msg 'zfs binary not found: aborting use of zfs!'
-			else
-				USE_ZFS=1
-				MY_HWOPTS="${MY_HWOPTS} zfs"
-				if [ "${x#*=}" = 'force' ]
-				then
-					ZPOOL_FORCE=-f
-				fi
+			USE_ZFS=1
+			MY_HWOPTS="${MY_HWOPTS} zfs"
+			if [ "${x#*=}" = 'force' ]
+			then
+				ZPOOL_FORCE=-f
 			fi
 		;;
 		# Debug Options
@@ -253,6 +248,14 @@ then
 	REAL_ROOT="${FAKE_ROOT}"
 fi
 
+# Disable ZFS when support is missing
+if [ "USE_ZFS" = "1" -a ! -x /sbin/zfs ]
+then
+	USE_ZFS=0
+	MY_HWOPTS=$(echo ${MY_HWOPTS} | sed -e 's/ zfs//g')
+	bad_msg 'zfs binary not found: aborting use of zfs!'
+fi
+
 splash 'init'
 
 cmdline_hwopts

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

[Sebastian Pipping]

commit:     f5f3d6fa8705c100ef441510e9d7ad81af829ad5
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Apr  7 20:56:49 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 04:08:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f5f3d6fa

Enable real_root=ZFS to permit booting off ZFS

---
 defaults/linuxrc |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4a16462..3f13f77 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -98,7 +98,7 @@ do
 		;;
 		dozfs*)
 			USE_ZFS=1
-			MY_HWOPTS="${MY_HWOPTS} zfs"
+
 			if [ "${x#*=}" = 'force' ]
 			then
 				ZPOOL_FORCE=-f
@@ -248,12 +248,23 @@ then
 	REAL_ROOT="${FAKE_ROOT}"
 fi
 
-# Disable ZFS when support is missing
-if [ "USE_ZFS" = "1" -a ! -x /sbin/zfs ]
+# Set variables based on the value of REAL_ROOT
+case "${REAL_ROOT}" in
+	ZFS*)
+		USE_ZFS=1
+	;;
+esac
+
+# Verify that it is safe to use ZFS
+if [ "USE_ZFS" = "1" ]
 then
-	USE_ZFS=0
-	MY_HWOPTS=$(echo ${MY_HWOPTS} | sed -e 's/ zfs//g')
-	bad_msg 'zfs binary not found: aborting use of zfs!'
+	if [ -x /sbin/zfs ]
+	then
+		MY_HWOPTS="${MY_HWOPTS} zfs"
+	else
+		bad_msg 'zfs binary not found: aborting use of zfs!'
+		USE_ZFS=0
+	fi
 fi
 
 splash 'init'

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

[Sebastian Pipping]

commit:     a7fbf76f7baa05049b6147c308a0874912790f04
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Apr 12 04:17:54 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 04:18:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a7fbf76f

Make sure the previous move of cd commands cannot result in unexpected regressions

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 7f68836..23ec2b0 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -283,10 +283,8 @@ setup_hotplug
 # Start mdev
 if [ "${KV_2_6_OR_GREATER}" ]
 then
-	cd /sys
 	good_msg 'Activating mdev'
-	mdev -s  || bad_msg "Failed to receive dynamic updates from mdev"
-	cd /
+	( cd /sys && mdev -s ) || bad_msg "Failed to receive dynamic updates from mdev"
 fi
 
 # Load modules listed in MY_HWOPTS if /lib/modules exists for the running kernel
@@ -316,6 +314,8 @@ sdelay
 # Setup slow USB bits
 setup_slowusb
 
+cd /
+
 # if doslowusb is passed, pause other 10 seconds here, after mdev load
 [ "${DO_slowusb}" ] && sleep 10
 

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

[Sebastian Pipping]

commit:     69009cb7475cd4067791f96747a09a26abf4742b
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Thu Mar 15 21:45:04 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 04:08:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=69009cb7

Reorder mdev initialization to mimic udev boot

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 8aad72b..5d523ab 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -298,7 +298,7 @@ run_shell() {
 	/bin/ash
 }
 
-runmdev() {
+mount_devfs () {
 	# Use devtmpfs if enabled in kernel,
 	# else tmpfs. Always run mdev just in case
 	devfs=tmpfs
@@ -313,7 +313,6 @@ runmdev() {
 	# http://git.busybox.net/busybox/plain/docs/mdev.txt
 	mkdir -m 0755 /dev/pts
 	mount -t devpts -o gid=5,mode=0620 devpts /dev/pts  || bad_msg "Failed to mount /dev/pts"
-	mdev -s  || bad_msg "Failed to receive dynamic updates from mdev"
 }
 
 test_success() {
@@ -433,16 +432,6 @@ setup_slowusb() {
 	done
 }
 
-start_dev_mgr() {
-	if [ "${KV_2_6_OR_GREATER}" ]
-	then
-		cd /sys
-		good_msg 'Activating mdev'
-		runmdev
-		cd /
-	fi
-}
-
 cmdline_hwopts() {
 	# Scan CMDLINE for any "doscsi" or "noscsi"-type arguments
 	local FOUND

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 3f13f77..7f68836 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -271,12 +271,24 @@ splash 'init'
 
 cmdline_hwopts
 
+# Mount devfs
+mount_devfs
+
 # Mount sysfs
 mount_sysfs
 
 # Setup hotplugging for firmware loading
 setup_hotplug
 
+# Start mdev
+if [ "${KV_2_6_OR_GREATER}" ]
+then
+	cd /sys
+	good_msg 'Activating mdev'
+	mdev -s  || bad_msg "Failed to receive dynamic updates from mdev"
+	cd /
+fi
+
 # Load modules listed in MY_HWOPTS if /lib/modules exists for the running kernel
 if [ -z "${DO_modules}" ]
 then
@@ -304,9 +316,6 @@ sdelay
 # Setup slow USB bits
 setup_slowusb
 
-# Start device manager
-start_dev_mgr
-
 # if doslowusb is passed, pause other 10 seconds here, after mdev load
 [ "${DO_slowusb}" ] && sleep 10
 

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

[Robin H. Johnson]

commit:     51ad5c92ab0ccfe18023d6ba1287fe330f1862e6
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Apr 24 07:23:53 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 21:02:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=51ad5c92

Serialize hotplug events to mimic udev

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 5d523ab..4aad686 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -404,13 +404,6 @@ prompt_user(){
 	esac
 }
 
-setup_hotplug() {
-	if [ "${KV_2_6_OR_GREATER}" ]
-	then
-		echo /sbin/mdev > /proc/sys/kernel/hotplug
-	fi
-}
-
 setup_slowusb() {
 	# This function removes unset DO_slowusb if there is no usb-storage attached.
 	# If noslowusb is set, skip this function

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 23ec2b0..f6c0de5 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -277,13 +277,18 @@ mount_devfs
 # Mount sysfs
 mount_sysfs
 
-# Setup hotplugging for firmware loading
-setup_hotplug
-
 # Start mdev
 if [ "${KV_2_6_OR_GREATER}" ]
 then
 	good_msg 'Activating mdev'
+
+	# Serialize hotplug events
+	touch /dev/mdev.seq
+
+	# Setup hotplugging for firmware loading
+	echo /sbin/mdev > /proc/sys/kernel/hotplug
+
+	# Setup mdev netlink socket daemon
 	( cd /sys && mdev -s ) || bad_msg "Failed to receive dynamic updates from mdev"
 fi
 

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

[Robin H. Johnson]

commit:     0f399f48ff1e6c07d88a7ef18b27df84e8cbac6a
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Mon Apr 30 16:39:04 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 19:08:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0f399f48

Verify that binaries exist before startVolumes calls them

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4aad686..02843c5 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -599,7 +599,12 @@ startVolumes() {
 	
 	if [ "${USE_MDADM}" = '1' ]
 	then
-		/sbin/mdadm --assemble --scan
+		if [ -e '/sbin/mdadm' ]
+		then
+			/sbin/mdadm --assemble --scan
+		else
+			bad_msg "mdadm not found: skipping mdadm raid assembly!"
+		fi
 	fi
 
 	if [ "${USE_DMRAID_NORMAL}" = '1' ]
@@ -649,7 +654,12 @@ startVolumes() {
 	
 	if [ "${USE_ZFS}" = '1' ]
 	then
-		/sbin/zpool import -N -a ${ZPOOL_FORCE}
+		if [ -e '/sbin/zpool' ]
+		then
+			/sbin/zpool import -N -a ${ZPOOL_FORCE}
+		else
+			bad_msg "zpool not found: skipping ZFS pool import!"
+		fi
 	fi
 }
 

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

[Robin H. Johnson]

commit:     6968584a58a7825adb9f13b45961f190ea4ca7e0
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Mon Apr 30 17:34:01 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 20:39:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6968584a

Improve ZFS diagnostics, import and mounting

Make ZFS only import the specified pool
Set zfsutil when mounting non-legacy rootfs
Check for /sbin/zpool in addition to /sbin/zfs
Print information messages when ZFS pools are imported
Prompt user when mounting a ZFS filesystem without ZFS support
Verify that <dataset> in real_root=ZFS=<dataset> is a filesystem

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 02843c5..a7d88e4 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -654,11 +654,29 @@ startVolumes() {
 	
 	if [ "${USE_ZFS}" = '1' ]
 	then
-		if [ -e '/sbin/zpool' ]
+		if [ -z "${ZFS_POOL}" ];
 		then
-			/sbin/zpool import -N -a ${ZPOOL_FORCE}
+			good_msg "Importing ZFS pools"
+
+			/sbin/zpool import -N -a "${ZPOOL_FORCE}"
+
+			if [ "$?" = '0' ]
+			then
+				good_msg "Importing ZFS pools succeeded"
+			else
+				bad_msg "Imported ZFS pools failed"
+			fi
 		else
-			bad_msg "zpool not found: skipping ZFS pool import!"
+			good_msg "Importing ZFS pool ${ZFS_POOL}"
+
+			/sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}"
+
+			if [ "$?" = '0' ]
+			then
+				good_msg "Importing ${ZFS_POOL} succeeded"
+			else
+				bad_msg "Importing ${ZFS_POOL} failed"
+			fi
 		fi
 	fi
 }

diff --git a/defaults/linuxrc b/defaults/linuxrc
index f6c0de5..6103e23 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -251,6 +251,11 @@ fi
 # Set variables based on the value of REAL_ROOT
 case "${REAL_ROOT}" in
 	ZFS*)
+		ZFS_POOL=${REAL_ROOT#*=}
+		ZFS_POOL=${ZFS_POOL%%/*}
+		USE_ZFS=1
+	;;
+	ZFS)
 		USE_ZFS=1
 	;;
 esac
@@ -258,12 +263,15 @@ esac
 # Verify that it is safe to use ZFS
 if [ "USE_ZFS" = "1" ]
 then
-	if [ -x /sbin/zfs ]
+	if [ -x /sbin/zfs -a -x /sbin/zpool ]
 	then
 		MY_HWOPTS="${MY_HWOPTS} zfs"
 	else
-		bad_msg 'zfs binary not found: aborting use of zfs!'
 		USE_ZFS=0
+
+		[ -x /sbin/zfs ] || bad_msg '/sbin/zfs not found!'
+		[ -x /sbin/zpool ] || bad_msg '/sbin/zpool not found!'
+		bad_msg 'Aborting use of zfs!'
 	fi
 fi
 
@@ -486,16 +494,24 @@ do
 				fi
 				;;
 			ZFS*)
+				if [ "${USE_ZFS}" = '0' ]; then
+					prompt_user "REAL_ROOT" "root block device"
+					continue
+				fi
+					
 				ROOT_DEV="${REAL_ROOT#*=}"
 				if [ "${ROOT_DEV}" != 'ZFS' ] 
 				then
-					zfs get type ${ROOT_DEV} > /dev/null
-
-					if [ "$?" = '0' ]
+					if [ "$(zfs get type -o value -H ${ROOT_DEV})" = 'filesystem' ]
 					then
 						got_good_root=1;
 						REAL_ROOT=${ROOT_DEV}
 						ROOTFSTYPE=zfs
+					else
+						bad_msg "${ROOT_DEV} is not a filesystem"
+						prompt_user "REAL_ROOT" "root block device"
+						got_good_root=0
+						continue
 					fi
 				else
 					BOOTFS=$(/sbin/zpool list -H -o bootfs)
@@ -563,7 +579,12 @@ do
 
 		if [ "${ROOTFSTYPE}" = 'zfs' ]
 		then
-			MOUNT_STATE=rw
+			if [ "zfs get -H -o value mountpoint ${REAL_ROOT}" = 'legacy' ]
+			then
+				MOUNT_STATE=rw
+			else
+				MOUNT_STATE=rw,zfsutil
+			fi
 		else
 			MOUNT_STATE=ro
 		fi

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

[Robin H. Johnson]

commit:     b5b535f5aa6fa776dadc2e324b94211224cdb7f9
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Wed May  2 02:28:10 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed May  2 02:29:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b5b535f5

Do not import a pool that the kernel automatically imported

This works around the following upstream issue:
https://github.com/zfsonlinux/zfs/issues/714

Signed-off-by: Richard Yao <ryao <AT> cs.stonybrook.edu>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a7d88e4..c468ad4 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -654,7 +654,7 @@ startVolumes() {
 	
 	if [ "${USE_ZFS}" = '1' ]
 	then
-		if [ -z "${ZFS_POOL}" ];
+		if [ -z "${ZFS_POOL}" ]
 		then
 			good_msg "Importing ZFS pools"
 
@@ -667,15 +667,21 @@ startVolumes() {
 				bad_msg "Imported ZFS pools failed"
 			fi
 		else
-			good_msg "Importing ZFS pool ${ZFS_POOL}"
 
-			/sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}"
-
-			if [ "$?" = '0' ]
+			if [ "$(zpool list -H -o name ${ZFS_POOL} 2>&1)" = "$ZFS_POOL" ]
 			then
-				good_msg "Importing ${ZFS_POOL} succeeded"
+				good_msg "ZFS pool ${ZFS_POOL} already imported"
 			else
-				bad_msg "Importing ${ZFS_POOL} failed"
+				good_msg "Importing ZFS pool ${ZFS_POOL}"
+
+				/sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}"
+
+				if [ "$?" = '0' ]
+				then
+					good_msg "Importing ${ZFS_POOL} succeeded"
+				else
+					bad_msg "Importing ${ZFS_POOL} failed"
+				fi
 			fi
 		fi
 	fi

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

[Sebastian Pipping]

commit:     f95264added35c25fb557931116edd3cd0aec7ba
Author:     Marios Andreopoulos <opensource <AT> andmarios <DOT> com>
AuthorDate: Mon Jun 11 17:17:49 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 17:17:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f95264ad

Use real_root option for (plain) Luks setup

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 258f2bd..fd9ac27 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -751,16 +751,19 @@ openLUKS() {
 	# please use 'tr' and this line, or remove it
 	# eval local TYPE=`uppercase $1`
 
+	local LUKS_NAME="$1"
+
 	case $1 in
 		root)
 			local TYPE=ROOT
+			[ -n "${REAL_ROOT}" ] && local LUKS_NAME="$(echo "$REAL_ROOT" | sed -e 's/.*\///')"
 			;;
 		swap)
 			local TYPE=SWAP
 			;;
 	esac
 
-	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$1" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
+	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$LUKS_NAME" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
 	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
 	local mntkey="/mnt/key/" cryptsetup_options=''
 

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

[Sebastian Pipping]

commit:     36d0fb5559726d863624c75614f35a875aa2fb6d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jun 11 17:33:05 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 17:33:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=36d0fb55

Make recent addition conform to POSIX

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index fd9ac27..f05a746 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -756,7 +756,7 @@ openLUKS() {
 	case $1 in
 		root)
 			local TYPE=ROOT
-			[ -n "${REAL_ROOT}" ] && local LUKS_NAME="$(echo "$REAL_ROOT" | sed -e 's/.*\///')"
+			[ -n "${REAL_ROOT}" ] && local LUKS_NAME="`echo "${REAL_ROOT}" | sed -e 's|.*/||'`"
 			;;
 		swap)
 			local TYPE=SWAP

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

[Richard Yao]

commit:     35fa22bc6a3674d39a25dd655cfa881796971933
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Jul 17 19:56:46 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 19:56:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=35fa22bc

Fix rootfs=ZFS infinite loop when no bootfs is set, bug #425120

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 8a1bec9..6d156d7 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -533,6 +533,8 @@ do
 						
 						done;
 
+					else
+						got_good_root=0
 					fi
 
 				fi

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

[Richard Yao]

commit:     2181ad1a11aa8d13b66030c701ba67f9f95a8c92
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Jul 17 19:57:02 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 19:57:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2181ad1a

Fix bad ZFS case statement, bug #425122

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6d156d7..0403b4d 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -250,7 +250,7 @@ fi
 
 # Set variables based on the value of REAL_ROOT
 case "${REAL_ROOT}" in
-	ZFS*)
+	ZFS=*)
 		ZFS_POOL=${REAL_ROOT#*=}
 		ZFS_POOL=${ZFS_POOL%%/*}
 		USE_ZFS=1

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

[Richard Yao]

commit:     de4751a2d2864c62d370425dc91ff42ffe2f6db3
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Jul 17 19:56:46 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 20:03:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=de4751a2

Fix rootfs=ZFS infinite loop when no bootfs is set, bug #425120

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 8a1bec9..6d156d7 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -533,6 +533,8 @@ do
 						
 						done;
 
+					else
+						got_good_root=0
 					fi
 
 				fi

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

[Richard Yao]

commit:     65249bbcea5fc30fad575e0534f563d5937eab6b
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Jul 17 19:57:02 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 20:03:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=65249bbc

Fix bad ZFS case statement, bug #425122

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6d156d7..0403b4d 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -250,7 +250,7 @@ fi
 
 # Set variables based on the value of REAL_ROOT
 case "${REAL_ROOT}" in
-	ZFS*)
+	ZFS=*)
 		ZFS_POOL=${REAL_ROOT#*=}
 		ZFS_POOL=${ZFS_POOL%%/*}
 		USE_ZFS=1

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

[Richard Yao]

commit:     e2189311fc8c036327c1c8263807b274d5ff039b
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Jul 17 20:13:57 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 20:13:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e2189311

Verify in /proc/mounts that devtmpfs is unmounted before mounting it

For consistency, we do the same with devpts. WilliamH reported this to
me in IRC.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 258f2bd..a2edeee 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -307,12 +307,16 @@ mount_devfs () {
 	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}"
+	if grep -qs grep '^devtmpfs' /proc/mounts; then
+		mount -t $devfs -o "exec,nosuid,mode=0755,size=10M" udev /dev \
+			|| bad_msg "Failed to mount /dev as ${devfs}"
+	fi
 
 	# http://git.busybox.net/busybox/plain/docs/mdev.txt
-	mkdir -m 0755 /dev/pts
-	mount -t devpts -o gid=5,mode=0620 devpts /dev/pts  || bad_msg "Failed to mount /dev/pts"
+	if grep -qs grep '^devpts' /proc/mounts; then
+		mkdir -m 0755 /dev/pts
+		mount -t devpts -o gid=5,mode=0620 devpts /dev/pts  || bad_msg "Failed to mount /dev/pts"
+	fi
 }
 
 test_success() {

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

[Richard Yao]

commit:     b8626e78ef1e534ee95a058d2a2b8f530d432aad
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Jul 17 20:22:40 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 20:22:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b8626e78

Fix typo in previous commit.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a2edeee..46364de 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -307,13 +307,13 @@ mount_devfs () {
 	fi
 
 	# Options copied from /etc/init.d/udev-mount, should probably be kept in sync
-	if grep -qs grep '^devtmpfs' /proc/mounts; then
+	if grep -qs '^devtmpfs' /proc/mounts; then
 		mount -t $devfs -o "exec,nosuid,mode=0755,size=10M" udev /dev \
 			|| bad_msg "Failed to mount /dev as ${devfs}"
 	fi
 
 	# http://git.busybox.net/busybox/plain/docs/mdev.txt
-	if grep -qs grep '^devpts' /proc/mounts; then
+	if grep -qs '^devpts' /proc/mounts; then
 		mkdir -m 0755 /dev/pts
 		mount -t devpts -o gid=5,mode=0620 devpts /dev/pts  || bad_msg "Failed to mount /dev/pts"
 	fi

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

[Richard Yao]

commit:     2bf6b9045db63e8163ac6a83137077eb8b9ecade
Author:     Dzianis Kahanovich <mahatma <AT> eu <DOT> by>
AuthorDate: Wed Jan  5 15:31:00 2011 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 20:03:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2bf6b904

Adding modules cmdline options for genkernel (module.option[=value]).
Effective for genkernel's modprobe script or busybox "not small"
modprobe.

Signed-off-by: Dzianis Kahanovich <mahatma <AT> eu.by>
Updated-by: Richard Yao <ryao <AT> cs.stonybrook.edu>

---
 defaults/linuxrc  |   18 ++++++++++++++++++
 defaults/modprobe |    5 ++++-
 2 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 0403b4d..91a3396 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -39,6 +39,7 @@ FAKE_ROOT=''
 REAL_ROOTFLAGS=''
 ROOTFSTYPE='auto'
 CRYPT_SILENT=0
+mkdir -p /etc/cmdline /etc/modprobe.d
 for x in ${CMDLINE}
 do
 	case "${x}" in
@@ -240,6 +241,23 @@ do
 		nounionfs)
 			USE_UNIONFS_NORMAL=0
 			;;
+		## for "module.param[=val]" we creating
+		## /etc/modprobe.d/module.param.conf: "options module param[=val]"
+		## /etc/cmdline/module.param:"param[=val]"
+		## first for CONFIG_MODPROBE_SMALL=n, next for script modprobe
+		*=*)
+			case "${x%%=*}" in
+			*.*)
+				y="${x%%[=/]*}"
+				echo "options ${x%%.*} ${x#*.}" >"/etc/modprobe.d/$y.conf"
+				echo "${x#*.}" >"/etc/cmdline/$y"
+			;;
+			esac
+		;;
+		*.*)
+			echo "options ${x%%.*} ${x#*.}" >"/etc/modprobe.d/${x%%/*}.conf"
+			echo "${x#*.}" >"/etc/cmdline/${x%%/*}"
+		;;
 	esac
 done
 

diff --git a/defaults/modprobe b/defaults/modprobe
index ba2d890..1f606bd 100755
--- a/defaults/modprobe
+++ b/defaults/modprobe
@@ -110,7 +110,10 @@ modprobe2() {
 			filler=1
 		fi
 	done
-	${INSMOD} ${real_path} > /dev/null 2>&1
+	# placing options into x
+	x="${real_path##*/}"
+	x="`cat "/etc/cmdline/${x%.ko*}".* 2>/dev/null`"
+	${INSMOD} ${real_path} ${x} > /dev/null 2>&1
 	ret=$?
 	if [ ${ret} -eq 0 ]
 	then

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

[Richard Yao]

commit:     2c9442f486a137057628ae147d8092edba8ff709
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Thu Jul 19 20:39:02 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 20:39:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2c9442f4

fixme

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6e9e9d8..3ce0a4b 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -244,7 +244,7 @@ do
 		*=*)
 			case "${x%%=*}" in
 			*.*)
-				echo "options ${x%%.*} ${x#*.}" >> "/etc/module_options/${x%%[=/]*}.conf"
+				echo "${x%%.*} ${x#*.}" >> "/etc/module_options/${x%%[=/]*}.conf"
 			;;
 			esac
 		;;

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

[Richard Yao]

commit:     f68ad83c7f385f17c9bc6325037bca649a89c107
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Fri Jul 20 00:34:07 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 00:37:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f68ad83c

Run mdev -s after modules are loaded

Running `mdev -s` will ensure that device nodes are properly initialized.
It does not function as a netlink hotplug daemon. We must run it after
the modules are loaded to ensure that so that /dev/zfs has been created
before userland programs attempt to use it.

---
 defaults/linuxrc |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 90099c8..f434339 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -293,7 +293,7 @@ mount_devfs
 # Mount sysfs
 mount_sysfs
 
-# Start mdev
+# Initialize mdev
 if [ "${KV_2_6_OR_GREATER}" ]
 then
 	good_msg 'Activating mdev'
@@ -303,9 +303,6 @@ then
 
 	# Setup hotplugging for firmware loading
 	echo /sbin/mdev > /proc/sys/kernel/hotplug
-
-	# Setup mdev netlink socket daemon
-	( cd /sys && mdev -s ) || bad_msg "Failed to receive dynamic updates from mdev"
 fi
 
 # Load modules listed in MY_HWOPTS if /lib/modules exists for the running kernel
@@ -329,6 +326,12 @@ else
 	good_msg 'Skipping module load; no modules in the ramdisk!'
 fi
 
+# Ensure that device nodes are properly configured
+if [ "${KV_2_6_OR_GREATER}" ]
+then
+	mdev -s || bad_msg "mdev -s failed"
+fi
+
 # Apply scan delay if specified
 sdelay
 

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

[Richard Yao]

commit:     3ef477862d08c20628273c3c855bb78d6e417b25
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Fri Jul 20 00:34:07 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 02:59:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3ef47786

Run mdev -s after modules are loaded

Running `mdev -s` will ensure that device nodes are properly initialized.
It does not function as a netlink hotplug daemon. We must run it after
the modules are loaded to ensure that /dev/zfs has been created before
userland programs attempt to use it.

---
 defaults/linuxrc |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 90099c8..f434339 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -293,7 +293,7 @@ mount_devfs
 # Mount sysfs
 mount_sysfs
 
-# Start mdev
+# Initialize mdev
 if [ "${KV_2_6_OR_GREATER}" ]
 then
 	good_msg 'Activating mdev'
@@ -303,9 +303,6 @@ then
 
 	# Setup hotplugging for firmware loading
 	echo /sbin/mdev > /proc/sys/kernel/hotplug
-
-	# Setup mdev netlink socket daemon
-	( cd /sys && mdev -s ) || bad_msg "Failed to receive dynamic updates from mdev"
 fi
 
 # Load modules listed in MY_HWOPTS if /lib/modules exists for the running kernel
@@ -329,6 +326,12 @@ else
 	good_msg 'Skipping module load; no modules in the ramdisk!'
 fi
 
+# Ensure that device nodes are properly configured
+if [ "${KV_2_6_OR_GREATER}" ]
+then
+	mdev -s || bad_msg "mdev -s failed"
+fi
+
 # Apply scan delay if specified
 sdelay
 

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

[Richard Yao]

commit:     e05ab0d1a1e739e152ec6ef77a6335891f34fe2b
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Jul 21 17:41:38 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 17:41:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e05ab0d1

Force ZFS to explicitly import pool when LUKS is present

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 46364de..4f0ce1b 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -674,7 +674,14 @@ startVolumes() {
 
 			if [ "$(zpool list -H -o name ${ZFS_POOL} 2>&1)" = "$ZFS_POOL" ]
 			then
-				good_msg "ZFS pool ${ZFS_POOL} already imported"
+				good_msg "ZFS pool ${ZFS_POOL} already imported."
+
+				if [ -n "${CRYPT_ROOT}" -o -n "${CRYPT_SWAP}" ]
+				then
+					good_msg "LUKS detected. Reimporting ${ZFS_POOL}"
+					/sbin/zpool export -f "${ZFS_POOL}"
+					/sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}"
+				fi
 			else
 				good_msg "Importing ZFS pool ${ZFS_POOL}"
 

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

[Sebastian Pipping]

commit:     ed09edb1c061fd222c1b0e1e92a44ebe55bbc921
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Jul 27 22:42:55 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 22:42:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ed09edb1

Resolve cryptic awk-based code docuplication

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index ac32c8a..082d44d 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -298,6 +298,11 @@ run_shell() {
 	/bin/ash
 }
 
+fs_type_in_use() {
+	fs_type=$1
+	cut -d ' ' -f 3 < /proc/mounts | fgrep -q "${fs_type}"
+}
+
 mount_devfs () {
 	# Use devtmpfs if enabled in kernel,
 	# else tmpfs. Always run mdev just in case
@@ -307,13 +312,13 @@ mount_devfs () {
 	fi
 
 	# Options copied from /etc/init.d/udev-mount, should probably be kept in sync
-	if awk 'BEGIN{m=0;} /devtmpfs/{if($3 == "devtmpfs") {m=1;} } END { exit m;}' /proc/mounts; then
+	if ! fs_type_in_use devtmpfs; then
 		mount -t $devfs -o "exec,nosuid,mode=0755,size=10M" udev /dev \
 			|| bad_msg "Failed to mount /dev as ${devfs}"
 	fi
 
 	# http://git.busybox.net/busybox/plain/docs/mdev.txt
-	if awk 'BEGIN{m=0;} /devpts/{if($3 == "devpts") {m=1;} } END { exit m;}' /proc/mounts; then
+	if ! fs_type_in_use devpts; then
 		mkdir -m 0755 /dev/pts
 		mount -t devpts -o gid=5,mode=0620 devpts /dev/pts  || bad_msg "Failed to mount /dev/pts"
 	fi

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

[Sebastian Pipping]

commit:     c5c9ca49f60126e2ae9892fe5eaaca8457665cea
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 23:14:42 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 23:18:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c5c9ca49

Further improve wording in software.sh

---
 defaults/software.sh |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index fa7d136..fe2962e 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -1,11 +1,13 @@
 # NOTE:
-# - This file (software.sh) is sourced by genkernel .
+# - This file (software.sh) is sourced by genkernel.
 #   Rather than changing this very file, please override specific versions/variables
 #   somewhere in /etc/genkernel.conf .
 #
-# - The VERSION_* variables below in here are/were filled with actual version strings
-#   by the genkernel ebuild.
-# - This file should not override already existing vars, as they are probably from genkernel.conf
+# - Any VERSION_* magic strings below will be filled (or already have been)
+#   with actual version strings by the genkernel ebuild.
+#
+# - This file should not override previously defined variables, as their values may
+#   originate from user changes to /etc/genkernel.conf .
 
 BUSYBOX_VER="${BUSYBOX_VER:-VERSION_BUSYBOX}"
 BUSYBOX_SRCTAR="${BUSYBOX_SRCTAR:-${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2}"

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

[Peter Hjalmarsson]

commit:     e779547b728506a933809e4b03c4ed6b329f8e08
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Wed Aug 22 17:12:08 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
CommitDate: Tue Aug 28 12:09:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e779547b

Make root_trim work with crypt_root_key

Keep options already set for cryptsetup when using crypt_root_key*

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 082d44d..03e61e0 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -904,10 +904,10 @@ openLUKS() {
 					if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then
 						[ -e /dev/tty ] && mv /dev/tty /dev/tty.org
 						mknod /dev/tty c 5 1
-						cryptsetup_options="-d -"
+						cryptsetup_options="${cryptsetup_options} -d -"
 						gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
 					else
-						cryptsetup_options="-d ${mntkey}${LUKS_KEY}"
+						cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}"
 					fi
 				fi
 				# At this point, keyfile or not, we're ready!

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

[Robin H. Johnson]

commit:     097e88ff46af4b8d5723ffad30e3e5c0c4d6a61a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 18:05:42 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 18:05:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=097e88ff

Attempt to fix bug #421839: missing /run on LiveCD environment.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index d6766b8..011505c 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -409,7 +409,7 @@ then
 	good_msg "Making tmpfs for ${NEW_ROOT}"
 	mount -n -t tmpfs tmpfs "${NEW_ROOT}"
 
-	for i in dev mnt mnt/livecd mnt/key tmp tmp/.initrd mnt/gentoo sys
+	for i in dev mnt proc run sys tmp mnt/livecd mnt/key tmp/.initrd mnt/gentoo
 	do
 		mkdir -p "${NEW_ROOT}/${i}"
 		chmod 755 "${NEW_ROOT}/${i}"

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

[Robin H. Johnson]

commit:     3fa1bf680d90f5841d8830634ed13bbfd76271b7
Author:     Marek Sapota <marek <AT> sapota <DOT> org>
AuthorDate: Fri Nov  2 17:04:18 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 17:06:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3fa1bf68

Bug #378105: UUID/LABEL support for LUKS keydevs

LUKS keydevs now support mount by UUID/LABEL.

X-Gentoo-Bug: 378105
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=378105
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 53e1f97..7cb41b3 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -282,6 +282,36 @@ findnfsmount() {
 	fi
 }
 
+find_real_device() {
+	local DEVICE="${1}"
+	case "${DEVICE}" in
+		UUID\=*|LABEL\=*)
+			local REAL_DEVICE=""
+			local retval=1
+
+			if [ "${retval}" -ne 0 ]; then
+				REAL_DEVICE=`findfs "${DEVICE}" 2>/dev/null`
+				retval=$?
+			fi
+
+			if [ "$retval" -ne 0 ]; then
+				REAL_DEVICE=`busybox findfs "${DEVICE}" 2>/dev/null`
+				retval=$?
+			fi
+
+			if [ "${retval}" -ne 0 ]; then
+				REAL_DEVICE=`blkid -o device -l -t "${DEVICE}"`
+				retval=$?
+			fi
+
+			if [ "${retval}" -eq 0 ] && [ -n "${REAL_DEVICE}" ]; then
+				DEVICE="${REAL_DEVICE}"
+			fi
+		;;
+	esac
+	echo -n "${DEVICE}"
+}
+
 check_loop() {
 	if [ "${LOOP}" = '' -o ! -e "${CDROOT_PATH}/${LOOP}" ]
 	then
@@ -811,32 +841,7 @@ openLUKS() {
 			prompt_user "LUKS_KEYDEV" "${LUKS_NAME} key device"
 			KEYDEV_ERROR=0
 		else
-			case "${LUKS_DEVICE}" in
-				UUID\=*|LABEL\=*)
-					local REAL_LUKS=""
-					local retval=1
-
-					if [ "${retval}" -ne 0 ]; then
-						REAL_LUKS=`findfs "${LUKS_DEVICE}" 2>/dev/null`
-						retval=$?
-					fi
-
-					if [ "$retval" -ne 0 ]; then
-						REAL_LUKS=`busybox findfs "${LUKS_DEVICE}" 2>/dev/null`
-						retval=$?
-					fi
-
-					if [ "${retval}" -ne 0 ]; then
-						REAL_LUKS=`blkid -o device -l -t "${LUKS_DEVICE}"`
-						retval=$?
-					fi
-
-					if [ "${retval}" -eq 0 ] && [ -n "${REAL_LUKS}" ]; then
-						good_msg "Detected device ${REAL_LUKS}"
-						LUKS_DEVICE="${REAL_LUKS}"
-					fi
-				;;
-			esac
+			LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}")
 
 			setup_md_device ${LUKS_DEVICE}
 			cryptsetup isLuks ${LUKS_DEVICE}
@@ -855,10 +860,12 @@ openLUKS() {
 
 				if [ -n "${LUKS_KEY}" ] 
 				then
+					local REAL_LUKS_KEYDEV="${LUKS_KEYDEV}"
 					if [ ! -e "${mntkey}${LUKS_KEY}" ] 
 					then
-						if [ -b "${LUKS_KEYDEV}" ]
-						then good_msg "Using key device ${LUKS_KEYDEV}." ${CRYPT_SILENT}
+						REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
+						if [ -b "${REAL_LUKS_KEYDEV}" ]
+						then good_msg "Using key device ${REAL_LUKS_KEYDEV}." ${CRYPT_SILENT}
 						else
 							good_msg "Please insert removable device ${LUKS_KEYDEV} for ${LUKS_NAME}" ${CRYPT_SILENT}
 							# abort after 10 secs
@@ -867,18 +874,20 @@ openLUKS() {
 							do 
 								count=$((count-1))
 								sleep 1
-								if [ -b "${LUKS_KEYDEV}" ]
+								REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
+								if [ -b "${REAL_LUKS_KEYDEV}" ]
 								then
-									good_msg "Removable device ${LUKS_KEYDEV} detected." ${CRYPT_SILENT}
+									good_msg "Removable device ${REAL_LUKS_KEYDEV} detected." ${CRYPT_SILENT}
 									break
 								fi
 							done
-							if [ ! -b "${LUKS_KEYDEV}" ]
+							if [ ! -b "${REAL_LUKS_KEYDEV}" ]
 							then
 								eval CRYPT_${TYPE}_KEY=${LUKS_KEY}
 								bootstrapKey ${TYPE}
 								eval LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
-								if [ ! -b "${LUKS_KEYDEV}" ]; then
+								REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
+								if [ ! -b "${REAL_LUKS_KEYDEV}" ]; then
 									KEYDEV_ERROR=1
 									bad_msg "Removable device ${LUKS_KEYDEV} not found." ${CRYPT_SILENT}
 									continue
@@ -890,27 +899,27 @@ openLUKS() {
 						# At this point a device was recognized, now let's see if the key is there
 						[ ! -d "$mntkey" ] && mkdir -p ${mntkey} 2>/dev/null >/dev/null
 
-						mount -n -o ro ${LUKS_KEYDEV} ${mntkey} >/dev/null 2>/dev/null
+						mount -n -o ro ${REAL_LUKS_KEYDEV} ${mntkey} >/dev/null 2>/dev/null
 						if [ "$?" != '0' ]
 						then
 							KEYDEV_ERROR=1
-							bad_msg "Mounting of device ${LUKS_KEYDEV} failed." ${CRYPT_SILENT}
+							bad_msg "Mounting of device ${REAL_LUKS_KEYDEV} failed." ${CRYPT_SILENT}
 							continue
 						else
-							good_msg "Removable device ${LUKS_KEYDEV} mounted." ${CRYPT_SILENT}
+							good_msg "Removable device ${REAL_LUKS_KEYDEV} mounted." ${CRYPT_SILENT}
 							sleep 2
 							# keyfile exists?
 							if [ ! -e "${mntkey}${LUKS_KEY}" ]; then
 								umount -n ${mntkey} 2>/dev/null >/dev/null
 								KEY_ERROR=1
 								KEYDEV_ERROR=1
-								bad_msg "Key {LUKS_KEY} on device ${LUKS_KEYDEV} not found." ${CRYPT_SILENT}
+								bad_msg "Key {LUKS_KEY} on device ${REAL_LUKS_KEYDEV} not found." ${CRYPT_SILENT}
 								continue
 							fi
 						fi
 					fi
 					# At this point a candidate key exists (either mounted before or not)
-					good_msg "${LUKS_KEY} on device ${LUKS_KEYDEV} found" ${CRYPT_SILENT}
+					good_msg "${LUKS_KEY} on device ${REAL_LUKS_KEYDEV} found" ${CRYPT_SILENT}
 					if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then
 						[ -e /dev/tty ] && mv /dev/tty /dev/tty.org
 						mknod /dev/tty c 5 1

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

[Richard Yao]

commit:     30c7284c92cacf47250541172dddb10abd70a7a0
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Sun Nov 11 09:13:03 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 17:01:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=30c7284c

Unquote ${ZPOOL_FORCE} variable usage.

The default value of ${ZPOOL_USAGE} is unset, quoting it would result into
a "" argument passed to zpool. The workaround to this is to use "dozfs=force"
boot argument.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 7cb41b3..2e8e744 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -707,7 +707,7 @@ startVolumes() {
 		then
 			good_msg "Importing ZFS pools"
 
-			/sbin/zpool import -N -a "${ZPOOL_FORCE}"
+			/sbin/zpool import -N -a ${ZPOOL_FORCE}
 
 			if [ "$?" = '0' ]
 			then
@@ -725,12 +725,12 @@ startVolumes() {
 				then
 					good_msg "LUKS detected. Reimporting ${ZFS_POOL}"
 					/sbin/zpool export -f "${ZFS_POOL}"
-					/sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}"
+					/sbin/zpool import -N ${ZPOOL_FORCE} "${ZFS_POOL}"
 				fi
 			else
 				good_msg "Importing ZFS pool ${ZFS_POOL}"
 
-				/sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}"
+				/sbin/zpool import -N ${ZPOOL_FORCE} "${ZFS_POOL}"
 
 				if [ "$?" = '0' ]
 				then

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

[Richard Yao]

commit:     543181ebefddbd83850d667aa422991fbe8c3735
Author:     Toralf Förster <toralf.foerster <AT> gmx <DOT> de>
AuthorDate: Thu Nov 22 22:13:17 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Nov 22 22:17:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=543181eb

Fix non-functional init_opts parameter, bug #422471

If INIT_OPTS='' is not specified before the argument loop, scoping rules
will prevent it from being seen by the switch_root invocation.

Signed-off-by: Toralf Förster <toralf.foerster <AT> gmx.de>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4166396..f1e20ce 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -38,6 +38,7 @@ CMDLINE=$(cat /proc/cmdline)
 FAKE_ROOT=''
 FAKE_INIT=''
 REAL_ROOTFLAGS=''
+INIT_OPTS=''
 ROOTFSTYPE='auto'
 CRYPT_SILENT=0
 

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

[Fabio Erculiani]

commit:     421b210c67a59b5a92ce5a92c6d49254cf1ec07a
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Apr 23 15:26:24 2013 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 07:20:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=421b210c

Drop KV_2_6_OR_GREATER

Linux 2.2 and 2.4 are no longer supported. RIP old kernels.

---
 defaults/initrd.defaults |    5 -----
 defaults/linuxrc         |   18 ++++++------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 8ff5510..e70beab 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -50,11 +50,6 @@ KMINOR=`echo $KV | cut -f2 -d.`
 KVER="${KMAJOR}.${KMINOR}"
 MISCOPTS='debug detect'
 
-if [ "${KMAJOR}" -ge 3 ] || [ "${KMAJOR}" -eq 2 -a "${KMINOR}" -eq '6' ]
-then
-	KV_2_6_OR_GREATER="yes"
-fi
-
 QUIET='1'
 ROOT_LINKS='bin sbin lib lib32 lib64 boot usr opt emul'
 ROOT_TREES='etc root home var'

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 703652d..0fe05ef 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -324,16 +324,13 @@ mount_devfs
 mount_sysfs
 
 # Initialize mdev
-if [ "${KV_2_6_OR_GREATER}" ]
-then
-	good_msg 'Activating mdev'
+good_msg 'Activating mdev'
 
-	# Serialize hotplug events
-	touch /dev/mdev.seq
+# Serialize hotplug events
+touch /dev/mdev.seq
 
-	# Setup hotplugging for firmware loading
-	echo /sbin/mdev > /proc/sys/kernel/hotplug
-fi
+# Setup hotplugging for firmware loading
+echo /sbin/mdev > /proc/sys/kernel/hotplug
 
 # Load modules listed in MY_HWOPTS if /lib/modules exists for the running kernel
 if [ -z "${DO_modules}" ]
@@ -357,10 +354,7 @@ else
 fi
 
 # Ensure that device nodes are properly configured
-if [ "${KV_2_6_OR_GREATER}" ]
-then
-	mdev -s || bad_msg "mdev -s failed"
-fi
+mdev -s || bad_msg "mdev -s failed"
 
 # Apply scan delay if specified
 sdelay

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

[Fabio Erculiani]

commit:     a408d4a5135fed4507333925713736368a2bf279
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Apr 23 15:41:22 2013 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 07:20:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a408d4a5

Drop useless parens in conditionals

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 7ec5c94..e614064 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -420,7 +420,7 @@ prompt_user(){
 
 	eval local oldvalue='$'${1}
 
-	[ \( $# != 2 \) -a \( $# != 3 \) ] && \
+	[ $# != 2 -a $# != 3 ] && \
 		bad_msg "Bad invocation of function prompt_user, please file a bug \
 		report with this message" && exit 1
 	[ -n "${3}" ] && local explnt=" or : ${3}" || local explnt="."

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 0fe05ef..805515b 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -270,13 +270,13 @@ do
 	esac
 done
 
-if [ \( "${CDROOT}" = '0' \) ]
+if [ "${CDROOT}" = '0' ]
 then
-	if [ -z "${REAL_ROOT}" -a \( "${FAKE_ROOT}" != "/dev/ram0" \) ]
+	if [ -z "${REAL_ROOT}" -a "${FAKE_ROOT}" != "/dev/ram0" ]
 	then
 		REAL_ROOT="${FAKE_ROOT}"
 	fi
-	if [ -z "${REAL_INIT}" -a \( "${FAKE_INIT}" != "/linuxrc" \) ]
+	if [ -z "${REAL_INIT}" -a "${FAKE_INIT}" != "/linuxrc" ]
 	then
 		REAL_INIT="${FAKE_INIT}"
 	fi

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

[Fabio Erculiani]

commit:     499f2d98b60588987b8e0a9e3a59a182c83d5785
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Apr 23 16:31:51 2013 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 07:21:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=499f2d98

Improve speed of bootstrapCD by not calling devicelist unless needed

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a216b84..ff724b5 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -157,12 +157,15 @@ devicelist(){
 }
 
 bootstrapCD() {
-	local DEVICES=`devicelist`
-	# The device was specified on the command line, so there's no need to scan
-	# a bunch of extra devices
+	local DEVICES=
+
+	# The device was specified on the command line, so there's no need
+	# to scan a bunch of extra devices
 	[ -n "${CDROOT_DEV}" ] && DEVICES="${CDROOT_DEV}"
+	[ -z "${CDROOT_DEV}" ] && DEVICES=$(devicelist)
 
-	findmediamount "cdrom" "${SUBDIR}/${CDROOT_MARKER}" "REAL_ROOT" "${CDROOT_PATH}" ${DEVICES}
+	findmediamount "cdrom" "${SUBDIR}/${CDROOT_MARKER}" \
+		"REAL_ROOT" "${CDROOT_PATH}" ${DEVICES}
 }
 
 bootstrapKey() {

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

[Fabio Erculiani]

commit:     682d0b0d0aaf30e4236809bcf87fc674e6e88c8c
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Apr 23 15:54:10 2013 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 07:20:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=682d0b0d

Drop "sleep 3" from sdelay if CDROOT=1. One can use scandelay=secs if needed.

While this makes out of the box booting a bit harder on some ancient CD/DVD
drives, it really speeds up the common use case by not sleeping for 3 seconds.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index e614064..abd8fad 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -991,19 +991,13 @@ startLUKS() {
 
 sdelay() {
 	# Sleep a specific number of seconds if SDELAY is set
-	if [ "${SDELAY}" ]
+	if [ -n "${SDELAY}" ]
 	then
 		good_msg "Waiting ${SDELAY} seconds..."
 		sleep ${SDELAY}
 	elif [ "${CDROOT}" = '1' ]
 	then
-		# many CD/DVD drives require extra sleep, especially when
-		# connected via USB. Many people reported that 1 second sleep
-		# is not enough on their notebooks, that's why sleep 3, when booting
-		# off a livecd is a better default.
-		sleep 3
-	else
-		good_msg 'Hint: Use parameter scandelay[=seconds] if you need waiting here'
+		good_msg 'Hint: Use scandelay[=seconds] if your live medium is slowand boot fails'
 	fi
 }
 

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

[Fabio Erculiani]

commit:     108f1daf60acfb48e94cf025252ce9d8cb71191a
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Thu Apr 25 15:55:56 2013 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 09:54:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=108f1daf

linuxrc: run the debug shell multiple times, add a hook before switch_root

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c1969d1..9b0e899 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1055,6 +1055,7 @@ rundebugshell() {
 	if [ -n "$DEBUG" ]
 	then
 		good_msg 'Starting debug shell as requested by "debug" option.'
+		good_msg "Stopping by: ${1}"
 		do_rundebugshell
 	fi
 }

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 1d26aaf..4bbe5e2 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -424,7 +424,7 @@ mkdir -p "${NEW_ROOT}"
 CHROOT="${NEW_ROOT}"
 
 # Run debug shell if requested
-rundebugshell
+rundebugshell "before setting up the root filesystem"
 
 if [ "${CDROOT}" = '1' ]
 then
@@ -937,6 +937,9 @@ then
 	bad_msg "ERROR: your real /dev is missing tty1, required for splash"
 fi
 
+# Run debug shell if requested
+rundebugshell "before entering switch_root"
+
 exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}"
 
 # If we get here, something bad has happened

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

[Richard Yao]

commit:     1c19d8a9c6baee1e418275d3106726472992718b
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  1 16:47:45 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 23:49:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1c19d8a9

Add sysctl to busybox

sysctl is necessary to modify chroot restrictions when performing
recovery operations on Gentoo Hardened systems.

Reported-by: Matthew Thode <prometheanfire <AT> gentoo.org>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/busy-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 2b9a4c4..f086b14 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -907,7 +907,7 @@ CONFIG_PS=y
 # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 # CONFIG_RENICE is not set
-# CONFIG_BB_SYSCTL is not set
+CONFIG_BB_SYSCTL=y
 # CONFIG_TOP is not set
 # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
 # CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set

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

[Richard Yao]

commit:     c2da0c02efadf7d3b70f71ed2acb53ad4e735a75
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 11:36:43 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:47:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c2da0c02

Refactor ZFS module load hook

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/linuxrc | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 9ea305b..3784456 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -298,16 +298,17 @@ esac
 # Verify that it is safe to use ZFS
 if [ "USE_ZFS" = "1" ]
 then
-	if [ -x /sbin/zfs -a -x /sbin/zpool ]
-	then
-		MY_HWOPTS="${MY_HWOPTS} zfs"
-	else
-		USE_ZFS=0
+	for i in /sbin/zfs /sbin/zpool
+	do
+		if [ ! -x ${i} ]
+		then
+			USE_ZFS=0
+			bad_msg 'Aborting use of zfs because ${i} not found!'
+			break
+		fi
+	done
 
-		[ -x /sbin/zfs ] || bad_msg '/sbin/zfs not found!'
-		[ -x /sbin/zpool ] || bad_msg '/sbin/zpool not found!'
-		bad_msg 'Aborting use of zfs!'
-	fi
+	[ "USE_ZFS" = "1" ] && MY_HWOPTS="${MY_HWOPTS} zfs"
 fi
 
 splash 'init'

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

[Richard Yao]

commit:     a21728ae287e988a1848435ab27f7ab503def784
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 09:40:07 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:47:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a21728ae

Add call_func_timeout helper function

call_func_timeout permits us to call a helper function and kill it
should it exceed some timeout. This is derived from example code posted
on Stack Overflow:

http://stackoverflow.com/a/11056286

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/initrd.scripts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 9b0e899..bfdde75 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2,6 +2,22 @@
 
 . /etc/initrd.defaults
 
+call_func_timeout()
+{
+	local func=$1 timeout=$2 pid watcher
+	[ $# -ne 2 ] && gen_die "call_func_timeout() called with $# arguments"
+
+	( ${func} ) & pid=$!
+	( sleep ${timeout} && kill -HUP ${pid} ) 2>/dev/null & watcher=$!
+	if wait ${pid} 2>/dev/null; then
+	    kill -HUP $watcher 2> /dev/null
+	    wait $watcher 2>/dev/null
+	    return 1
+	fi
+
+	return 0
+}
+
 modules_load() {
 	for module in $*
 	do

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

[Richard Yao]

commit:     c812c35100771bb527f6b03853fa6d8ef66a48fe
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 09:31:33 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:47:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c812c351

Import pool after ZFS module finishes loading

There is a race between ZFS module initialization and our attempt to
import pools. We address this by doing a busy wait for the /dev/zfs
device to appear. We wait a maximum of 5 seconds for the device to
appear.

We also slightly alter output messages to be more readable.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/initrd.scripts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index bfdde75..35e5957 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -636,6 +636,12 @@ chooseKeymap() {
 	fi
 }
 
+# This helper function is to be called using call_func_timeout.
+# It enables us to wait a reasonable amount of time until /dev/zfs appears.
+waitForZFS() {
+	while [ ! -c /dev/zfs ]; do echo >/dev/null; done;
+}
+
 startVolumes() {
 	#good_msg 'Checking if volumes need to be started...'
 
@@ -714,7 +720,12 @@ startVolumes() {
 	
 	if [ "${USE_ZFS}" = '1' ]
 	then
-		if [ -z "${ZFS_POOL}" ]
+
+		# Avoid race involving asynchronous module loading
+		if call_func_timeout waitForZFS 5
+		then
+			bad_msg "Cannot import ZFS pool because /dev/zfs is missing"
+		elif [ -z "${ZFS_POOL}" ]
 		then
 			good_msg "Importing ZFS pools"
 
@@ -745,9 +756,9 @@ startVolumes() {
 
 				if [ "$?" = '0' ]
 				then
-					good_msg "Importing ${ZFS_POOL} succeeded"
+					good_msg "Import of ${ZFS_POOL} succeeded"
 				else
-					bad_msg "Importing ${ZFS_POOL} failed"
+					bad_msg "Import of ${ZFS_POOL} failed"
 				fi
 			fi
 		fi

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

[Richard Yao]

commit:     c6cd9c59f8cfb7993f79754cf4dbc1f21040c0f7
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 13:13:58 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:47:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c6cd9c59

Workaround busybox modprobe's inability to load ZFS modules

Commit 3a054014e880e5b1ff28e3d87767c45a073da6b5 replaced our modprobe
with busybox's modprobe. Unfortunately, busybox's modprobe appears to be
unable to properly load modules with more than 1 level of dependencies.

The zfs and zpool commands will invoke modprobe if /dev/zvol is missing,
which concealed this problem. However, this caused problems because some
invocations would fail and under certain circumstances, init would be
killed, causing a kernel panic. This issue was made clear by commit
71d35173727dc968d7baa2107accb99ebbc5b188, which ensured that the zpool
and zfs commands were not run until the ZFS module was loaded.

busybox modprobe's failure to load module dependencies correctly appears
to occur because busybox modprobe does not wait until until a module is
loaded before loading a module that depends on it, which is a race. It
would be best to correct this race by waiting until the module has
properly loaded, but it is not clear that the race is the only thing
going wrong and developer time is a premium.

We implement a workaround by modifying the busy loop added in the
previous commit to explicit call `modprobe zfs` on each iteration. While
the first few calls fail due to bugs in busybox modprobe, it will
eventually work, after which each call is a noop. This lets us keep
looping until either the loop exit condition that /dev/zvol exist is
reached or the 5 second timeout is reached.

Once the busybox modprobe issue is fixed, this workaround should be safe
to revert.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 35e5957..cb0fcb8 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -637,9 +637,10 @@ chooseKeymap() {
 }
 
 # This helper function is to be called using call_func_timeout.
-# It enables us to wait a reasonable amount of time until /dev/zfs appears.
+# This works around the inability of busybox modprobe to handle complex module dependencies.
+# This also enables us to wait a reasonable amount of time until /dev/zfs appears.
 waitForZFS() {
-	while [ ! -c /dev/zfs ]; do echo >/dev/null; done;
+	while [ ! -c /dev/zfs ]; do modprobe zfs 2> /dev/null; done;
 }
 
 startVolumes() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 3784456..d6d0eaa 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -307,8 +307,6 @@ then
 			break
 		fi
 	done
-
-	[ "USE_ZFS" = "1" ] && MY_HWOPTS="${MY_HWOPTS} zfs"
 fi
 
 splash 'init'

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

[Richard Yao]

commit:     df0772ec10667350ffb67f8db85392d0b319d0ed
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Sun Jun  9 13:28:23 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:47:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=df0772ec

Make busybox's module loading more fully featured, bug #472312

Commit 3a054014e880e5b1ff28e3d87767c45a073da6b5 replaced our modprobe
with busybox's modprobe. Unfortunately, this caused a regression where
busybox's modprobe fails to properly load certain modules. This can be
addressed by abandoning CONFIG_MODPROBE_SMALL=y. We also set a few other
features to make module loading more fully featured.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/busy-config | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index f086b14..513ff0b 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -487,16 +487,16 @@ CONFIG_CHPASSWD=y
 # Linux Module Utilities
 #
 CONFIG_MODINFO=y
-CONFIG_MODPROBE_SMALL=y
-CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y
-CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
-# CONFIG_INSMOD is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
 # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
+CONFIG_MODPROBE=y
 # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
+CONFIG_DEPMOD=y
 
 #
 # Options common to multiple modutils

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

[Richard Yao]

commit:     86a2331e986670b8efacefeef9d21c25ff7b7258
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Sun Jun  9 13:32:25 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:47:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=86a2331e

Add more module loading features

These additional features were suggested by Fabio in bug #472312.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/busy-config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 513ff0b..da260a8 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -495,7 +495,7 @@ CONFIG_RMMOD=y
 CONFIG_LSMOD=y
 # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
 CONFIG_MODPROBE=y
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
 CONFIG_DEPMOD=y
 
 #
@@ -508,9 +508,9 @@ CONFIG_DEPMOD=y
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
 CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 

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

[Richard Yao]

commit:     987bb3098e81c43e8aaf2a02830508acb801ac0c
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Sun Jun  9 13:28:23 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:56:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=987bb309

Make busybox's module loading more fully featured, bug #472312

Commit 3a054014e880e5b1ff28e3d87767c45a073da6b5 replaced our modprobe
with busybox's modprobe. Unfortunately, this caused a regression where
busybox's modprobe fails to properly load certain modules. This can be
addressed by abandoning CONFIG_MODPROBE_SMALL=y. We also set a few other
features to make module loading more fully featured.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/busy-config | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index f086b14..513ff0b 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -487,16 +487,16 @@ CONFIG_CHPASSWD=y
 # Linux Module Utilities
 #
 CONFIG_MODINFO=y
-CONFIG_MODPROBE_SMALL=y
-CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y
-CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
-# CONFIG_INSMOD is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
 # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
+CONFIG_MODPROBE=y
 # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
+CONFIG_DEPMOD=y
 
 #
 # Options common to multiple modutils

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

[Richard Yao]

commit:     2fa0a9beaa069a61f907f0b06c9bd6abeddb1ca7
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 13:13:58 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:56:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2fa0a9be

Workaround busybox modprobe's inability to load ZFS modules

Commit 3a054014e880e5b1ff28e3d87767c45a073da6b5 replaced our modprobe
with busybox's modprobe. Unfortunately, busybox's modprobe appears to be
unable to properly load modules with more than 1 level of dependencies.

The zfs and zpool commands will invoke modprobe if /dev/zvol is missing,
which concealed this problem. However, this caused problems because some
invocations would fail and under certain circumstances, init would be
killed, causing a kernel panic. This issue was made clear by commit
c812c35100771bb527f6b03853fa6d8ef66a48fe, which ensured that the zpool
and zfs commands were not run until the ZFS module was loaded.

busybox modprobe's failure to load module dependencies correctly appears
to occur because busybox modprobe does not wait until until a module is
loaded before loading a module that depends on it, which is a race. It
would be best to correct this race by waiting until the module has
properly loaded, but it is not clear that the race is the only thing
going wrong and developer time is a premium.

We implement a workaround by modifying the busy loop added in the
previous commit to explicit call `modprobe zfs` on each iteration. While
the first few calls fail due to bugs in busybox modprobe, it will
eventually work, after which each call is a noop. This lets us keep
looping until either the loop exit condition that /dev/zvol exist is
reached or the 5 second timeout is reached.

Once the busybox modprobe issue is fixed, this workaround should be safe
to revert.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 35e5957..cb0fcb8 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -637,9 +637,10 @@ chooseKeymap() {
 }
 
 # This helper function is to be called using call_func_timeout.
-# It enables us to wait a reasonable amount of time until /dev/zfs appears.
+# This works around the inability of busybox modprobe to handle complex module dependencies.
+# This also enables us to wait a reasonable amount of time until /dev/zfs appears.
 waitForZFS() {
-	while [ ! -c /dev/zfs ]; do echo >/dev/null; done;
+	while [ ! -c /dev/zfs ]; do modprobe zfs 2> /dev/null; done;
 }
 
 startVolumes() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 3784456..d6d0eaa 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -307,8 +307,6 @@ then
 			break
 		fi
 	done
-
-	[ "USE_ZFS" = "1" ] && MY_HWOPTS="${MY_HWOPTS} zfs"
 fi
 
 splash 'init'

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

[Richard Yao]

commit:     62bd9ecc16d0875257c22c7b8f68b73452e9cb80
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Sun Jun  9 13:32:25 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:56:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=62bd9ecc

Add more module loading features

These additional features were suggested by Fabio in bug #472312.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/busy-config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 513ff0b..da260a8 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -495,7 +495,7 @@ CONFIG_RMMOD=y
 CONFIG_LSMOD=y
 # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
 CONFIG_MODPROBE=y
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
 CONFIG_DEPMOD=y
 
 #
@@ -508,9 +508,9 @@ CONFIG_DEPMOD=y
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
 CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 

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

[Richard Yao]

commit:     f7104e16a98874f1863a55f9a78c712d94a195c0
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 21:29:30 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 04:29:44 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f7104e16

Suppress superfluous console kernel output

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/linuxrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index d6d0eaa..6f950eb 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -23,6 +23,9 @@ fi
 mount -t proc -o noexec,nosuid,nodev proc /proc >/dev/null 2>&1
 mount -o remount,rw / >/dev/null 2>&1
 
+# Prevent superfluous printks from being printed to the console
+echo 1 > /proc/sys/kernel/printk
+
 # Set up symlinks
 /bin/busybox --install -s
 

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

[Richard Yao]

commit:     32585f117ffbf6d6a0aa317e6876ae7711a7f307
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 15:18:54 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 04:28:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=32585f11

Add exit 1 to waitForZFS

Proper use of call_func_timeout() requires that we return an exit status
of 1 upon success.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/initrd.scripts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index cb0fcb8..4b7c5ba 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -641,6 +641,7 @@ chooseKeymap() {
 # This also enables us to wait a reasonable amount of time until /dev/zfs appears.
 waitForZFS() {
 	while [ ! -c /dev/zfs ]; do modprobe zfs 2> /dev/null; done;
+	exit 1
 }
 
 startVolumes() {

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

[Richard Yao]

commit:     5e2553af6a81e724fd9415b87a77004bdcaac31d
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Mon Mar 10 22:36:05 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:25:20 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5e2553af

fix broken function prompt_user()

There is a mistake in the parameter check of function prompt_user()
which causes to exit the initramfs unconditionally when the function is
called with *correct* number of parameters (which then causes a kernel
panic)
This patch puts the parameter check into a readable if..then..fi block.

Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4b7c5ba..97997b3 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -446,9 +446,11 @@ prompt_user(){
 
 	eval local oldvalue='$'${1}
 
-	[ $# != 2 -a $# != 3 ] && \
+	if [ $# != 2 -a $# != 3 ]; then
 		bad_msg "Bad invocation of function prompt_user."
-		bad_msg "Please file a bug report with this message" && exit 1
+		bad_msg "Please file a bug report with this message"
+		exit 1
+	fi
 	[ -n "${3}" ] && local explnt=" or : ${3}" || local explnt="."
 
 	bad_msg "Could not find the ${2} in ${oldvalue}${explnt}"

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

[Richard Yao]

commit:     144581ec05710c43c3d23c8de4afffa157166bd1
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 00:22:05 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:25:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=144581ec

Revert "Workaround busybox modprobe's inability to load ZFS modules"

This reverts commit 2fa0a9beaa069a61f907f0b06c9bd6abeddb1ca7.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

Conflicts:
	defaults/initrd.scripts

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 97997b3..611d01c 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -639,10 +639,9 @@ chooseKeymap() {
 }
 
 # This helper function is to be called using call_func_timeout.
-# This works around the inability of busybox modprobe to handle complex module dependencies.
-# This also enables us to wait a reasonable amount of time until /dev/zfs appears.
+# It enables us to wait a reasonable amount of time until /dev/zfs appears.
 waitForZFS() {
-	while [ ! -c /dev/zfs ]; do modprobe zfs 2> /dev/null; done;
+	while [ ! -c /dev/zfs ]; do echo >/dev/null; done;
 	exit 1
 }
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6f950eb..ed808e4 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -310,6 +310,8 @@ then
 			break
 		fi
 	done
+
+	[ "USE_ZFS" = "1" ] && MY_HWOPTS="${MY_HWOPTS} zfs"
 fi
 
 splash 'init'

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

[Richard Yao]

commit:     7f50c100956ae6d61fd1c1f41cffe0f26dfb9013
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 22:02:46 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:25:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7f50c100

Try mmap() when loading modules

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/busy-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index da260a8..b1188e9 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -502,7 +502,7 @@ CONFIG_DEPMOD=y
 # Options common to multiple modutils
 #
 # CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+CONFIG_FEATURE_INSMOD_TRY_MMAP=y
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

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

[Richard Yao]

commit:     513021d90162ddeaeb0d308e7f27dd0a84b588db
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 00:35:06 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:41:33 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=513021d9

call_func_timeout() should return 1 upon failure

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 611d01c..5ef5d0b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -10,12 +10,12 @@ call_func_timeout()
 	( ${func} ) & pid=$!
 	( sleep ${timeout} && kill -HUP ${pid} ) 2>/dev/null & watcher=$!
 	if wait ${pid} 2>/dev/null; then
-	    kill -HUP $watcher 2> /dev/null
-	    wait $watcher 2>/dev/null
-	    return 1
+		kill -HUP $watcher 2> /dev/null
+		wait $watcher 2>/dev/null
+		return 0
 	fi
 
-	return 0
+	return 1
 }
 
 modules_load() {

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

[Robin H. Johnson]

commit:     a8ade8646371e78b95b067af49fdf3934f0efe31
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 13 23:52:37 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 14 00:59:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a8ade864

More device nodes.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 defaults/linuxrc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ed808e4..6401614 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -434,8 +434,10 @@ then
 		chmod 755 "${NEW_ROOT}/${i}"
 	done
 	[ ! -d "${CDROOT_PATH}" ] && mkdir -p "${CDROOT_PATH}"
-	[ ! -e "${NEW_ROOT}/dev/null" ] && mknod "${NEW_ROOT}"/dev/null c 1 3
-	[ ! -e "${NEW_ROOT}/dev/console" ] && mknod "${NEW_ROOT}"/dev/console c 5 1
+	[ ! -e "${NEW_ROOT}/dev/null" ] && mknod -m 660 "${NEW_ROOT}"/dev/null c 1 3
+	[ ! -e "${NEW_ROOT}/dev/zero" ] && mknod -m 660 "${NEW_ROOT}"/dev/zero c 1 5
+	[ ! -e "${NEW_ROOT}/dev/console" ] && mknod -m 660 "${NEW_ROOT}"/dev/console c 5 1
+	[ ! -e "${NEW_ROOT}/dev/ttyS0" ] && mknod -m 600 "${NEW_ROOT}"/dev/ttyS0 c 4 64
 
 	# For SGI LiveCDs ...
 	if [ "${LOOPTYPE}" = "sgimips" ]
@@ -446,10 +448,9 @@ then
 
 	# Required for splash to work.  Not an issue with the initrd as this
 	# device isn't created there and is not needed.
-	if [ -e /dev/tty1 ]
-	then
-		[ ! -e "${NEW_ROOT}/dev/tty1" ] && mknod "${NEW_ROOT}/dev/tty1" c 4 1
-	fi
+	for minor in 0 1 ; do
+		[ ! -e "${NEW_ROOT}/dev/$minor" ] && mknod -m 600 "${NEW_ROOT}/dev/tty$minor" c 4 $minor
+	done
 
 	if [ "${REAL_ROOT}" != "/dev/nfs" ] && [ "${LOOPTYPE}" != "sgimips" ]
 	then

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

[Robin H. Johnson]

commit:     5a71a83a82e21d486224b63c3ebf6ce692156d08
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 24 19:40:29 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 15 07:24:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5a71a83a

multipath needs to be autoloaded with domultipath, ditto dozfs => zfs.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 defaults/initrd.defaults | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index cbf18f3..69be516 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -70,7 +70,10 @@ LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop'
 
 DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"
 
+# This should list all possible hwopts that take do/no prefixes
+# this is part of the load order too fyi
+HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan lvm dmraid multipath mdadm zfs fs net'
+
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
-HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan lvm dmraid mdadm fs net'
 MY_HWOPTS='modules pata sata scsi usb firewire waitscan dmraid mdadm fs net iscsi crypto'

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

[Richard Farina]

commit:     dfa979a221ee78281e9335dd69de42321ddc424d
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Fri May 30 01:03:37 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dfa979a2

Cleanup dd output from changes file creation

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2fe540b..a9ec5ab 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -280,7 +280,7 @@ create_changefs() {
 		then
 			bad_msg "Please give a size of at least 16 Mb"
 		else
-			dd if=/dev/zero of=${CHANGESMNT}/${AUFS_CHANGESFILE} bs=1M count=${size}
+			dd if=/dev/zero of=${CHANGESMNT}/${AUFS_CHANGESFILE} bs=1M count=${size} &>/dev/null
 			if [ $? = '0' ]
 			then
 				good_msg "Creation of ${AUFS_CHANGESFILE}, ${size} Mb on ${CHANGESDEV} successful, formatting it ext2"

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

[Richard Farina]

commit:     5f8969492c9aafd161a5d146ea7fb87e9d2d4850
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Thu May 29 08:15:13 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5f896949

Removing --bind on some directories to prevent ${NEW_ROOT} path
from existing in favor of --move.

Got rid of the no longer required subshell call for aufs ${NEW_ROOT}
overlay.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c76abb5..2fe540b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1363,10 +1363,9 @@ getdvhoff() {
 }
 
 setup_squashfs_aufs() {
-	(
 	# Setup aufs directories and vars
-	local overlay=/mnt/overlay
-	local static=/mnt/livecd
+	overlay=/mnt/overlay
+	static=/mnt/livecd
 
 	for i in "${overlay}" "${static}"; do
 		[ ! -d "${i}" ] && mkdir -p "${i}"
@@ -1381,12 +1380,6 @@ setup_squashfs_aufs() {
 	[ ! -d "${NEW_ROOT}${overlay}" ] && mkdir -p "${NEW_ROOT}${overlay}"
 	[ ! -d "${NEW_ROOT}${static}" ] && mkdir -p "${NEW_ROOT}${static}"
 	for i in "${overlay}" "${static}"; do mount --move "${i}" "${NEW_ROOT}${i}"; done
-
-	# have handy /mnt/cdrom (CDROOT_PATH) as well
-	local new_cdroot="${NEW_ROOT}${CDROOT_PATH}"
-	[ ! -d "${new_cdroot}" ] && mkdir -p "${new_cdroot}"
-	mount --bind "${CDROOT_PATH}" "${new_cdroot}"
-	)
 }
 
 setup_unionfs() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index d5b424c..0a91c58 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -995,7 +995,7 @@ then
 	mkdir -p /${CHROOT}/.unions/memory
 	mount -o move /memory /${CHROOT}/.unions/memory 
         test_success "Failed to move aufs /memory into the system root"
-        for i in mnt/gentoo mnt/livecd ${CDROOT_PATH}
+        for i in mnt/gentoo mnt/livecd /mnt/overlay ${CDROOT_PATH}
 	do
 		mkdir -p ${CHROOT}/$i
 		chmod 755 ${CHROOT}/$i
@@ -1012,8 +1012,9 @@ then
 	warn_msg "${str}are mounted in ram"
 	warn_msg "consider saving important files elsewhere..."
 	read -t 3 UNUSEDVAL
-	mount --bind ${NEW_ROOT}${CDROOT_PATH} ${CHROOT}${CDROOT_PATH}
-	mount --bind ${NEW_ROOT}/mnt/livecd ${CHROOT}/mnt/livecd
+        for i in ${CDROOT_PATH} ${overlay} ${static}; do
+                mount --move ${NEW_ROOT}${i} ${CHROOT}${i}
+        done
 fi
 
 good_msg "Booting (initramfs)"

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

[Richard Farina]

commit:     f6afac68dd4134f8415e6d2ebea9f535b6d9e5c7
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Tue Jun  3 00:46:43 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f6afac68

dokeymap implementation for AUFS's union

 defaults/linuxrc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 86b1954..da88bf0 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -868,6 +868,12 @@ then
                         fi
                 fi
 
+                # Copy user keymap file
+                if [ -e /etc/sysconfig/keyboard ]; then
+                        [ ! -d ${CHROOT}/etc/sysconfig ] && mkdir -p ${CHROOT}/etc/sysconfig
+                        cp /etc/sysconfig/keyboard ${CHROOT}/etc/sysconfig/
+                fi
+
                 # Create the directories for our new union mounts
                 test ! -d "${CHROOT}${NEW_ROOT}" && mkdir -p "${CHROOT}${NEW_ROOT}"
 

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

[Richard Farina]

commit:     d055edc7e460bba5320f2e865d5cc9cbad3488af
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Fri May 30 02:02:30 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d055edc7

Restructure the setup_aufs function, it had redundant code and moved
the call to it further down the pipe.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a9ec5ab..14800e4 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -302,115 +302,110 @@ create_changefs() {
 }
 
 setup_aufs() {
-	if [ "${USE_AUFS_NORMAL}" -eq '1' ]
+        # Directory used for rw changes in union mount filesystem
+	UNION=/union
+	MEMORY=/memory
+	# Mountpoint for the changesdev
+	CHANGESMNT=${NEW_ROOT}/mnt/changesdev
+	if [ -z "$UID" ]
 	then
-		# Directory used for rw changes in union mount filesystem
-		UNION=/union
-		MEMORY=/memory
-		# Mountpoint for the changesdev
-		CHANGESMNT=${NEW_ROOT}/mnt/changesdev
-		if [ -z "$UID" ]
-		then
-			CHANGES=${MEMORY}/aufs_changes/default
-		else
-			CHANGES=${MEMORY}/aufs_changes/${UID}
-		fi
+		CHANGES=${MEMORY}/aufs_changes/default
+	else
+		CHANGES=${MEMORY}/aufs_changes/${UID}
+	fi
 
-		mkdir -p ${MEMORY}
-		mkdir -p ${UNION}
-		mkdir -p ${CHANGESMNT}
-		for i in dev mnt ${CDROOT_PATH} mnt/livecd mnt/key tmp tmp/.initrd mnt/gentoo sys
-		do
-			mkdir -p "${NEW_ROOT}/${i}"
-			chmod 755 "${NEW_ROOT}/${i}"
-		done
-		[ ! -e "${NEW_ROOT}/dev/null" ] && mknod "${NEW_ROOT}"/dev/null c 1 3
-		[ ! -e "${NEW_ROOT}/dev/console" ] && mknod "${NEW_ROOT}"/dev/console c 5 1
+	mkdir -p ${MEMORY}
+	mkdir -p ${UNION}
+	mkdir -p ${CHANGESMNT}
+	for i in dev mnt ${CDROOT_PATH} mnt/livecd mnt/key tmp tmp/.initrd mnt/gentoo sys
+	do
+		mkdir -p "${NEW_ROOT}/${i}"
+		chmod 755 "${NEW_ROOT}/${i}"
+	done
+	[ ! -e "${NEW_ROOT}/dev/null" ] && mknod "${NEW_ROOT}"/dev/null c 1 3
+	[ ! -e "${NEW_ROOT}/dev/console" ] && mknod "${NEW_ROOT}"/dev/console c 5 1
 
-		bootstrapCD
-		if [ -n "${AUFS}" ]
+	bootstrapCD
+	if [ -n "${AUFS}" ]
+	then
+		if [ "${AUFS}" = "detect" ]
 		then
-			if [ "${AUFS}" = "detect" ]
+			CHANGESMNT="${NEW_ROOT}${CDROOT_PATH}"
+			CHANGESDEV=${REAL_ROOT}
+		else
+			CHANGESDEV=${AUFS}
+			good_msg "mounting ${CHANGESDEV} to ${MEMORY} for aufs support"
+			mount -t auto ${CHANGESDEV} ${CHANGESMNT}
+			ret=$?
+			if [ "${ret}" -ne 0 ]
 			then
-				CHANGESMNT="${NEW_ROOT}${CDROOT_PATH}"
-				CHANGESDEV=${REAL_ROOT}
-			else
-				CHANGESDEV=${AUFS}
-				good_msg "mounting ${CHANGESDEV} to ${MEMORY} for aufs support"
-				mount -t auto ${CHANGESDEV} ${CHANGESMNT}
+				bad_msg "mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs"
+				unset AUFS
+			fi
+		fi
+		# Check and attempt to create the changesfile
+		if [ ! -e ${CHANGESMNT}/${AUFS_CHANGESFILE} ] && [ -n "${AUFS}" ]
+		then
+			create_changefs
+			mount -t auto ${CHANGESMNT}/${AUFS_CHANGESFILE} ${MEMORY}
+		elif [ -n "${AUFS}" ]
+		then
+			local nbpass=0
+			while [ 1 ]
+			do
+				mount -t auto ${CHANGESMNT}/${AUFS_CHANGESFILE} ${MEMORY}
 				ret=$?
 				if [ "${ret}" -ne 0 ]
 				then
-					bad_msg "mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs"
-					unset AUFS
-				fi
-			fi
-			# Check and attempt to create the changesfile
-			if [ ! -e ${CHANGESMNT}/${AUFS_CHANGESFILE} ] && [ -n "${AUFS}" ]
-			then
-				create_changefs
-				mount -t auto ${CHANGESMNT}/${AUFS_CHANGESFILE} ${MEMORY}
-			elif [ -n "${AUFS}" ]
-			then
-				local nbpass=0
-				while [ 1 ]
-				do
-					mount -t auto ${CHANGESMNT}/${AUFS_CHANGESFILE} ${MEMORY}
-					ret=$?
-					if [ "${ret}" -ne 0 ]
+					if [ ${nbpass} -eq 0 ]
 					then
-						if [ ${nbpass} -eq 0 ]
-						then
-							bad_msg "mounting of changes file failed, Running e2fsck"
-							e2fsck ${CHANGESMNT}/${AUFS_CHANGESFILE}
-							nbpass=$((${nbpass} + 1))
-						else
-							bad_msg "mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs"
-							bad_msg "your ${AUFS_CHANGESFILE} might be messed up, and I couldn't fix it"
-							bad_msg "moving ${AUFS_CHANGESFILE} to ${AUFS_CHANGESFILE}.bad"
-							mv ${CHANGESMNT}/${AUFS_CHANGESFILE} ${CHANGESMNT}/${AUFS_CHANGESFILE}.bad
-							bad_msg "try to fix it yourself with e2fsck later on, sorry for disturbing"
-							break
-						fi
+						bad_msg "mounting of changes file failed, Running e2fsck"
+						e2fsck ${CHANGESMNT}/${AUFS_CHANGESFILE}
+						nbpass=$((${nbpass} + 1))
 					else
-						if [ ${nbpass} -eq 1 ]
-						then
-							good_msg "e2fsck ran successfully. Please check your files after bootup"
-						fi
+						bad_msg "mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs"
+						bad_msg "your ${AUFS_CHANGESFILE} might be messed up, and I couldn't fix it"
+						bad_msg "moving ${AUFS_CHANGESFILE} to ${AUFS_CHANGESFILE}.bad"
+						mv ${CHANGESMNT}/${AUFS_CHANGESFILE} ${CHANGESMNT}/${AUFS_CHANGESFILE}.bad
+						bad_msg "try to fix it yourself with e2fsck later on, sorry for disturbing"
 						break
 					fi
-				done
-			fi
-			# mount tmpfs only in the case when changes= boot parameter was
-			# empty or we were not able to mount the storage device
-			if [ "${CDROOT}" -eq '1' -a ! -f ${CHANGESMNT}/${AUFS_CHANGESFILE}  ]
-			then
-				umount ${MEMORY}
-				bad_msg "failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}"
-				bad_msg "create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs"
-				bad_msg "falling back to ramdisk based aufs for safety"
-				mount -t tmpfs tmpfs ${MEMORY}
-				XINO=${MEMORY}
-			else
-				XINO=${MEMORY}/xino
-				mkdir -p ${XINO}
-				mount -t tmpfs tmpfs ${XINO}
-			fi
-		else
-			good_msg "Mounting ramdisk to $MEMORY for aufs support..."
-			mount -t tmpfs tmpfs ${MEMORY}
-			XINO=${MEMORY}
+				else
+					if [ ${nbpass} -eq 1 ]
+					then
+						good_msg "e2fsck ran successfully. Please check your files after bootup"
+					fi
+					break
+				fi
+			done
 		fi
-
-		mkdir -p ${CHANGES}
-		mount -t aufs -n -o nowarn_perm,udba=none,xino=${XINO}/.aufs.xino,br:${CHANGES}=rw aufs ${UNION}
-		ret=$?
-		if [ "${ret}" -ne 0 ]
+		# mount tmpfs only in the case when changes= boot parameter was
+		# empty or we were not able to mount the storage device
+		if [ "${CDROOT}" -eq '1' -a ! -f ${CHANGESMNT}/${AUFS_CHANGESFILE}  ]
 		then
-			bad_msg "Can't setup union ${UNION} in directory!"
-			USE_AUFS_NORMAL=0
+			umount ${MEMORY}
+			bad_msg "failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}"
+			bad_msg "create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs"
+			bad_msg "falling back to ramdisk based aufs for safety"
+			mount -t tmpfs tmpfs ${MEMORY}
+			XINO=${MEMORY}
+		else
+			XINO=${MEMORY}/xino
+			mkdir -p ${XINO}
+			mount -t tmpfs tmpfs ${XINO}
 		fi
 	else
+		good_msg "Mounting ramdisk to $MEMORY for aufs support..."
+		mount -t tmpfs tmpfs ${MEMORY}
+		XINO=${MEMORY}
+	fi
+
+	mkdir -p ${CHANGES}
+	mount -t aufs -n -o nowarn_perm,udba=none,xino=${XINO}/.aufs.xino,br:${CHANGES}=rw aufs ${UNION}
+	ret=$?
+	if [ "${ret}" -ne 0 ]
+	then
+		bad_msg "Can't setup union ${UNION} in directory!"
 		USE_AUFS_NORMAL=0
 	fi
 }

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5d4d2a1..894ec45 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -457,9 +457,9 @@ rundebugshell "before setting up the root filesystem"
 
 if [ "${CDROOT}" = '1' ]
 then
-	setup_aufs
 	if [ "${USE_AUFS_NORMAL}" -eq '1' ]
 	then
+                setup_aufs
 		CHROOT=${UNION}
 	else
 		CHROOT=${NEW_ROOT}

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

[Richard Farina]

commit:     73c4b5312df5796df116e59edad6034520943b00
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Fri May 30 02:06:42 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=73c4b531

Output cleaning

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 14800e4..0e44e61 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -335,7 +335,7 @@ setup_aufs() {
 		else
 			CHANGESDEV=${AUFS}
 			good_msg "mounting ${CHANGESDEV} to ${MEMORY} for aufs support"
-			mount -t auto ${CHANGESDEV} ${CHANGESMNT}
+			mount -t auto ${CHANGESDEV} ${CHANGESMNT} &>/dev/null
 			ret=$?
 			if [ "${ret}" -ne 0 ]
 			then
@@ -383,7 +383,7 @@ setup_aufs() {
 		# empty or we were not able to mount the storage device
 		if [ "${CDROOT}" -eq '1' -a ! -f ${CHANGESMNT}/${AUFS_CHANGESFILE}  ]
 		then
-			umount ${MEMORY}
+			umount ${MEMORY} &>/dev/null
 			bad_msg "failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}"
 			bad_msg "create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs"
 			bad_msg "falling back to ramdisk based aufs for safety"

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

[Richard Farina]

commit:     75c9e46754eced6074d864f0bcfe133d7b21f19f
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Fri May 30 02:57:13 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=75c9e467

coding style changes

 defaults/linuxrc | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 281de8e..42749d6 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1014,26 +1014,34 @@ verbose_kmsg
 
 if [ "${USE_AUFS_NORMAL}" -eq '1' ]
 then
-	mkdir -p /${CHROOT}/.unions/memory
-	mount -o move /memory /${CHROOT}/.unions/memory 
+        UNION_MEMORY=${CHROOT}/.unions/memory
+
+	mkdir -p "${UNION_MEMORY}"
+	mount --move "${MEMORY}" "${UNION_MEMORY}"
         test_success "Failed to move aufs /memory into the system root"
-        for i in mnt/gentoo mnt/livecd /mnt/overlay ${CDROOT_PATH}
+
+        for i in /mnt/gentoo /mnt/livecd /mnt/overlay ${CDROOT_PATH}
 	do
-		mkdir -p ${CHROOT}/$i
-		chmod 755 ${CHROOT}/$i
+		mkdir -p "${CHROOT}${i}"
+		chmod 755 "${CHROOT}${i}"
 	done
+
 	# This will prevent from putting junk on the CHANGESDEV
 	str=""
-	for i in tmp var/tmp usr/portage/distfiles
+	for i in /tmp /var/tmp /usr/portage/distfiles
 	do
-		mkdir -p ${CHROOT}/$i
-		chmod 755 ${CHROOT}/$i
-		mount -t tmpfs tmpfs ${CHROOT}/$i
-		str="${str} ${i}"
+		mkdir -p "${CHROOT}${i}"
+		chmod 755 "${CHROOT}${i}"
+
+		mount -t tmpfs tmpfs "${CHROOT}${i}"
+		str="${i} ${str}"
 	done
+
 	warn_msg "${str}are mounted in ram"
 	warn_msg "consider saving important files elsewhere"
-	read -t 3 UNUSEDVAL
+
+        sleep 2
+
         for i in ${CDROOT_PATH} ${overlay} ${static}; do
                 mount --move ${NEW_ROOT}${i} ${CHROOT}${i}
         done

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

[Richard Farina]

commit:     9b660463faa2c7f544afdfa29790f81989c04434
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Fri May 30 00:51:08 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9b660463

Enhanced the shutdown process and changed from using ${UNION} to ${CHROOT} to
better understand the logic behind things as CHROOT is set to ${UNION} anyways.

RC_NO_UMOUNTS is more dynamic now and should scale up.

 defaults/initrd.defaults |  1 +
 defaults/linuxrc         | 45 +++++++++++++++++++++++++++++++--------------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index aa9f85c..9937e00 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -58,6 +58,7 @@ KSUFF='.ko'
 REAL_ROOT=''
 CONSOLE='/dev/console'
 NEW_ROOT='/newroot'
+RC_NO_UMOUNTS="/newroot|/newroot/mnt/changesdev|/mnt/overlay|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino"
 CDROOT='0'
 CDROOT_DEV=''
 CDROOT_TYPE='auto'

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 0a91c58..5d4d2a1 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -805,24 +805,38 @@ then
 
 	if [ "${USE_AUFS_NORMAL}" -eq '1' ]
 	then
-		union_insert_dir ${UNION} ${NEW_ROOT}/${FS_LOCATION}
+		union_insert_dir ${CHROOT} ${NEW_ROOT}/${FS_LOCATION}
 
 		# Make sure fstab notes livecd is mounted ro.  Makes system skip remount which fails on aufs dirs.
 		# TODO: remounting all tmpfs as RO seems weird, can we be more specific?
-		sed -e 's|\(.*\s/\s*tmpfs\s*\)defaults\(.*\)|\1defaults,ro\2|' /${UNION}/etc/fstab > /${UNION}/etc/fstab.new
-		mv /${UNION}/etc/fstab.new /${UNION}/etc/fstab
+		#sed -e 's|\(.*\s/\s*tmpfs\s*\)defaults\(.*\)|\1defaults,ro\2|' /${UNION}/etc/fstab > /${UNION}/etc/fstab.new
+		#mv /${UNION}/etc/fstab.new /${UNION}/etc/fstab
 
                 # RC_NO_UMOUNTS variable for a clean shutdown/reboot
-                test ! $(grep 'RC_NO_UMOUNTS="/newroot|/newroot/mnt/aufs|\
-/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|/.unions/\
-memory|/.unions/memory/xino"' "${UNION}"/etc/rc.conf) &&
-                        echo "RC_NO_UMOUNTS=\"/newroot|/newroot/mnt/aufs|"\
-"/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|"\
-"/.unions/memory|/.unions/memory/xino\"">> "${UNION}"/etc/rc.conf
+                RC_MOUNTS=$(grep 'RC_NO_UMOUNTS' "${CHROOT}"/etc/rc.conf)
+                RESULTS=false
+
+                # Iterate through ${RC_MOUNTS} to find our duplicate(s) and or remove obsolete lines when ever
+                # our RC_NO_UMOUNTS variable changes.
+                printf '%s\n' ${RC_MOUNTS} | while read -r mount; do
+                        if [[ "${mount}" = "RC_NO_UMOUNTS=\"${RC_NO_UMOUNTS}\"" ]]; then
+                                RESULTS=true
+                        else
+                                # Escape characters in ${mounts} for use in sed 
+                                mount_re=$(echo ${mount} | sed -e 's/\//\\\//g' -e 's/\&/\\\&/g')
+
+                                # Remove non matching pattern
+                                sed -i "/${mount_re}/d" "${CHROOT}"/etc/rc.conf
+                        fi
+                done
+
+                if ! ${RESULTS}; then
+                        echo 'RC_NO_UMOUNTS="/newroot|/newroot/mnt/changesdev|/mnt/overlay|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino"'>> "${CHROOT}"/etc/rc.conf
+                fi
 
                 # Fstab change for aufs
-                test ! $(grep aufs "${UNION}"/etc/fstab) &&
-                        echo "aufs / aufs defaults 0 0" > "${UNION}"/etc/fstab
+                test ! $(grep -o ^aufs "${CHROOT}"/etc/fstab) &&
+                        echo "aufs / aufs defaults 0 0" > "${CHROOT}"/etc/fstab
 
 		warn_msg "Adding all modules in $MODULESD/modules/"
 		if [ -z "${MODULESD}" ]
@@ -834,9 +848,12 @@ memory|/.unions/memory/xino"' "${UNION}"/etc/rc.conf) &&
 			union_insert_modules ${NEW_ROOT}/mnt/modulesd
 		fi
 
-                mkdir -p "${UNION}"/newroot/mnt/aufs
-                test ${AUFS_CHANGES} && test ! -d "${UNION}"/newroot/mnt/changesdev &&
-                        mkdir "${UNION}"/newroot/mnt/changesdev
+                # Create the directories for our new union mounts
+                test ! -d "${CHROOT}${NEW_ROOT}" && mkdir -p "${CHROOT}${NEW_ROOT}"
+
+                if ${AUFS_CHANGES} && [ ! -d "${CHROOT}${NEW_ROOT}/mnt/changesdev" ]; then
+                        mkdir -p "${CHROOT}${NEW_ROOT}/mnt/changesdev"
+                fi
 	fi
 
 	# Unpacking additional packages from NFS mount

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

[Richard Farina]

commit:     eee5452c2e3d6211a77699bc1e687fe41a5f5924
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Mon Jun  2 15:19:23 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=eee5452c

This improves the way we handle RC_NO_UMOUNT variable in openrc so that
future changes can scale and fixes previous bugs which didn't actually
remove duplicates.

 defaults/linuxrc | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 42749d6..86b1954 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -816,24 +816,39 @@ then
 
                 # RC_NO_UMOUNTS variable for a clean shutdown/reboot
                 RC_MOUNTS=$(grep 'RC_NO_UMOUNTS' "${CHROOT}"/etc/rc.conf)
-                RESULTS=false
 
                 # Iterate through ${RC_MOUNTS} to find our duplicate(s) and or remove obsolete lines when ever
                 # our RC_NO_UMOUNTS variable changes.
-                printf '%s\n' ${RC_MOUNTS} | while read -r mount; do
-                        if [[ "${mount}" = "RC_NO_UMOUNTS=\"${RC_NO_UMOUNTS}\"" ]]; then
-                                RESULTS=true
-                        else
-                                # Escape characters in ${mounts} for use in sed 
-                                mount_re=$(echo ${mount} | sed -e 's/\//\\\//g' -e 's/\&/\\\&/g')
-
-                                # Remove non matching pattern
-                                sed -i "/${mount_re}/d" "${CHROOT}"/etc/rc.conf
-                        fi
-                done
+                if [ -n "${RC_MOUNTS}" ]; then
+                        printf '%s\n' ${RC_MOUNTS} |
+                                {
+                                        while read -r mount; do
+                                                # Remove double quotes from ${mount}
+                                                new_mount=$(echo ${mount} | sed 's/"//g')
+
+                                                if [[ "${new_mount}" = "RC_NO_UMOUNTS="${RC_NO_UMOUNTS}"" ]]; then
+                                                        RESULTS=false
+                                                else
+                                                        # Escape characters in ${mounts} for use in sed
+                                                        mount_re=$(echo ${mount} | sed -e 's/\//\\\//g' -e 's/\&/\\\&/g')
+
+                                                        # Remove non matching pattern
+                                                        sed -i "/${mount_re}/d" "${CHROOT}"/etc/rc.conf
+
+                                                        RESULTS=true
+                                                fi
+                                        done
+
+                                        # no RC_NO_UMOUNTS match found
+                                        if ${RESULTS}; then return 1;fi
+                                }
+                else
+                        echo "RC_NO_UMOUNTS=\"${RC_NO_UMOUNTS}\"">> "${CHROOT}"/etc/rc.conf
+                fi
 
-                if ! ${RESULTS}; then
-                        echo 'RC_NO_UMOUNTS="/newroot|/newroot/mnt/changesdev|/mnt/overlay|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino"'>> "${CHROOT}"/etc/rc.conf
+                # An RC_NO_UMOUNTS was not found that matches our current one
+                if [ $? -eq 1 ]; then
+                        echo "RC_NO_UMOUNTS=\"${RC_NO_UMOUNTS}\"">> "${CHROOT}"/etc/rc.conf
                 fi
 
                 # Fstab change for aufs

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

[Richard Farina]

commit:     b9b3c758571b2016969691da2ffd76558a59a212
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Fri May 30 02:31:13 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b9b3c758

Wording changes, cosmetic crap

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 0e44e61..fe563fe 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -334,12 +334,12 @@ setup_aufs() {
 			CHANGESDEV=${REAL_ROOT}
 		else
 			CHANGESDEV=${AUFS}
-			good_msg "mounting ${CHANGESDEV} to ${MEMORY} for aufs support"
+			good_msg "Mounting ${CHANGESDEV} to ${MEMORY} for aufs support"
 			mount -t auto ${CHANGESDEV} ${CHANGESMNT} &>/dev/null
 			ret=$?
 			if [ "${ret}" -ne 0 ]
 			then
-				bad_msg "mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs"
+				bad_msg "Mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs"
 				unset AUFS
 			fi
 		fi
@@ -359,15 +359,15 @@ setup_aufs() {
 				then
 					if [ ${nbpass} -eq 0 ]
 					then
-						bad_msg "mounting of changes file failed, Running e2fsck"
+						bad_msg "Mounting of changes file failed, Running e2fsck"
 						e2fsck ${CHANGESMNT}/${AUFS_CHANGESFILE}
 						nbpass=$((${nbpass} + 1))
 					else
-						bad_msg "mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs"
+						bad_msg "Mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs"
 						bad_msg "your ${AUFS_CHANGESFILE} might be messed up, and I couldn't fix it"
 						bad_msg "moving ${AUFS_CHANGESFILE} to ${AUFS_CHANGESFILE}.bad"
 						mv ${CHANGESMNT}/${AUFS_CHANGESFILE} ${CHANGESMNT}/${AUFS_CHANGESFILE}.bad
-						bad_msg "try to fix it yourself with e2fsck later on, sorry for disturbing"
+						bad_msg "Try to fix it yourself with e2fsck"
 						break
 					fi
 				else
@@ -383,19 +383,20 @@ setup_aufs() {
 		# empty or we were not able to mount the storage device
 		if [ "${CDROOT}" -eq '1' -a ! -f ${CHANGESMNT}/${AUFS_CHANGESFILE}  ]
 		then
+                        XINO=${MEMORY}
 			umount ${MEMORY} &>/dev/null
-			bad_msg "failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}"
-			bad_msg "create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs"
-			bad_msg "falling back to ramdisk based aufs for safety"
+			bad_msg "Failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}"
+			bad_msg "Create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs"
+			bad_msg "Falling back to ramdisk based aufs for safety"
+                        good_msg "Mounting ramdisk to $MEMORY for aufs support"
 			mount -t tmpfs tmpfs ${MEMORY}
-			XINO=${MEMORY}
 		else
 			XINO=${MEMORY}/xino
 			mkdir -p ${XINO}
 			mount -t tmpfs tmpfs ${XINO}
 		fi
 	else
-		good_msg "Mounting ramdisk to $MEMORY for aufs support..."
+		good_msg "Mounting ramdisk to $MEMORY for aufs support"
 		mount -t tmpfs tmpfs ${MEMORY}
 		XINO=${MEMORY}
 	fi

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 894ec45..009b4c4 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -758,9 +758,10 @@ then
 					do_rundebugshell
 				}
 			else
-				good_msg 'Mounting squashfs & aufs filesystems'
+				good_msg 'Mounting squashfs filesystem'
+
 				setup_squashfs_aufs
-				test_success 'Mount filesystem'
+				test_success 'Mount aufs filesystem'
 			fi
 			FS_LOCATION='mnt/livecd'
 		elif [ "${LOOPTYPE}" = 'gcloop' ]
@@ -1027,7 +1028,7 @@ then
 		str="${str} ${i}"
 	done
 	warn_msg "${str}are mounted in ram"
-	warn_msg "consider saving important files elsewhere..."
+	warn_msg "consider saving important files elsewhere"
 	read -t 3 UNUSEDVAL
         for i in ${CDROOT_PATH} ${overlay} ${static}; do
                 mount --move ${NEW_ROOT}${i} ${CHROOT}${i}

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

[Richard Farina]

commit:     9b67915cb1ccb5299dd43b5afee81c53b022ef23
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Fri May 30 02:46:09 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9b67915c

Better handle on if aufs.modules kernel parameter is used

 defaults/initrd.defaults |  1 +
 defaults/linuxrc         | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 9937e00..b08ff50 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -68,6 +68,7 @@ CDROOT_PATH='/mnt/cdrom'
 CDROOT_MARKER='/livecd'
 
 # AUFS variables
+AUFS_MODULES=false
 AUFS_CHANGES=false
 AUFS_CHANGESFILE=livecd.aufs
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 009b4c4..281de8e 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -284,6 +284,7 @@ do
 		# Allow user to specify the modules location
 		aufs.modules\=*)
 			MODULESD=${x#*=}
+                        AUFS_MODULES=true
 		;;
 		unionfs)
 			if [ ! -x /sbin/unionfs ]
@@ -839,15 +840,18 @@ then
                 test ! $(grep -o ^aufs "${CHROOT}"/etc/fstab) &&
                         echo "aufs / aufs defaults 0 0" > "${CHROOT}"/etc/fstab
 
-		warn_msg "Adding all modules in $MODULESD/modules/"
-		if [ -z "${MODULESD}" ]
-		then
-			union_insert_modules ${CDROOT_PATH}
-		else
-			mkdir ${NEW_ROOT}/mnt/modulesd
-			mount "${MODULESD}" ${NEW_ROOT}/mnt/modulesd
-			union_insert_modules ${NEW_ROOT}/mnt/modulesd
-		fi
+                if ${AUFS_MODULES}; then
+                        warn_msg "Adding all modules in $MODULESD/modules/"
+
+                        if [ -z "${MODULESD}" ]
+                        then
+		                union_insert_modules ${CDROOT_PATH}
+		        else
+			        mkdir ${NEW_ROOT}/mnt/modulesd
+			        mount "${MODULESD}" ${NEW_ROOT}/mnt/modulesd
+			        union_insert_modules ${NEW_ROOT}/mnt/modulesd
+                        fi
+                fi
 
                 # Create the directories for our new union mounts
                 test ! -d "${CHROOT}${NEW_ROOT}" && mkdir -p "${CHROOT}${NEW_ROOT}"

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

[Richard Farina]

commit:     a1b88b49e6139cf7f0ac465430e3370773ab6017
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Thu May 29 02:40:18 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a1b88b49

This fixes /etc/fstab from not working while in setup_aufs function and instead
includes it in the union path.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 68c0ef7..c76abb5 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1380,7 +1380,6 @@ setup_squashfs_aufs() {
 
 	[ ! -d "${NEW_ROOT}${overlay}" ] && mkdir -p "${NEW_ROOT}${overlay}"
 	[ ! -d "${NEW_ROOT}${static}" ] && mkdir -p "${NEW_ROOT}${static}"
-	echo "aufs / aufs defaults 0 0" > "${NEW_ROOT}"/etc/fstab
 	for i in "${overlay}" "${static}"; do mount --move "${i}" "${NEW_ROOT}${i}"; done
 
 	# have handy /mnt/cdrom (CDROOT_PATH) as well

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6d942a1..d5b424c 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -820,6 +820,10 @@ memory|/.unions/memory/xino"' "${UNION}"/etc/rc.conf) &&
 "/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|"\
 "/.unions/memory|/.unions/memory/xino\"">> "${UNION}"/etc/rc.conf
 
+                # Fstab change for aufs
+                test ! $(grep aufs "${UNION}"/etc/fstab) &&
+                        echo "aufs / aufs defaults 0 0" > "${UNION}"/etc/fstab
+
 		warn_msg "Adding all modules in $MODULESD/modules/"
 		if [ -z "${MODULESD}" ]
 		then

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

[Richard Farina]

commit:     22fc4406486edd0f7a82b117d5884c8f2cf7487e
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Tue Jun  3 17:48:14 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=22fc4406

Better implementation which was originally done in 946918e & 7a38d63.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index eb5ed6a..91056b1 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -310,6 +310,42 @@ union_insert_modules() {
 	done
 }
 
+# Implements RC_NO_UMOUNTS variable into ${CHROOT}/etc/rc.conf for a cleaner shutdown process
+# This should really go into /etc/init.d/localmounts but until then we manually set this here
+conf_rc_no_umounts() {
+        local conf nomount fnd
+        conf="${CHROOT}/etc/rc.conf"
+        fnd=0
+
+        if nomount=$(grep -n '^[[:blank:]]*RC_NO_UMOUNTS=' $conf); then
+                local i n data cmd IFS
+                IFS='
+'
+                set -- $nomount
+                unset IFS
+
+                for i; do
+                        n=${i%%:*}; i=${i#"$n"}
+                        data=${i#*=}
+
+                        case $data in
+                                "\"$RC_NO_UMOUNTS\""|"'$RC_NO_UMOUNTS'") fnd=1;;
+                                *) cmd="$cmd$n d;"
+                        esac
+                done
+
+                if [ -n "$cmd" ]; then
+                        sed -i "${cmd%;}" $conf
+                        test_success "Unable to edit rc.conf"
+                fi
+        fi
+
+        if [ 0 -eq "$fnd" ]; then
+                printf 'RC_NO_UMOUNTS="%s"\n' "$RC_NO_UMOUNTS" >> $conf
+                test_success "Unable to write to rc.conf"
+        fi
+}
+
 # Function to create an ext2 fs on $CHANGESDEV, $CHANGESMNT mountpoint
 create_changefs() {
 	local size

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 0e40d16..a6c4806 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -791,42 +791,8 @@ then
 		#sed -e 's|\(.*\s/\s*tmpfs\s*\)defaults\(.*\)|\1defaults,ro\2|' /${UNION}/etc/fstab > /${UNION}/etc/fstab.new
 		#mv /${UNION}/etc/fstab.new /${UNION}/etc/fstab
 
-                # RC_NO_UMOUNTS variable for a clean shutdown/reboot
-                RC_MOUNTS=$(grep 'RC_NO_UMOUNTS' "${CHROOT}"/etc/rc.conf)
-
-                # Iterate through ${RC_MOUNTS} to find our duplicate(s) and or remove obsolete lines when ever
-                # our RC_NO_UMOUNTS variable changes.
-                if [ -n "${RC_MOUNTS}" ]; then
-                        printf '%s\n' ${RC_MOUNTS} |
-                                {
-                                        while read -r mount; do
-                                                # Remove double quotes from ${mount}
-                                                new_mount=$(echo ${mount} | sed 's/"//g')
-
-                                                if [[ "${new_mount}" = "RC_NO_UMOUNTS="${RC_NO_UMOUNTS}"" ]]; then
-                                                        RESULTS=false
-                                                else
-                                                        # Escape characters in ${mounts} for use in sed
-                                                        mount_re=$(echo ${mount} | sed -e 's/\//\\\//g' -e 's/\&/\\\&/g')
-
-                                                        # Remove non matching pattern
-                                                        sed -i "/${mount_re}/d" "${CHROOT}"/etc/rc.conf
-
-                                                        RESULTS=true
-                                                fi
-                                        done
-
-                                        # no RC_NO_UMOUNTS match found
-                                        if ${RESULTS}; then return 1;fi
-                                }
-                else
-                        echo "RC_NO_UMOUNTS=\"${RC_NO_UMOUNTS}\"">> "${CHROOT}"/etc/rc.conf
-                fi
-
-                # An RC_NO_UMOUNTS was not found that matches our current one
-                if [ $? -eq 1 ]; then
-                        echo "RC_NO_UMOUNTS=\"${RC_NO_UMOUNTS}\"">> "${CHROOT}"/etc/rc.conf
-                fi
+                # Function to handle the RC_NO_UMOUNTS variable in ${CHROOT}/etc/rc.conf
+                conf_rc_no_umounts
 
                 # Fstab change for aufs
                 test ! $(grep -o ^aufs "${CHROOT}"/etc/fstab) &&

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

[Richard Farina]

commit:     421a7a9fd23106a9db17d2b73a51028a5a2354f5
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  5 16:11:48 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=421a7a9f

change default aufs branch naming

likewhoa didn't like my default naming, and I don't like his, so we
compromised on aufs-rw-branch so no one is happy :-)

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 8edaea4..d8142a2 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -186,9 +186,9 @@ bootstrapFS() {
                 aufs_dev_mnt=/mnt/aufs-dev
 
                 if [ -z "$aufs_dev_uid" ]; then
-                        aufs_branch=$aufs_memory/aufs-branch/default
+                        aufs_branch=$aufs_memory/aufs-rw-branch/default
                 else
-                        aufs_branch=$aufs_memory/aufs-branch/$aufs_dev_uid
+                        aufs_branch=$aufs_memory/aufs-rw-branch/$aufs_dev_uid
                 fi
 
                 mkdir -p $aufs_memory $aufs_union $aufs_dev_mnt

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

[Richard Farina]

commit:     539d2eb0b91d617ff4a83910b507248c02ce6caf
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Tue Jun 24 22:36:40 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=539d2eb0

Reverting back old mknod permission settings for netboot compatibility

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 02842bf..9b88d6a 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -205,10 +205,10 @@ bootstrapFS() {
         done
 
         [ ! -d "${CDROOT_PATH}" ] && mkdir -p "${CDROOT_PATH}"
-        [ ! -e "${NEW_ROOT}/dev/null" ] && mknod "${NEW_ROOT}"/dev/null c 1 3
-        [ ! -e "${NEW_ROOT}/dev/zero" ] && mknod -m 660 "${NEW_ROOT}"/dev/zero c 1 5
-        [ ! -e "${NEW_ROOT}/dev/console" ] && mknod "${NEW_ROOT}"/dev/console c 5 1
-        [ ! -e "${NEW_ROOT}/dev/ttyS0" ] && mknod -m 600 "${NEW_ROOT}"/dev/ttyS0 c 4 64
+        [ ! -e "${NEW_ROOT}/dev/null" ] && mknod -m 666 "${NEW_ROOT}"/dev/null c 1 3
+        [ ! -e "${NEW_ROOT}/dev/zero" ] && mknod -m 666 "${NEW_ROOT}"/dev/zero c 1 5
+        [ ! -e "${NEW_ROOT}/dev/console" ] && mknod -m 600 "${NEW_ROOT}"/dev/console c 5 1
+        [ ! -e "${NEW_ROOT}/dev/ttyS0" ] && mknod -m 660 "${NEW_ROOT}"/dev/ttyS0 c 4 64
 
         # For SGI LiveCDs
         if [ "${LOOPTYPE}" = "sgimips" ]; then

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

[Richard Farina]

commit:     f3b1c95130892ec98e233efced096a876ac8e4f6
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Mon Aug  4 01:23:02 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f3b1c951

Fixed a bug which prevented aufs.modules from functioning properly
and changed the variables names to reflect the actual logic.

 defaults/initrd.defaults |  1 +
 defaults/initrd.scripts  | 17 ++++++++---------
 defaults/linuxrc         | 22 +++++++++++++---------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 782fd14..f2cb42a 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -72,6 +72,7 @@ CDROOT_MARKER='/livecd'
 # AUFS variables
 aufs=0
 aufs_union_file=/livecd.aufs
+aufs_modules_dir=mnt/cdrom
 
 LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop'
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 5c7703b..d168b94 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -297,12 +297,12 @@ union_insert_dir() {
 union_insert_modules() {
         local module
 
-        for module in "$NEW_ROOT/$1/modules/"*.mo; do
-                union_mod "$module" || bad_msg "Unable to load module: '$module'"
+        for module in "$1/modules/"*.mo; do
+                union_mod "$module" || bad_msg "Unable to insert module: '$module'"
         done
 
-        for module in "$NEW_ROOT/$1/modules/"*.lzm; do
-                union_mod "$module" lzm || bad_msg "Unable to load module: '$module'"
+        for module in "$1/modules/"*.lzm; do
+                union_mod "$module" || bad_msg "Unable to insert module: '$module'"
         done
 }
 
@@ -315,13 +315,12 @@ union_mod() {
         mod=${1##*/}
         mod=${mod%.*}
 
-        mkdir -p "$aufs_memory/modules/$mod" || return
-
-        if [ lzm = "$2" ]; then
-                 mount -o loop,ro "$1" "$aufs_memory/modules/$mod"
+        if [ ! -d "$aufs_union"/mnt/"$mod" ]; then
+                mkdir -p "$aufs_union"/mnt/modules/"$mod" || return
         fi
 
-        union_insert_dir "$aufs_union" "$aufs_memory/modules/$mod"
+        mount -o loop,ro "$1" "$aufs_union"/mnt/modules/"$mod"
+        union_insert_dir "$aufs_union" "$aufs_union"/mnt/modules/"$mod"
 }
 
 # Implements RC_NO_UMOUNTS variable into $CHROOT/etc/rc.conf for a cleaner shutdown process

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 3098866..951f5e1 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -265,7 +265,7 @@ do
 		;;
 		# Allow user to specify the modules location
 		aufs.modules\=*)
-			aufs_modules_dev=${x#*=}
+			aufs_modules_dir=${x#*=}
                         aufs_modules=1
 		;;
 		unionfs)
@@ -786,16 +786,20 @@ distfiles       /usr/portage/distfiles          tmpfs   defaults        0 0
 FSTAB
                 fi
 
-                # When aufs.modules= is used
-                if [ 1 = "$aufs_modules" ]; then
-                        warn_msg "Adding all modules in $aufs_modules_dev/modules/"
+                # When aufs.modules= is used or $CDROOT_PATH/modules
+                # directory is available
+                if [[ 1 = "$aufs_modules" || -d $CDROOT_PATH/modules ]]; then
+                        warn_msg "Adding all modules in $aufs_modules_dir/modules/"
 
-                        if [ -z "$aufs_modules_dev" ]; then
+                        if [ mnt/cdrom = "$aufs_modules_dir" ]; then
 		                union_insert_modules "$CDROOT_PATH"
-		        else
-			        mkdir "$NEW_ROOT/mnt/modulesd"
-			        mount "$aufs_modules_dev" "$NEW_ROOT/mnt/modulesd"
-			        union_insert_modules "$NEW_ROOT/mnt/modulesd"
+                        elif [ ! -b "$aufs_modules_dir" ]; then
+                                bad_msg "$aufs_modules_dir is not a valid block device"
+                                bad_msg "aborting modules insert into $aufs_union"
+                        else
+                                mkdir /mnt/modules
+			        mount "$aufs_modules_dir" /mnt/modules
+			        union_insert_modules /mnt/modules
                         fi
                 fi
 

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

[Richard Farina]

commit:     74b1357985c41affab2210c09c9a84108a5171ad
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Thu Jun  5 01:29:32 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=74b13579

Fixes a bug introduced by 8405e23 that broke none AUFS boots

 defaults/initrd.defaults | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index b08ff50..2d79fc3 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -68,6 +68,7 @@ CDROOT_PATH='/mnt/cdrom'
 CDROOT_MARKER='/livecd'
 
 # AUFS variables
+USE_AUFS_NORMAL=0
 AUFS_MODULES=false
 AUFS_CHANGES=false
 AUFS_CHANGESFILE=livecd.aufs

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

[Richard Farina]

commit:     4ae1ad8d8d50cc1d26fb03b715af4b63ab8807fa
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Wed Jun  4 23:04:30 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4ae1ad8d

This introduces changes to former commits d8e2d4d & 720a60f in
which there are fstab changes and tmpfs mounts which are combined
into one /etc/fstab instead.

 defaults/linuxrc | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index a6c4806..8b3ff87 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -794,9 +794,19 @@ then
                 # Function to handle the RC_NO_UMOUNTS variable in ${CHROOT}/etc/rc.conf
                 conf_rc_no_umounts
 
-                # Fstab change for aufs
-                test ! $(grep -o ^aufs "${CHROOT}"/etc/fstab) &&
-                        echo "aufs / aufs defaults 0 0" > "${CHROOT}"/etc/fstab
+                # Fstab changes for aufs
+                if ! grep -q '^aufs' "${CHROOT}"/etc/fstab 2>/dev/null; then
+                        for i in /var/tmp /tmp /usr/portage/distfiles; do
+                                [ ! -d "${CHROOT}${i}" ] && mkdir -p "${CHROOT}${i}"
+                        done
+
+                        cat > "${CHROOT}"/etc/fstab << FSTAB
+aufs            /                               aufs    defaults        0 0
+vartmp          /var/tmp                        tmpfs   defaults        0 0
+tmp             /tmp                            tmpfs   defaults        0 0
+distfiles       /usr/portage/distfiles          tmpfs   defaults        0 0
+FSTAB
+                fi
 
                 if ${AUFS_MODULES}; then
                         warn_msg "Adding all modules in $MODULESD/modules/"
@@ -990,22 +1000,6 @@ then
 		chmod 755 "${CHROOT}${i}"
 	done
 
-	# This will prevent from putting junk on the CHANGESDEV
-	str=""
-	for i in /tmp /var/tmp /usr/portage/distfiles
-	do
-		mkdir -p "${CHROOT}${i}"
-		chmod 755 "${CHROOT}${i}"
-
-		mount -t tmpfs tmpfs "${CHROOT}${i}"
-		str="${i} ${str}"
-	done
-
-	warn_msg "${str}are mounted in ram"
-	warn_msg "consider saving important files elsewhere"
-
-        sleep 2
-
         for i in ${CDROOT_PATH} ${overlay} ${static}; do
                 mount --move ${NEW_ROOT}${i} ${CHROOT}${i}
         done

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

[Richard Farina]

commit:     ab3a4401123ef0a732200166fcfeebc8dca9a72a
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Mon Jun 23 17:58:33 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ab3a4401

Coding style changes throughout all the AUFS related code.

 defaults/initrd.defaults |   4 +-
 defaults/initrd.scripts  | 179 ++++++++++++++++++-------------------
 defaults/linuxrc         | 227 +++++++++++++++++++++--------------------------
 3 files changed, 188 insertions(+), 222 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 2d79fc3..17847fe 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -58,7 +58,7 @@ KSUFF='.ko'
 REAL_ROOT=''
 CONSOLE='/dev/console'
 NEW_ROOT='/newroot'
-RC_NO_UMOUNTS="/newroot|/newroot/mnt/changesdev|/mnt/overlay|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino"
+RC_NO_UMOUNTS="/newroot|/newroot/mnt/changesdev|/mnt/rw_branch|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino"
 CDROOT='0'
 CDROOT_DEV=''
 CDROOT_TYPE='auto'
@@ -71,7 +71,7 @@ CDROOT_MARKER='/livecd'
 USE_AUFS_NORMAL=0
 AUFS_MODULES=false
 AUFS_CHANGES=false
-AUFS_CHANGESFILE=livecd.aufs
+AUFS_CHANGESFILE=/livecd.aufs
 
 LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop'
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 91056b1..c258c00 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -314,8 +314,7 @@ union_insert_modules() {
 # This should really go into /etc/init.d/localmounts but until then we manually set this here
 conf_rc_no_umounts() {
         local conf nomount fnd
-        conf="${CHROOT}/etc/rc.conf"
-        fnd=0
+        conf=$CHROOT/etc/rc.conf fnd=0
 
         if nomount=$(grep -n '^[[:blank:]]*RC_NO_UMOUNTS=' $conf); then
                 local i n data cmd IFS
@@ -350,33 +349,28 @@ conf_rc_no_umounts() {
 create_changefs() {
 	local size
 
-	while [ 1 ]
-	do
+	while :; do
 		read -p '<< Size of file (Press Enter for default 256 Mb): ' size
-		if [ -z "${size}" ]; then
-		        size=256
-		fi
-		size="${size}"
 
-                if [ ${size} -lt 16 ]
-		then
-			bad_msg "Please give a size of at least 16 Mb"
+                [ -n "$size" ] || size=256
+
+                size=$size
+
+                if [ 15 -ge "$size" ]; then
+                        bad_msg "Please give a size of at least 16 Megabytes"
 		else
-			dd if=/dev/zero of=${CHANGESMNT}/${AUFS_CHANGESFILE} bs=1M count=${size} &>/dev/null
-			if [ $? = '0' ]
-			then
-				good_msg "Creation of ${AUFS_CHANGESFILE}, ${size} Mb on ${CHANGESDEV} successful, formatting it ext2"
-				mke2fs -F ${CHANGESMNT}/${AUFS_CHANGESFILE} &>/dev/null
+			if dd if=/dev/zero "of=$CHANGESMNT$AUFS_CHANGESFILE" bs=1M count="$size" &>/dev/null; then
+				good_msg "Creation of $AUFS_CHANGESFILE, ${size}Mb on $CHANGESDEV successful, formatting it ext2"
+				mke2fs -F "$CHANGESMNT$AUFS_CHANGESFILE" >/dev/null
                                 AUFS_CHANGES=true
 				break
 			else
-				rm -f ${CHANGESMNT}/${AUFS_CHANGESFILE}
-				bad_msg "Unable to create ${AUFS_CHANGESFILE} on ${CHANGESDEV} of ${size} Mb"
+				rm -f "$CHANGESMNT$AUFS_CHANGESFILE"
+				bad_msg "Unable to create ${AUFS_CHANGESFILE#*/} on $CHANGESDEV of ${size}Mb"
 				bad_msg "Ensure your disk is not full or read-only"
+
 				read -p '<< Type "a" to abort, anything else to continue : ' doabort
-				if [ "${doabort}" = "a" ]; then
-					return 1
-				fi
+				if [ a = "$doabort" ]; then return 1; fi
 			fi
 		fi
 	done
@@ -386,87 +380,80 @@ create_changefs() {
 setup_aufs() {
 	bootstrapCD
 
-	if [ -n "${AUFS}" ]
-	then
-		if [ "${AUFS}" = "detect" ]
-		then
-			CHANGESMNT="${NEW_ROOT}${CDROOT_PATH}"
-			CHANGESDEV=${REAL_ROOT}
+	if [ -n "$AUFS" ]; then
+		if [ detect = "$AUFS" ]; then
+			CHANGESMNT=$NEW_ROOT$CDROOT_PATH
+			CHANGESDEV=$REAL_ROOT
 		else
-			CHANGESDEV=${AUFS}
-			good_msg "Mounting ${CHANGESDEV} to ${MEMORY} for aufs support"
-			mount -t auto ${CHANGESDEV} ${CHANGESMNT} &>/dev/null
-			ret=$?
-			if [ "${ret}" -ne 0 ]
-			then
-				bad_msg "Mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs"
+			CHANGESDEV=$AUFS
+			good_msg "Mounting $CHANGESDEV to $MEMORY for aufs support"
+
+			if ! mount -t auto "$CHANGESDEV" "$CHANGESMNT" &>/dev/null; then
+				bad_msg "Mount of $CHANGESDEV failed, falling back to ramdisk based aufs"
 				unset AUFS
 			fi
 		fi
+
 		# Check and attempt to create the changesfile
-		if [ ! -e ${CHANGESMNT}/${AUFS_CHANGESFILE} ] && [ -n "${AUFS}" ]
-		then
+		if [ ! -e $CHANGESMNT$AUFS_CHANGESFILE ] && [ -n "$AUFS" ]; then
 			create_changefs
-			mount -t auto ${CHANGESMNT}/${AUFS_CHANGESFILE} ${MEMORY}
-		elif [ -n "${AUFS}" ]
-		then
-			local nbpass=0
-			while [ 1 ]
-			do
-				mount -t auto ${CHANGESMNT}/${AUFS_CHANGESFILE} ${MEMORY}
-				ret=$?
-				if [ "${ret}" -ne 0 ]
-				then
-					if [ ${nbpass} -eq 0 ]
-					then
-						bad_msg "Mounting of changes file failed, Running e2fsck"
-						e2fsck ${CHANGESMNT}/${AUFS_CHANGESFILE}
-						nbpass=$((${nbpass} + 1))
-					else
-						bad_msg "Mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs"
-						bad_msg "your ${AUFS_CHANGESFILE} might be messed up, and I couldn't fix it"
-						bad_msg "moving ${AUFS_CHANGESFILE} to ${AUFS_CHANGESFILE}.bad"
-						mv ${CHANGESMNT}/${AUFS_CHANGESFILE} ${CHANGESMNT}/${AUFS_CHANGESFILE}.bad
-						bad_msg "Try to fix it yourself with e2fsck"
+			mount -t auto "$CHANGESMNT$AUFS_CHANGESFILE" "$MEMORY"
+		elif [ -n "$AUFS" ]; then
+			while :; do
+                                if mount -t auto "$CHANGESMNT$AUFS_CHANGESFILE" "$MEMORY" &>/dev/null; then
+                                        break
+                                else
+                                        bad_msg "Mounting of changes file failed, Running e2fsck"
+
+                                        if ! hash e2fsck &>/dev/null; then
+                                                bad_msg "/sbin/e2fsck not found! aborting filesystem check"
+                                                bad_msg "Moving ${AUFS_CHANGESFILE#*/} to ${AUFS_CHANGESFILE#*/}.bad"
+
+                                                mv "$CHANGESMNT$AUFS_CHANGESFILE" "$CHANGESMNT$AUFS_CHANGESFILE.bad"
+                                                break
+
+                                        fi
+
+                                        if e2fsck "$CHANGESMNT$AUFS_CHANGESFILE" &>/dev/null; then
+                                                good_msg "e2fsck ran successfully. Please verify data after bootup"
+                                        else
+						bad_msg "Your ${AUFS_CHANGESFILE#*/} image might be corrupted"
+						bad_msg "moving ${AUFS_CHANGESFILE#*/} to ${AUFS_CHANGESFILE#*/}.bad"
+
+                                                mv "$CHANGESMNT$AUFS_CHANGESFILE" "$CHANGESMNT$AUFS_CHANGESFILE.bad"
 						break
 					fi
-				else
-					if [ ${nbpass} -eq 1 ]
-					then
-						good_msg "e2fsck ran successfully. Please check your files after bootup"
-					fi
-					break
 				fi
 			done
 		fi
 		# mount tmpfs only in the case when changes= boot parameter was
 		# empty or we were not able to mount the storage device
-		if [ "${CDROOT}" -eq '1' -a ! -f ${CHANGESMNT}/${AUFS_CHANGESFILE}  ]
-		then
-                        XINO=${MEMORY}
-			umount ${MEMORY} &>/dev/null
-			bad_msg "Failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}"
-			bad_msg "Create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs"
-			bad_msg "Falling back to ramdisk based aufs for safety"
+		if [ 1 = "$CDROOT" ] && [ ! -f "$CHANGESMNT$AUFS_CHANGESFILE" ]; then
+                        XINO=$MEMORY
+			umount "$MEMORY" &>/dev/null
+
+			bad_msg "Create an extfs ${AUFS_CHANGESFILE#*/} file on this device"
+                        bad_msg "if you wish to have aufs data persistency on reboots"
+			bad_msg "Falling back to ramdisk based aufs"
                         good_msg "Mounting ramdisk to $MEMORY for aufs support"
-			mount -t tmpfs tmpfs ${MEMORY}
+
+                        mount -t tmpfs tmpfs "$MEMORY"
 		else
-			XINO=${MEMORY}/xino
-			mkdir -p ${XINO}
-			mount -t tmpfs tmpfs ${XINO}
+			XINO=$MEMORY/xino
+
+                        mkdir -p "$XINO"
+			mount -t tmpfs aufs-xino "$XINO"
 		fi
 	else
-		good_msg "Mounting ramdisk to $MEMORY for aufs support"
-		mount -t tmpfs tmpfs ${MEMORY}
-		XINO=${MEMORY}
+                XINO=$MEMORY
+
+                good_msg "Mounting ramdisk to $MEMORY for aufs support"
+		mount -t tmpfs tmpfs "$MEMORY"
 	fi
 
-	mkdir -p ${CHANGES}
-	mount -t aufs -n -o nowarn_perm,udba=none,xino=${XINO}/.aufs.xino,br:${CHANGES}=rw aufs ${UNION}
-	ret=$?
-	if [ "${ret}" -ne 0 ]
-	then
-		bad_msg "Can't setup union ${UNION} in directory!"
+	mkdir -p "$CHANGES"
+        if ! mount -t aufs -n -o "nowarn_perm,udba=none,xino=$XINO/.aufs.xino,br:$CHANGES=rw" aufs "$UNION"; then
+		bad_msg "Can't setup union $UNION in directory!"
 		USE_AUFS_NORMAL=0
 	fi
 }
@@ -1420,22 +1407,24 @@ getdvhoff() {
 
 setup_squashfs_aufs() {
 	# Setup aufs directories and vars
-	overlay=/mnt/overlay
-	static=/mnt/livecd
+	rw_branch=/mnt/rw_branch ro_branch=/mnt/livecd
 
-	for i in "${overlay}" "${static}"; do
-		[ ! -d "${i}" ] && mkdir -p "${i}"
+	for dir in $rw_branch $ro_branch; do
+		[ ! -d $dir ] && mkdir -p "$dir"
 	done
-	good_msg "Loading aufs"
-	modprobe aufs > /dev/null 2>&1
 
-	mount -t squashfs -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${static}"
-	mount -t tmpfs none "${overlay}"
-	mount -t aufs -o br:${overlay}:${static} aufs "${NEW_ROOT}"
+	good_msg "Loading aufs module ..."
+	modprobe aufs &>/dev/null
 
-	[ ! -d "${NEW_ROOT}${overlay}" ] && mkdir -p "${NEW_ROOT}${overlay}"
-	[ ! -d "${NEW_ROOT}${static}" ] && mkdir -p "${NEW_ROOT}${static}"
-	for i in "${overlay}" "${static}"; do mount --move "${i}" "${NEW_ROOT}${i}"; done
+	mount -t squashfs -o loop,ro "$CDROOT_PATH/$LOOPEXT$LOOP" "$ro_branch"
+	mount -t tmpfs none "$rw_branch"
+	mount -t aufs -o "br:$rw_branch:$ro_branch" aufs "$NEW_ROOT"
+
+	[ ! -d $NEW_ROOT$rw_branch ] && mkdir -p "$NEW_ROOT$rw_branch"
+	[ ! -d $NEW_ROOT$ro_branch ] && mkdir -p "$NEW_ROOT$ro_branch"
+	for mount in $rw_branch $ro_branch; do
+                mount --move "$mount" "$NEW_ROOT$mount"
+        done
 }
 
 setup_unionfs() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 8b3ff87..5a341af 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -255,31 +255,17 @@ do
 		;;
 		aufs\=*)
 			USE_AUFS_NORMAL=1
-			echo ${x#*=} | grep , &>/dev/null
 
-			if [ "$?" -eq '0' ]
-			then
+			if echo "${x#*=}" | grep , &>/dev/null; then
 				UID=${x#*,}
 				AUFS=${x%,*}
 			else
 				AUFS=${x#*=}
 			fi
 		;;
-		aufs.changes\=*)
-                        USE_AUFS_NORMAL=1
-                        echo ${x#*=} | grep , &>/dev/null
-
-                        if [ "$?" -eq '0' ]
-                        then
-                                UID=${x#*,}
-                                AUFS=${x%,*}
-                        else
-                                AUFS=${x#*=}
-                        fi
-                ;;
 		aufs.persistent)
 			USE_AUFS_NORMAL=1
-			AUFS="detect"
+			AUFS=detect
 		;;
 		# Allow user to specify the modules location
 		aufs.modules\=*)
@@ -461,16 +447,14 @@ then
         # Setup the root filesystem
         bootstrapFS
 
-	if [ "${USE_AUFS_NORMAL}" -eq '1' ]
-	then
+	if [ 1 = "$USE_AUFS_NORMAL" ]; then
                 setup_aufs
-		CHROOT=${UNION}
+		CHROOT=$UNION
 	else
 		CHROOT=${NEW_ROOT}
 	fi
 
-	if [ "${REAL_ROOT}" != "/dev/nfs" ] && [ "${LOOPTYPE}" != "sgimips" ] && [ "${USE_AUFS_NORMAL}" != '1' ]
-	then
+	if [ /dev/nfs != "$REAL_ROOT" ] && [ sgimips != "$LOOPTYPE" ] && [ 1 != "$USE_AUFS_NORMAL" ]; then
 		bootstrapCD
 	fi
 
@@ -502,7 +486,7 @@ then
 fi
 
 # Determine root device
-good_msg 'Determining root device...'
+good_msg 'Determining root device ...'
 while true
 do
 	while [ "${got_good_root}" != '1' ]
@@ -720,7 +704,7 @@ then
 			FS_LOCATION='mnt/livecd'
 		elif [ "${LOOPTYPE}" = 'squashfs' ]
 		then
-			if [ "${USE_AUFS_NORMAL}" != '1' ]; then
+			if [ 1 != "$USE_AUFS_NORMAL" ]; then
 				good_msg 'Mounting squashfs filesystem'
 				_CACHED_SQUASHFS_PATH="${NEW_ROOT}/mnt/${LOOP}"
 				_squashfs_path="${CDROOT_PATH}/${LOOPEXT}${LOOP}"  # Default to uncached
@@ -782,25 +766,23 @@ then
 		fi
 	fi # if [ -n "${CRYPT_ROOT}" ]
 
-	if [ "${USE_AUFS_NORMAL}" -eq '1' ]
-	then
-		union_insert_dir ${CHROOT} ${NEW_ROOT}/${FS_LOCATION}
-
-		# Make sure fstab notes livecd is mounted ro.  Makes system skip remount which fails on aufs dirs.
-		# TODO: remounting all tmpfs as RO seems weird, can we be more specific?
-		#sed -e 's|\(.*\s/\s*tmpfs\s*\)defaults\(.*\)|\1defaults,ro\2|' /${UNION}/etc/fstab > /${UNION}/etc/fstab.new
-		#mv /${UNION}/etc/fstab.new /${UNION}/etc/fstab
+	if [ 1 = "$USE_AUFS_NORMAL" ]; then
+		union_insert_dir "$CHROOT" "$NEW_ROOT/$FS_LOCATION"
 
                 # Function to handle the RC_NO_UMOUNTS variable in ${CHROOT}/etc/rc.conf
                 conf_rc_no_umounts
 
                 # Fstab changes for aufs
-                if ! grep -q '^aufs' "${CHROOT}"/etc/fstab 2>/dev/null; then
-                        for i in /var/tmp /tmp /usr/portage/distfiles; do
-                                [ ! -d "${CHROOT}${i}" ] && mkdir -p "${CHROOT}${i}"
+                if ! grep -q '^aufs' "$CHROOT/etc/fstab" 2>/dev/null; then
+                        for dir in /var/tmp /tmp /usr/portage/distfiles; do
+                                [ ! -d $CHROOT$dir ] && mkdir -p "$CHROOT$dir"
                         done
 
-                        cat > "${CHROOT}"/etc/fstab << FSTAB
+                        cat > "$CHROOT/etc/fstab" << FSTAB
+####################################################
+## ATTENTION: THIS IS THE FSTAB ON THE LIVECD   ##
+## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##
+####################################################
 aufs            /                               aufs    defaults        0 0
 vartmp          /var/tmp                        tmpfs   defaults        0 0
 tmp             /tmp                            tmpfs   defaults        0 0
@@ -808,30 +790,29 @@ distfiles       /usr/portage/distfiles          tmpfs   defaults        0 0
 FSTAB
                 fi
 
-                if ${AUFS_MODULES}; then
+                if $AUFS_MODULES; then
                         warn_msg "Adding all modules in $MODULESD/modules/"
 
-                        if [ -z "${MODULESD}" ]
-                        then
-		                union_insert_modules ${CDROOT_PATH}
+                        if [ -z "$MODULESD" ]; then
+		                union_insert_modules "$CDROOT_PATH"
 		        else
-			        mkdir ${NEW_ROOT}/mnt/modulesd
-			        mount "${MODULESD}" ${NEW_ROOT}/mnt/modulesd
-			        union_insert_modules ${NEW_ROOT}/mnt/modulesd
+			        mkdir "$NEW_ROOT/mnt/modulesd"
+			        mount "$MODULESD" "$NEW_ROOT/mnt/modulesd"
+			        union_insert_modules "$NEW_ROOT/mnt/modulesd"
                         fi
                 fi
 
                 # Copy user keymap file
                 if [ -e /etc/sysconfig/keyboard ]; then
-                        [ ! -d ${CHROOT}/etc/sysconfig ] && mkdir -p ${CHROOT}/etc/sysconfig
-                        cp /etc/sysconfig/keyboard ${CHROOT}/etc/sysconfig/
+                        [ ! -d $CHROOT/etc/sysconfig ] && mkdir -p "$CHROOT/etc/sysconfig"
+                        cp /etc/sysconfig/keyboard "$CHROOT/etc/sysconfig/"
                 fi
 
                 # Create the directories for our new union mounts
-                test ! -d "${CHROOT}${NEW_ROOT}" && mkdir -p "${CHROOT}${NEW_ROOT}"
+                [ ! -d $CHROOT$NEW_ROOT ] && mkdir -p "$CHROOT$NEW_ROOT"
 
-                if ${AUFS_CHANGES} && [ ! -d "${CHROOT}${NEW_ROOT}/mnt/changesdev" ]; then
-                        mkdir -p "${CHROOT}${NEW_ROOT}/mnt/changesdev"
+                if $AUFS_CHANGES && [ ! -d $CHROOT$NEW_ROOT/mnt/changesdev ]; then
+                        mkdir -p "$CHROOT$NEW_ROOT/mnt/changesdev"
                 fi
 	fi
 
@@ -856,67 +837,67 @@ FSTAB
 	then
 		setup_unionfs ${NEW_ROOT} /${FS_LOCATION}
 		CHROOT=/union
-	else
-		#XXX Note to potential reviewers. diff formats this section very very oddly. Be sure to review this hunk after applied, do NOT simply read the diff
-		if [ ! "${USE_AUFS_NORMAL}" -eq '1' ]
-		then
-			good_msg "Copying read-write image contents to tmpfs"
-			# Copy over stuff that should be writable
-			(cd "${NEW_ROOT}/${FS_LOCATION}"; cp -a ${ROOT_TREES} "${NEW_ROOT}") || {
-				bad_msg "Copying failed, dropping into a shell."
-				do_rundebugshell
-			}
-
-			# Now we do the links.
-			for x in ${ROOT_LINKS}
-			do
-				if [ -L "${NEW_ROOT}/${FS_LOCATION}/${x}" ]
-				then
-					ln -s "$(readlink ${NEW_ROOT}/${FS_LOCATION}/${x})" "${x}" 2>/dev/null
-				else
-					# List all subdirectories of x
-					find "${NEW_ROOT}/${FS_LOCATION}/${x}" -type d 2>/dev/null | while read directory
-					do
-						# Strip the prefix of the FS_LOCATION
-						directory="${directory#${NEW_ROOT}/${FS_LOCATION}/}"
-
-						# Skip this directory if we already linked a parent directory
-						if [ "${current_parent}" != '' ]; then
-							var=$(echo "${directory}" | grep "^${current_parent}")
-							if [ "${var}" != '' ]; then
-								continue
-							fi
-						fi
-						# Test if the directory exists already
-						if [ -e "/${NEW_ROOT}/${directory}" ]
-						then
-							# It does exist, link all the individual files
-							for file in $(ls /${NEW_ROOT}/${FS_LOCATION}/${directory})
-							do
-								if [ ! -d "/${NEW_ROOT}/${FS_LOCATION}/${directory}/${file}" ] && [ ! -e "${NEW_ROOT}/${directory}/${file}" ]; then
-									ln -s "/${FS_LOCATION}/${directory}/${file}" "${directory}/${file}" 2> /dev/null
-								fi
-							done
-						else
-							# It does not exist, make a link to the livecd
-							ln -s "/${FS_LOCATION}/${directory}" "${directory}" 2>/dev/null
-							current_parent="${directory}"
-						fi # if [ -e "/${NEW_ROOT}/${directory}" ] ... else
-					done # while read directory
-				fi # if [ -L "${NEW_ROOT}/${FS_LOCATION}/${x}" ] ... else
-			done # for x in ${ROOT_LINKS}
-			mkdir -p initramfs proc tmp run sys 2>/dev/null
-			chmod 1777 tmp
-
-		fi # if [ ! "${USE_AUFS_NORMAL}" -eq '1' ]
-		#XXX: end extremely confusing hunk
-
-		# have handy /mnt/cdrom (CDROOT_PATH) as well
-		_new_cdroot="${NEW_ROOT}${CDROOT_PATH}"
-		[ ! -d "${_new_cdroot}" ] && mkdir -p "${_new_cdroot}"
-		mount --bind "${CDROOT_PATH}" "${_new_cdroot}"
-
-	fi # if [ "${USE_UNIONFS_NORMAL}" = '1' ] ... else
+        else
+                #XXX Note to potential reviewers. diff formats this section very very oddly. Be sure to review this hunk after applied, do NOT simply read the diff
+                if [ ! "${USE_AUFS_NORMAL}" -eq '1' ]
+                then
+                        good_msg "Copying read-write image contents to tmpfs"
+                        # Copy over stuff that should be writable
+                        (cd "${NEW_ROOT}/${FS_LOCATION}"; cp -a ${ROOT_TREES} "${NEW_ROOT}") || {
+                                bad_msg "Copying failed, dropping into a shell."
+                                do_rundebugshell
+                        }
+
+                        # Now we do the links.
+                        for x in ${ROOT_LINKS}
+                        do
+                                if [ -L "${NEW_ROOT}/${FS_LOCATION}/${x}" ]
+                                then
+                                        ln -s "$(readlink ${NEW_ROOT}/${FS_LOCATION}/${x})" "${x}" 2>/dev/null
+                                else
+                                        # List all subdirectories of x
+                                        find "${NEW_ROOT}/${FS_LOCATION}/${x}" -type d 2>/dev/null | while read directory
+                                        do
+                                                # Strip the prefix of the FS_LOCATION
+                                                directory="${directory#${NEW_ROOT}/${FS_LOCATION}/}"
+
+                                                # Skip this directory if we already linked a parent directory
+                                                if [ "${current_parent}" != '' ]; then
+                                                        var=$(echo "${directory}" | grep "^${current_parent}")
+                                                        if [ "${var}" != '' ]; then
+                                                                continue
+                                                        fi
+                                                fi
+                                                # Test if the directory exists already
+                                                if [ -e "/${NEW_ROOT}/${directory}" ]
+                                                then
+                                                        # It does exist, link all the individual files
+                                                        for file in $(ls /${NEW_ROOT}/${FS_LOCATION}/${directory})
+                                                        do
+                                                                if [ ! -d "/${NEW_ROOT}/${FS_LOCATION}/${directory}/${file}" ] && [ ! -e "${NEW_ROOT}/${directory}/${file}" ]; then
+                                                                        ln -s "/${FS_LOCATION}/${directory}/${file}" "${directory}/${file}" 2> /dev/null
+                                                                fi
+                                                        done
+                                                else
+                                                        # It does not exist, make a link to the livecd
+                                                        ln -s "/${FS_LOCATION}/${directory}" "${directory}" 2>/dev/null
+                                                        current_parent="${directory}"
+                                                fi # if [ -e "/${NEW_ROOT}/${directory}" ] ... else
+                                        done # while read directory
+                                fi # if [ -L "${NEW_ROOT}/${FS_LOCATION}/${x}" ] ... else
+                        done # for x in ${ROOT_LINKS}
+                        mkdir -p initramfs proc tmp run sys 2>/dev/null
+                        chmod 1777 tmp
+
+                fi # if [ ! "${USE_AUFS_NORMAL}" -eq '1' ]
+                #XXX: end extremely confusing hunk
+
+                # have handy /mnt/cdrom (CDROOT_PATH) as well
+                _new_cdroot="${NEW_ROOT}${CDROOT_PATH}"
+                [ ! -d "${_new_cdroot}" ] && mkdir -p "${_new_cdroot}"
+                mount --bind "${CDROOT_PATH}" "${_new_cdroot}"
+
+        fi # if [ "${USE_UNIONFS_NORMAL}" = '1' ] ... else
 
 	#UML=$(cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||')
 	#if [ "${UML}" = 'UML' ]
@@ -928,18 +909,16 @@ FSTAB
 	# Let Init scripts know that we booted from CD
 	export CDBOOT
 	CDBOOT=1
-else # if [ "${CDROOT}" = '1' ]
+else
 	if [ "${USE_UNIONFS_NORMAL}" = '1' ]
 	then
 		mkdir /union_changes
 		mount -t tmpfs tmpfs /union_changes
 		setup_unionfs /union_changes ${NEW_ROOT}
 		mkdir -p ${UNION}/tmp/.initrd
-	fi
-	if [ "${USE_AUFS_NORMAL}" -eq '1' ]
-	then
-		union_insert_dir ${UNION} ${NEW_ROOT}
-		mkdir -p ${UNION}/tmp/.initrd
+	elif [ 1 = "$USE_AUFS_NORMAL" ]; then
+		union_insert_dir "$UNION" "$NEW_ROOT"
+		mkdir -p "$UNION/tmp/.initrd"
 	fi
 
 fi # if [ "${CDROOT}" = '1' ]
@@ -986,22 +965,20 @@ fi
 
 verbose_kmsg
 
-if [ "${USE_AUFS_NORMAL}" -eq '1' ]
-then
-        UNION_MEMORY=${CHROOT}/.unions/memory
+if [ 1 = "$USE_AUFS_NORMAL" ]; then
+        UNION_MEMORY=$CHROOT/.unions/memory
 
-	mkdir -p "${UNION_MEMORY}"
-	mount --move "${MEMORY}" "${UNION_MEMORY}"
+	mkdir -p "$UNION_MEMORY"
+	mount --move "$MEMORY" "$UNION_MEMORY"
         test_success "Failed to move aufs /memory into the system root"
 
-        for i in /mnt/gentoo /mnt/livecd /mnt/overlay ${CDROOT_PATH}
-	do
-		mkdir -p "${CHROOT}${i}"
-		chmod 755 "${CHROOT}${i}"
+        for dir in /mnt/gentoo $rw_branch $ro_branch $CDROOT_PATH; do
+		mkdir -p "$CHROOT$dir"
+		chmod 755 "$CHROOT$dir"
 	done
 
-        for i in ${CDROOT_PATH} ${overlay} ${static}; do
-                mount --move ${NEW_ROOT}${i} ${CHROOT}${i}
+        for dir in $CDROOT_PATH $rw_branch $ro_branch; do
+                mount --move "$NEW_ROOT$dir" "$CHROOT$dir"
         done
 fi
 

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

[Richard Farina]

commit:     fb8b21b62d5aa0ce2a378610b1b15dabb1b002a2
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 23 00:19:43 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fb8b21b6

/usr/portage/distfiles shouldn't be tmpfs

It really doesn't make sense for /usr/portage/distfiles to be tmpfs,
plus, if a user is using aufs and trying to save changes we don't want
to lose these files.  Only /tmp and /var/tmp should be tmpfs.

 defaults/linuxrc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 951f5e1..19b9878 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -770,7 +770,7 @@ then
 
                 # Fstab changes for aufs
                 if ! grep -q '^aufs' "$CHROOT/etc/fstab" 2>/dev/null; then
-                        for dir in /var/tmp /tmp /usr/portage/distfiles; do
+                        for dir in /var/tmp /tmp; do
                                 [ ! -d $CHROOT$dir ] && mkdir -p "$CHROOT$dir"
                         done
 
@@ -782,7 +782,6 @@ then
 aufs            /                               aufs    defaults        0 0
 vartmp          /var/tmp                        tmpfs   defaults        0 0
 tmp             /tmp                            tmpfs   defaults        0 0
-distfiles       /usr/portage/distfiles          tmpfs   defaults        0 0
 FSTAB
                 fi
 

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

[Richard Farina]

commit:     9dc3dfc0e09e75a3f83c94f28c6d60fb36abab2e
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 23 00:07:28 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9dc3dfc0

aufs changes saving automation

The aufs code has the ability to save changes in a file, however, it
requires the user to manually tell us where the file is.  This code will
automatically check for the file on $CDROOT, as well as automatically
pick up the casper-rw file created by unetbooting for persistence.
Additionally we add the option for aufs=search which will search all
drives for livecd.aufs. Possible later enhancements include searching
other partitions on the CDROOT_DEV for livecd.aufs automatically instead
of needing aufs=search.  Then again, possible later enhancements also
include just always searching, it's shockingly fast to do the search...

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d8142a2..e05809c 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -123,7 +123,7 @@ findmediamount() {
 				fi
 				good_msg "Attempting to mount media: ${x}" ${CRYPT_SILENT}
 
-				mount -r -t ${CDROOT_TYPE} ${x} ${mntcddir} >/dev/null 2>&1
+				mount -t ${CDROOT_TYPE} ${x} ${mntcddir} >/dev/null 2>&1
 				if [ "$?" = '0' ]
 				then
 					if [ -n "${ISOBOOT}" ]; then
@@ -408,12 +408,29 @@ create_changefs() {
 setup_aufs() {
 	bootstrapCD
 
+        if [ "$aufs_dev" = "search" ]; then
+                findmediamount "aufs-dev" "$aufs_union_file" \
+                        "aufs_dev" "$aufs_dev_mnt" $(devicelist)
+                aufs_mounted="1"
+        elif [ -z $aufs_dev ] && [ -w "$CDROOT_PATH/$aufs_union_file" ]; then
+                aufs_dev="$REAL_ROOT"
+                aufs_dev_mnt="$CDROOT_PATH"
+                aufs_mounted="1"
+        fi
+        if [ -z $aufs_dev ] && [ -w "$CDROOT_PATH/casper-rw" ]; then
+                aufs_dev="$REAL_ROOT"
+                aufs_dev_mnt="$CDROOT_PATH"
+                aufs_union_file="/casper-rw"
+                aufs_mounted="1"
+        fi
+
         if [ -n "$aufs_dev" ]; then
                 if [ ! -b $aufs_dev ]; then
                         bad_msg "$aufs_dev is not a valid block device"
                         local invalidblk=1
                         unset aufs_dev
-                else
+		#skip this block when aufs_dev_mnt is already mounted
+                elif [ "$aufs_mounted" != "1" ]; then
                         good_msg "Mounting $aufs_dev to $aufs_memory for aufs support"
 
                         if ! mount -t auto "$aufs_dev" "$aufs_dev_mnt" &>/dev/null; then
@@ -428,6 +445,9 @@ setup_aufs() {
                 elif [ -n "$aufs_dev" ]; then
                         while :; do
                                 if mount -t auto "$aufs_dev_mnt$aufs_union_file" "$aufs_memory" &>/dev/null; then
+                                        if [ "$aufs_union_file" = "/casper-rw" ];then
+                                                bad_msg "Use of livecd.aufs preferred to casper-rw for changes saving, please rename the file."
+                                        fi
                                         break
                                 else
                                         bad_msg "Mounting of changes file failed, Running e2fsck"

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

[Richard Farina]

commit:     160c3b5d7a5f705fbb838042ca9bdba376a7f984
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Sun Aug 17 00:18:36 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=160c3b5d

restructure no_umounts from being set in /etc/rc.conf to /etc/conf.d/localmount

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

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index f2cb42a..f6fd564 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -60,7 +60,7 @@ KSUFF='.ko'
 REAL_ROOT=''
 CONSOLE='/dev/console'
 NEW_ROOT='/newroot'
-RC_NO_UMOUNTS='/newroot|/mnt/aufs-dev|/mnt/aufs-rw-branch|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino'
+no_umounts='/newroot|/mnt/aufs-dev|/mnt/aufs-rw-branch|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino'
 CDROOT='0'
 CDROOT_DEV=''
 CDROOT_TYPE='auto'

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d168b94..8edaea4 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -323,13 +323,12 @@ union_mod() {
         union_insert_dir "$aufs_union" "$aufs_union"/mnt/modules/"$mod"
 }
 
-# Implements RC_NO_UMOUNTS variable into $CHROOT/etc/rc.conf for a cleaner shutdown process
-# This should really go into /etc/init.d/localmounts but until then we manually set this here
+# Implements no_umounts variable into $CHROOT/etc/conf.d/localmount for a cleaner shutdown process
 conf_rc_no_umounts() {
         local conf nomount fnd
-        conf=$CHROOT/etc/rc.conf fnd=0
+        conf=$CHROOT/etc/conf.d/localmount fnd=0
 
-        if nomount=$(grep -n '^[[:blank:]]*RC_NO_UMOUNTS=' $conf); then
+        if nomount=$(grep -n '^[[:blank:]]*no_umounts=' $conf); then
                 local i n data cmd IFS
                 IFS='
 '
@@ -341,20 +340,20 @@ conf_rc_no_umounts() {
                         data=${i#*=}
 
                         case $data in
-                                "\"$RC_NO_UMOUNTS\""|"'$RC_NO_UMOUNTS'") fnd=1;;
+                                "\"$no_umounts\""|"'$no_umounts'") fnd=1;;
                                 *) cmd="$cmd$n d;"
                         esac
                 done
 
                 if [ -n "$cmd" ]; then
                         sed -i "${cmd%;}" $conf
-                        test_success "Unable to edit rc.conf"
+                        test_success "Unable to edit /etc/conf.d/localmount"
                 fi
         fi
 
         if [ 0 -eq "$fnd" ]; then
-                printf 'RC_NO_UMOUNTS="%s"\n' "$RC_NO_UMOUNTS" >> $conf
-                test_success "Unable to write to rc.conf"
+                printf 'no_umounts="%s"\n' "$no_umounts" >> $conf
+                test_success "Unable to write to /etc/conf.d/localmount"
         fi
 }
 

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

[Richard Farina]

commit:     4cfec5769e31d24d16c6cc582c5ab43f286f76b2
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Tue Jun  3 01:36:28 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4cfec576

A new bootstrapFS function has been added to cut on duplicate code
use which both aufs and squashfs boot types use and this it's moved
to the top of the boot process.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index fe563fe..eb5ed6a 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -177,6 +177,52 @@ devicelist(){
 	echo ${DEVICES}
 }
 
+bootstrapFS() {
+        if [ "${USE_AUFS_NORMAL}" -eq '1' ]; then
+                # Directories used for rw changes in union mount filesystem
+                UNION=/union MEMORY=/memory
+
+                # Mountpoint for the changesdev
+                CHANGESMNT=${NEW_ROOT}/mnt/changesdev
+
+                if [ -z "$UID" ]; then
+                        CHANGES=${MEMORY}/aufs_changes/default
+                else
+                        CHANGES=${MEMORY}/aufs_changes/${UID}
+                fi
+
+                mkdir -p ${MEMORY} ${UNION} ${CHANGESMNT}
+        else
+                # Legacy SquashFS implementation
+                good_msg "Making tmpfs for ${NEW_ROOT}"
+                mount -n -t tmpfs tmpfs ${NEW_ROOT}
+        fi
+
+        # Setup the filesystem nodes and directories
+        for i in ${CDROOT_PATH} /mnt/livecd /mnt/key /mnt/gentoo /tmp /tmp/.initrd /dev /proc /run /sys; do
+                mkdir -p "${NEW_ROOT}${i}"
+                chmod 755 "${NEW_ROOT}${i}"
+        done
+
+        [ ! -d "${CDROOT_PATH}" ] && mkdir -p "${CDROOT_PATH}"
+        [ ! -e "${NEW_ROOT}/dev/null" ] && mknod "${NEW_ROOT}"/dev/null c 1 3
+        [ ! -e "${NEW_ROOT}/dev/zero" ] && mknod -m 660 "${NEW_ROOT}"/dev/zero c 1 5
+        [ ! -e "${NEW_ROOT}/dev/console" ] && mknod "${NEW_ROOT}"/dev/console c 5 1
+        [ ! -e "${NEW_ROOT}/dev/ttyS0" ] && mknod -m 600 "${NEW_ROOT}"/dev/ttyS0 c 4 64
+
+        # For SGI LiveCDs
+        if [ "${LOOPTYPE}" = "sgimips" ]; then
+                [ ! -e "${NEW_ROOT}/dev/sr0" ] && mknod "${NEW_ROOT}/dev/sr0" b 11 0
+                [ ! -e "${NEW_ROOT}/dev/loop0" ] && mknod "${NEW_ROOT}/dev/loop0" b 7 0
+        fi
+
+        # Required for splash to work. Not an issue with the initrd as this
+        # device isn't created there and is not needed.
+        for minor in 0 1 ; do
+                [ ! -e "${NEW_ROOT}/dev/$minor" ] && mknod -m 600 "${NEW_ROOT}/dev/tty$minor" c 4 $minor
+        done
+}
+
 bootstrapCD() {
 	local DEVICES=
 
@@ -302,30 +348,8 @@ create_changefs() {
 }
 
 setup_aufs() {
-        # Directory used for rw changes in union mount filesystem
-	UNION=/union
-	MEMORY=/memory
-	# Mountpoint for the changesdev
-	CHANGESMNT=${NEW_ROOT}/mnt/changesdev
-	if [ -z "$UID" ]
-	then
-		CHANGES=${MEMORY}/aufs_changes/default
-	else
-		CHANGES=${MEMORY}/aufs_changes/${UID}
-	fi
-
-	mkdir -p ${MEMORY}
-	mkdir -p ${UNION}
-	mkdir -p ${CHANGESMNT}
-	for i in dev mnt ${CDROOT_PATH} mnt/livecd mnt/key tmp tmp/.initrd mnt/gentoo sys
-	do
-		mkdir -p "${NEW_ROOT}/${i}"
-		chmod 755 "${NEW_ROOT}/${i}"
-	done
-	[ ! -e "${NEW_ROOT}/dev/null" ] && mknod "${NEW_ROOT}"/dev/null c 1 3
-	[ ! -e "${NEW_ROOT}/dev/console" ] && mknod "${NEW_ROOT}"/dev/console c 5 1
-
 	bootstrapCD
+
 	if [ -n "${AUFS}" ]
 	then
 		if [ "${AUFS}" = "detect" ]

diff --git a/defaults/linuxrc b/defaults/linuxrc
index da88bf0..0e40d16 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -458,40 +458,17 @@ rundebugshell "before setting up the root filesystem"
 
 if [ "${CDROOT}" = '1' ]
 then
+        # Setup the root filesystem
+        bootstrapFS
+
 	if [ "${USE_AUFS_NORMAL}" -eq '1' ]
 	then
                 setup_aufs
 		CHROOT=${UNION}
 	else
 		CHROOT=${NEW_ROOT}
-		good_msg "Making tmpfs for ${NEW_ROOT}"
-		mount -n -t tmpfs tmpfs ${NEW_ROOT}
-
-		for i in dev mnt ${CDROOT_PATH} proc run mnt/livecd mnt/key tmp tmp/.initrd mnt/gentoo sys
-		do
-			mkdir -p "${NEW_ROOT}/${i}"
-			chmod 755 "${NEW_ROOT}/${i}"
-		done
-		[ ! -d "${CDROOT_PATH}" ] && mkdir -p "${CDROOT_PATH}"
-		[ ! -e "${NEW_ROOT}/dev/null" ] && mknod -m 666 "${NEW_ROOT}"/dev/null c 1 3
-		[ ! -e "${NEW_ROOT}/dev/zero" ] && mknod -m 666 "${NEW_ROOT}"/dev/zero c 1 5
-		[ ! -e "${NEW_ROOT}/dev/console" ] && mknod -m 600 "${NEW_ROOT}"/dev/console c 5 1
-		[ ! -e "${NEW_ROOT}/dev/ttyS0" ] && mknod -m 660 "${NEW_ROOT}"/dev/ttyS0 c 4 64
 	fi
 
-	# For SGI LiveCDs ...
-	if [ "${LOOPTYPE}" = "sgimips" ]
-	then
-		[ ! -e "${NEW_ROOT}/dev/sr0" ] && mknod "${NEW_ROOT}/dev/sr0" b 11 0
-		[ ! -e "${NEW_ROOT}/dev/loop0" ] && mknod "${NEW_ROOT}/dev/loop0" b 7 0
-	fi
-
-	# Required for splash to work.  Not an issue with the initrd as this
-	# device isn't created there and is not needed.
-	for minor in 0 1 ; do
-		[ ! -e "${NEW_ROOT}/dev/$minor" ] && mknod -m 600 "${NEW_ROOT}/dev/tty$minor" c 4 $minor
-	done
-
 	if [ "${REAL_ROOT}" != "/dev/nfs" ] && [ "${LOOPTYPE}" != "sgimips" ] && [ "${USE_AUFS_NORMAL}" != '1' ]
 	then
 		bootstrapCD

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

[Richard Farina]

commit:     5070080b5bef3ee5c0231f11833f227e3e055520
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Wed Jun 25 16:12:11 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5070080b

This is commit contains several changes summarized below.

1. Changed renaming of RC_NO_UMOUNTS directories
2. Upper to lowercase variables because this is the year 2014
3. Renamed aufs related variables for better readability
4. Fixed a typo in mke2fs command which was missing an "&"
5. Cleaned up setup_squashfs_aufs() function
6. Fixed an issue with legacy squashfs implementation which caused
/mnt/cdrom to be shown twice in 'mount' and removed the --bind and
replaced this with --move
7. Restructured the union_* functions so that we don't parse 'ls'
and enabled globbing
8. Coding style changes
 - rid of the unnecessary braces
 - fix a missing & for mke2fs on livecd.aufs
 - renamed variables for more readabilit
9. Better error handling for changesfs()
10. Removed aufs.persistent since 'aufs' already mounts a tmpfs which
uses half the available ram, and since this feature is not true
persistent we remove it in favor of aufs=<DEV>

 defaults/initrd.defaults |  10 +--
 defaults/initrd.scripts  | 208 ++++++++++++++++++++++++-----------------------
 defaults/linuxrc         | 151 +++++++++++++++++-----------------
 3 files changed, 185 insertions(+), 184 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 17847fe..782fd14 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -12,6 +12,8 @@ BAD="\033[31;1m"
 BOLD="\033[1m"
 GOOD="\033[32;1m"
 
+# Sets the default collation order
+LC_COLLATE=C
 # From KNOPPIX LINUXRC
 # Reset fb color mode
 RESET="^[]R"
@@ -58,7 +60,7 @@ KSUFF='.ko'
 REAL_ROOT=''
 CONSOLE='/dev/console'
 NEW_ROOT='/newroot'
-RC_NO_UMOUNTS="/newroot|/newroot/mnt/changesdev|/mnt/rw_branch|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino"
+RC_NO_UMOUNTS='/newroot|/mnt/aufs-dev|/mnt/aufs-rw-branch|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino'
 CDROOT='0'
 CDROOT_DEV=''
 CDROOT_TYPE='auto'
@@ -68,10 +70,8 @@ CDROOT_PATH='/mnt/cdrom'
 CDROOT_MARKER='/livecd'
 
 # AUFS variables
-USE_AUFS_NORMAL=0
-AUFS_MODULES=false
-AUFS_CHANGES=false
-AUFS_CHANGESFILE=/livecd.aufs
+aufs=0
+aufs_union_file=/livecd.aufs
 
 LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop'
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 9b88d6a..2e48504 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -178,20 +178,20 @@ devicelist(){
 }
 
 bootstrapFS() {
-        if [ "${USE_AUFS_NORMAL}" -eq '1' ]; then
-                # Directories used for rw changes in union mount filesystem
-                UNION=/union MEMORY=/memory
+        if [ 1 = "$aufs" ]; then
+                # Directories used for rw aufs mount filesystem
+                aufs_union=/union aufs_memory=/memory
 
-                # Mountpoint for the changesdev
-                CHANGESMNT=${NEW_ROOT}/mnt/changesdev
+                # Mountpoint for the aufs dev
+                aufs_dev_mnt=/mnt/aufs-dev
 
-                if [ -z "$UID" ]; then
-                        CHANGES=${MEMORY}/aufs_changes/default
+                if [ -z "$aufs_dev_uid" ]; then
+                        aufs_branch=$aufs_memory/aufs-branch/default
                 else
-                        CHANGES=${MEMORY}/aufs_changes/${UID}
+                        aufs_branch=$aufs_memory/aufs-branch/$aufs_dev_uid
                 fi
 
-                mkdir -p ${MEMORY} ${UNION} ${CHANGESMNT}
+                mkdir -p $aufs_memory $aufs_union $aufs_dev_mnt
         else
                 # Legacy SquashFS implementation
                 good_msg "Making tmpfs for ${NEW_ROOT}"
@@ -280,37 +280,51 @@ mount_sysfs() {
 	[ ${ret} -eq 0 ] || bad_msg "Failed to mount /sys!"
 }
 
-# Insert a directory tree ${2} to an union specified by ${1}
+# Insert a directory tree $2 to an union specified by $1
 # Top-level read-write branch is specified by it's index 0
-# ${1} = union absolute path (starting with /)
-# ${2} = path to data directory
+# $1 = union absolute path (starting with /)
+# $2 = path to data directory
 #
 union_insert_dir() {
 	# Always mount it over the precedent (add:1:)
-	mount -n -o remount,add:1:${2}=rr aufs ${1}
-	if [ $? = '0' ]
-	then
-		good_msg "Addition of ${2} to ${1} successful"
+	if mount -n -o "remount,add:1:$2=rr" aufs "$1"; then
+                good_msg "Addition of $2 to $1 successful"
 	fi
 }
 
-# Insert all modules found in $1, usually ${CDROOT_PATH}
+# Insert all modules found in $1, usually $CDROOT_PATH
 # added to allow users to add their own apps.
 union_insert_modules() {
-	for module in $(ls ${NEW_ROOT}/${1}/modules/*.mo 2>/dev/null| sort)
-	do
-		mkdir -p ${MEMORY}/modules/$(basename ${module} .mo)
-		union_insert_dir $UNION ${MEMORY}/modules/$(basename ${module} .mo)
-	done
-	for module in $(ls ${NEW_ROOT}/${1}/modules/*.lzm 2>/dev/null| sort)
-	do
-		mkdir -p ${MEMORY}/modules/$(basename ${module} .lzm)
-		mount -o loop,ro ${module} ${MEMORY}/modules/$(basename ${module} .lzm)
-		union_insert_dir $UNION ${MEMORY}/modules/$(basename ${module} .lzm)
-	done
+        local module
+
+        for module in "$NEW_ROOT/$1/modules/"*.mo; do
+                union_mod "$module" || bad_msg "Unable to load module: '$module'"
+        done
+
+        for module in "$NEW_ROOT/$1/modules/"*.lzm; do
+                union_mod "$module" lzm || bad_msg "Unable to load module: '$module'"
+        done
 }
 
-# Implements RC_NO_UMOUNTS variable into ${CHROOT}/etc/rc.conf for a cleaner shutdown process
+# Helper function for union_insert_modules()
+union_mod() {
+        [ -e "$1" ] || return 0
+
+        local mod
+
+        mod=${1##*/}
+        mod=${mod%.*}
+
+        mkdir -p "$aufs_memory/modules/$mod" || return
+
+        if [ lzm = "$2" ]; then
+                 mount -o loop,ro "$1" "$aufs_memory/modules/$mod"
+        fi
+
+        union_insert_dir "$aufs_union" "$aufs_memory/modules/$mod"
+}
+
+# Implements RC_NO_UMOUNTS variable into $CHROOT/etc/rc.conf for a cleaner shutdown process
 # This should really go into /etc/init.d/localmounts but until then we manually set this here
 conf_rc_no_umounts() {
         local conf nomount fnd
@@ -357,7 +371,7 @@ is_int(){
         done
 }
 
-# Function to create an ext2 fs on $CHANGESDEV, $CHANGESMNT mountpoint
+# Function to create an ext2 fs on $aufs_dev, $aufs_dev_mnt mountpoint
 create_changefs() {
 	local size
 
@@ -372,102 +386,98 @@ create_changefs() {
                 elif [ 15 -ge "$size" ]; then
                         bad_msg "Please give a size of at least 16 Megabytes"
 		else
-			if dd if=/dev/zero "of=$CHANGESMNT$AUFS_CHANGESFILE" bs=1M count="$size" &>/dev/null; then
-				good_msg "Creation of $AUFS_CHANGESFILE, ${size}Mb on $CHANGESDEV successful, formatting it ext2"
-				mke2fs -F "$CHANGESMNT$AUFS_CHANGESFILE" >/dev/null
-                                AUFS_CHANGES=true
+			if dd if=/dev/zero "of=$aufs_dev_mnt$aufs_union_file" bs=1M count="$size" &>/dev/null; then
+				good_msg "Creation of $aufs_union_file, ${size}Mb on $aufs_dev successful, formatting it ext2"
+				mke2fs -F "$aufs_dev_mnt$aufs_union_file" &>/dev/null
 				break
 			else
-				rm -f "$CHANGESMNT$AUFS_CHANGESFILE"
-				bad_msg "Unable to create ${AUFS_CHANGESFILE#*/} on $CHANGESDEV of ${size}Mb"
+				rm "$aufs_dev_mnt$aufs_union_file"
+				bad_msg "Unable to create ${aufs_union_file#*/} on $aufs_dev of ${size}Mb"
 				bad_msg "Ensure your disk is not full or read-only"
 
 				read -p '<< Type "a" to abort, anything else to continue : ' doabort
-				if [ a = "$doabort" ]; then return 1; fi
+				if [ a = "$doabort" ]; then
+                                        bad_msg "Aborting creation of $aufs_union_file!"
+                                        umount "$aufs_dev" && rmdir "$aufs_dev_mnt"
+                                        return 1
+                                fi
 			fi
 		fi
 	done
-	return 0
+	return $?
 }
 
 setup_aufs() {
 	bootstrapCD
 
-	if [ -n "$AUFS" ]; then
-		if [ detect = "$AUFS" ]; then
-			CHANGESMNT=$NEW_ROOT$CDROOT_PATH
-			CHANGESDEV=$REAL_ROOT
-		else
-			CHANGESDEV=$AUFS
-			good_msg "Mounting $CHANGESDEV to $MEMORY for aufs support"
+	if [ -n "$aufs_dev" ]; then
+                good_msg "Mounting $aufs_dev to $aufs_memory for aufs support"
 
-			if ! mount -t auto "$CHANGESDEV" "$CHANGESMNT" &>/dev/null; then
-				bad_msg "Mount of $CHANGESDEV failed, falling back to ramdisk based aufs"
-				unset AUFS
-			fi
+		if ! mount -t auto "$aufs_dev" "$aufs_dev_mnt" &>/dev/null; then
+			bad_msg "Mount of $aufs_dev failed, falling back to ramdisk based aufs"
+			unset aufs_dev
 		fi
 
-		# Check and attempt to create the changesfile
-		if [ ! -e $CHANGESMNT$AUFS_CHANGESFILE ] && [ -n "$AUFS" ]; then
-			create_changefs
-			mount -t auto "$CHANGESMNT$AUFS_CHANGESFILE" "$MEMORY"
-		elif [ -n "$AUFS" ]; then
-			while :; do
-                                if mount -t auto "$CHANGESMNT$AUFS_CHANGESFILE" "$MEMORY" &>/dev/null; then
+                # Check and attempt to create the AUFS union file
+	        if [ ! -e $aufs_dev_mnt$aufs_union_file ] && [ -n "$aufs_dev" ]; then
+		        create_changefs && mount -t auto "$aufs_dev_mnt$aufs_union_file" "$aufs_memory"
+                elif [ -n "$aufs_dev" ]; then
+                        while :; do
+                                if mount -t auto "$aufs_dev_mnt$aufs_union_file" "$aufs_memory" &>/dev/null; then
                                         break
                                 else
                                         bad_msg "Mounting of changes file failed, Running e2fsck"
 
                                         if ! hash e2fsck &>/dev/null; then
                                                 bad_msg "/sbin/e2fsck not found! aborting filesystem check"
-                                                bad_msg "Moving ${AUFS_CHANGESFILE#*/} to ${AUFS_CHANGESFILE#*/}.bad"
+                                                bad_msg "Moving ${aufs_union_file#*/} to ${aufs_union_file#*/}.bad"
 
-                                                mv "$CHANGESMNT$AUFS_CHANGESFILE" "$CHANGESMNT$AUFS_CHANGESFILE.bad"
+                                                mv "$aufs_dev_mnt$aufs_union_file" "$aufs_dev_mnt$aufs_union_file.bad"
                                                 break
-
                                         fi
 
-                                        if e2fsck "$CHANGESMNT$AUFS_CHANGESFILE" &>/dev/null; then
+                                        if e2fsck "$aufs_dev_mnt$aufs_union_file" &>/dev/null; then
                                                 good_msg "e2fsck ran successfully. Please verify data after bootup"
                                         else
-						bad_msg "Your ${AUFS_CHANGESFILE#*/} image might be corrupted"
-						bad_msg "moving ${AUFS_CHANGESFILE#*/} to ${AUFS_CHANGESFILE#*/}.bad"
+                                                bad_msg "Your ${aufs_union_file#*/} image might be corrupted"
+                                                bad_msg "moving ${aufs_union_file#*/} to ${aufs_union_file#*/}.bad"
 
-                                                mv "$CHANGESMNT$AUFS_CHANGESFILE" "$CHANGESMNT$AUFS_CHANGESFILE.bad"
-						break
-					fi
-				fi
-			done
-		fi
-		# mount tmpfs only in the case when changes= boot parameter was
-		# empty or we were not able to mount the storage device
-		if [ 1 = "$CDROOT" ] && [ ! -f "$CHANGESMNT$AUFS_CHANGESFILE" ]; then
-                        XINO=$MEMORY
-			umount "$MEMORY" &>/dev/null
+                                                mv "$aufs_dev_mnt$aufs_union_file" "$aufs_dev_mnt$aufs_union_file.bad"
+                                                break
+                                        fi
+                                fi
+                        done
+                fi
+
+                # Mount tmpfs only in the case when aufs= boot parameter was
+                # empty or we were not able to mount the storage device
+	        if [ 1 = "$CDROOT" ] && [ ! -f "$aufs_dev_mnt$aufs_union_file" ]; then
+                        aufs_xino=$aufs_memory
+                        umount "$aufs_memory" &>/dev/null
 
-			bad_msg "Create an extfs ${AUFS_CHANGESFILE#*/} file on this device"
+                        bad_msg "Create an extfs ${aufs_union_file#*/} file on this device"
                         bad_msg "if you wish to have aufs data persistency on reboots"
-			bad_msg "Falling back to ramdisk based aufs"
-                        good_msg "Mounting ramdisk to $MEMORY for aufs support"
+                        bad_msg "Falling back to ramdisk based aufs"
+                        good_msg "Mounting ramdisk to $aufs_memory for aufs support"
 
-                        mount -t tmpfs tmpfs "$MEMORY"
-		else
-			XINO=$MEMORY/xino
+                        mount -t tmpfs tmpfs "$aufs_memory"
+                else
+                        aufs_xino=$aufs_memory/xino
 
-                        mkdir -p "$XINO"
-			mount -t tmpfs aufs-xino "$XINO"
-		fi
-	else
-                XINO=$MEMORY
+                        mkdir -p "$aufs_xino"
+                        mount -t tmpfs aufs-xino "$aufs_xino"
+	        fi
+        else
+                aufs_xino=$aufs_memory
 
-                good_msg "Mounting ramdisk to $MEMORY for aufs support"
-		mount -t tmpfs tmpfs "$MEMORY"
-	fi
+                good_msg "Mounting ramdisk to $aufs_memory for aufs support"
+                mount -t tmpfs tmpfs "$aufs_memory"
+        fi
 
-	mkdir -p "$CHANGES"
-        if ! mount -t aufs -n -o "nowarn_perm,udba=none,xino=$XINO/.aufs.xino,br:$CHANGES=rw" aufs "$UNION"; then
-		bad_msg "Can't setup union $UNION in directory!"
-		USE_AUFS_NORMAL=0
+	mkdir -p "$aufs_branch"
+        if ! mount -t aufs -n -o "nowarn_perm,udba=none,xino=$aufs_xino/.aufs.xino,br:$aufs_branch=rw" aufs "$aufs_union"; then
+		bad_msg "Can't setup union $aufs_union in directory!"
+		aufs=0
 	fi
 }
 
@@ -1420,24 +1430,18 @@ getdvhoff() {
 
 setup_squashfs_aufs() {
 	# Setup aufs directories and vars
-	rw_branch=/mnt/rw_branch ro_branch=/mnt/livecd
+	aufs_rw_branch=/mnt/aufs-rw-branch aufs_ro_branch=/mnt/livecd
 
-	for dir in $rw_branch $ro_branch; do
+	for dir in $aufs_rw_branch $aufs_ro_branch; do
 		[ ! -d $dir ] && mkdir -p "$dir"
 	done
 
 	good_msg "Loading aufs module ..."
 	modprobe aufs &>/dev/null
 
-	mount -t squashfs -o loop,ro "$CDROOT_PATH/$LOOPEXT$LOOP" "$ro_branch"
-	mount -t tmpfs none "$rw_branch"
-	mount -t aufs -o "br:$rw_branch:$ro_branch" aufs "$NEW_ROOT"
-
-	[ ! -d $NEW_ROOT$rw_branch ] && mkdir -p "$NEW_ROOT$rw_branch"
-	[ ! -d $NEW_ROOT$ro_branch ] && mkdir -p "$NEW_ROOT$ro_branch"
-	for mount in $rw_branch $ro_branch; do
-                mount --move "$mount" "$NEW_ROOT$mount"
-        done
+        mount -t squashfs -o loop,ro "$CDROOT_PATH/$LOOPEXT$LOOP" "$aufs_ro_branch"
+	mount -t tmpfs none "$aufs_rw_branch"
+	mount -t aufs -o "br:$aufs_rw_branch:$aufs_ro_branch" aufs "$NEW_ROOT"
 }
 
 setup_unionfs() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5a341af..276f150 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -251,26 +251,22 @@ do
 			keymap=${x#*=}
 		;;
 		aufs)
-			USE_AUFS_NORMAL=1
+			aufs=1
 		;;
 		aufs\=*)
-			USE_AUFS_NORMAL=1
+			aufs=1
 
 			if echo "${x#*=}" | grep , &>/dev/null; then
-				UID=${x#*,}
-				AUFS=${x%,*}
+				aufs_dev_uid=${x#*,}
+				aufs_dev=${x%,*}
 			else
-				AUFS=${x#*=}
+				aufs_dev=${x#*=}
 			fi
 		;;
-		aufs.persistent)
-			USE_AUFS_NORMAL=1
-			AUFS=detect
-		;;
 		# Allow user to specify the modules location
 		aufs.modules\=*)
-			MODULESD=${x#*=}
-                        AUFS_MODULES=true
+			aufs_modules_dev=${x#*=}
+                        aufs_modules=1
 		;;
 		unionfs)
 			if [ ! -x /sbin/unionfs ]
@@ -447,14 +443,14 @@ then
         # Setup the root filesystem
         bootstrapFS
 
-	if [ 1 = "$USE_AUFS_NORMAL" ]; then
+	if [ 1 = "$aufs" ]; then
                 setup_aufs
-		CHROOT=$UNION
+		CHROOT=$aufs_union
 	else
 		CHROOT=${NEW_ROOT}
 	fi
 
-	if [ /dev/nfs != "$REAL_ROOT" ] && [ sgimips != "$LOOPTYPE" ] && [ 1 != "$USE_AUFS_NORMAL" ]; then
+	if [ /dev/nfs != "$REAL_ROOT" ] && [ sgimips != "$LOOPTYPE" ] && [ 1 != "$aufs" ]; then
 		bootstrapCD
 	fi
 
@@ -704,7 +700,7 @@ then
 			FS_LOCATION='mnt/livecd'
 		elif [ "${LOOPTYPE}" = 'squashfs' ]
 		then
-			if [ 1 != "$USE_AUFS_NORMAL" ]; then
+			if [ 1 != "$aufs" ]; then
 				good_msg 'Mounting squashfs filesystem'
 				_CACHED_SQUASHFS_PATH="${NEW_ROOT}/mnt/${LOOP}"
 				_squashfs_path="${CDROOT_PATH}/${LOOPEXT}${LOOP}"  # Default to uncached
@@ -766,10 +762,10 @@ then
 		fi
 	fi # if [ -n "${CRYPT_ROOT}" ]
 
-	if [ 1 = "$USE_AUFS_NORMAL" ]; then
-		union_insert_dir "$CHROOT" "$NEW_ROOT/$FS_LOCATION"
+	if [ 1 = "$aufs" ]; then
+		union_insert_dir "$CHROOT" "$aufs_ro_branch"
 
-                # Function to handle the RC_NO_UMOUNTS variable in ${CHROOT}/etc/rc.conf
+                # Function to handle the RC_NO_UMOUNTS variable in $CHROOT/etc/rc.conf
                 conf_rc_no_umounts
 
                 # Fstab changes for aufs
@@ -780,7 +776,7 @@ then
 
                         cat > "$CHROOT/etc/fstab" << FSTAB
 ####################################################
-## ATTENTION: THIS IS THE FSTAB ON THE LIVECD   ##
+## ATTENTION: THIS IS THE FSTAB ON THE LIVECD     ##
 ## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##
 ####################################################
 aufs            /                               aufs    defaults        0 0
@@ -790,14 +786,14 @@ distfiles       /usr/portage/distfiles          tmpfs   defaults        0 0
 FSTAB
                 fi
 
-                if $AUFS_MODULES; then
-                        warn_msg "Adding all modules in $MODULESD/modules/"
+                if [ 1 = "$aufs_modules" ]; then
+                        warn_msg "Adding all modules in $aufs_modules_dev/modules/"
 
-                        if [ -z "$MODULESD" ]; then
+                        if [ -z "$aufs_modules_dev" ]; then
 		                union_insert_modules "$CDROOT_PATH"
 		        else
 			        mkdir "$NEW_ROOT/mnt/modulesd"
-			        mount "$MODULESD" "$NEW_ROOT/mnt/modulesd"
+			        mount "$aufs_modules_dev" "$NEW_ROOT/mnt/modulesd"
 			        union_insert_modules "$NEW_ROOT/mnt/modulesd"
                         fi
                 fi
@@ -808,11 +804,13 @@ FSTAB
                         cp /etc/sysconfig/keyboard "$CHROOT/etc/sysconfig/"
                 fi
 
-                # Create the directories for our new union mounts
+                # Create the diuectories for our new union mounts
                 [ ! -d $CHROOT$NEW_ROOT ] && mkdir -p "$CHROOT$NEW_ROOT"
 
-                if $AUFS_CHANGES && [ ! -d $CHROOT$NEW_ROOT/mnt/changesdev ]; then
-                        mkdir -p "$CHROOT$NEW_ROOT/mnt/changesdev"
+                # Check to see if we successfully mounted $aufs_dev
+                if [ -n "$aufs_dev" ] && grep $aufs_dev /etc/mtab 1>/dev/null; then
+                        [ ! -d $CHROOT$aufs_dev_mnt ] && mkdir -p "$CHROOT$aufs_dev_mnt"
+                        mount --move "$aufs_dev_mnt" "$CHROOT$aufs_dev_mnt"
                 fi
 	fi
 
@@ -833,31 +831,30 @@ FSTAB
 	fi
 
 
-	if [ "${USE_UNIONFS_NORMAL}" = '1' ]
-	then
+	if [ "${USE_UNIONFS_NORMAL}" = '1' ]; then
 		setup_unionfs ${NEW_ROOT} /${FS_LOCATION}
 		CHROOT=/union
-        else
-                #XXX Note to potential reviewers. diff formats this section very very oddly. Be sure to review this hunk after applied, do NOT simply read the diff
-                if [ ! "${USE_AUFS_NORMAL}" -eq '1' ]
-                then
-                        good_msg "Copying read-write image contents to tmpfs"
-                        # Copy over stuff that should be writable
-                        (cd "${NEW_ROOT}/${FS_LOCATION}"; cp -a ${ROOT_TREES} "${NEW_ROOT}") || {
-                                bad_msg "Copying failed, dropping into a shell."
-                                do_rundebugshell
-                        }
-
-                        # Now we do the links.
-                        for x in ${ROOT_LINKS}
-                        do
-                                if [ -L "${NEW_ROOT}/${FS_LOCATION}/${x}" ]
-                                then
-                                        ln -s "$(readlink ${NEW_ROOT}/${FS_LOCATION}/${x})" "${x}" 2>/dev/null
-                                else
-                                        # List all subdirectories of x
-                                        find "${NEW_ROOT}/${FS_LOCATION}/${x}" -type d 2>/dev/null | while read directory
-                                        do
+        elif [ 1 != "$aufs" ]; then
+                good_msg "Copying read-write image contents to tmpfs"
+
+                # Copy over stuff that should be writable
+                (
+                        cd "${NEW_ROOT}/${FS_LOCATION}"
+                        cp -a ${ROOT_TREES} "${NEW_ROOT}"
+                ) ||
+                {
+                        bad_msg "Copying failed, dropping into a shell."
+                        do_rundebugshell
+                }
+
+                # Now we do the links.
+                for x in ${ROOT_LINKS}; do
+                        if [ -L "${NEW_ROOT}/${FS_LOCATION}/${x}" ]; then
+                                ln -s "$(readlink ${NEW_ROOT}/${FS_LOCATION}/${x})" "${x}" 2>/dev/null
+                        else
+                                # List all subdirectories of x
+                                find "${NEW_ROOT}/${FS_LOCATION}/${x}" -type d 2>/dev/null |
+                                        while read directory; do
                                                 # Strip the prefix of the FS_LOCATION
                                                 directory="${directory#${NEW_ROOT}/${FS_LOCATION}/}"
 
@@ -869,11 +866,9 @@ FSTAB
                                                         fi
                                                 fi
                                                 # Test if the directory exists already
-                                                if [ -e "/${NEW_ROOT}/${directory}" ]
-                                                then
+                                                if [ -e "/${NEW_ROOT}/${directory}" ]; then
                                                         # It does exist, link all the individual files
-                                                        for file in $(ls /${NEW_ROOT}/${FS_LOCATION}/${directory})
-                                                        do
+                                                        for file in $(ls /${NEW_ROOT}/${FS_LOCATION}/${directory}); do
                                                                 if [ ! -d "/${NEW_ROOT}/${FS_LOCATION}/${directory}/${file}" ] && [ ! -e "${NEW_ROOT}/${directory}/${file}" ]; then
                                                                         ln -s "/${FS_LOCATION}/${directory}/${file}" "${directory}/${file}" 2> /dev/null
                                                                 fi
@@ -882,22 +877,24 @@ FSTAB
                                                         # It does not exist, make a link to the livecd
                                                         ln -s "/${FS_LOCATION}/${directory}" "${directory}" 2>/dev/null
                                                         current_parent="${directory}"
-                                                fi # if [ -e "/${NEW_ROOT}/${directory}" ] ... else
-                                        done # while read directory
-                                fi # if [ -L "${NEW_ROOT}/${FS_LOCATION}/${x}" ] ... else
-                        done # for x in ${ROOT_LINKS}
-                        mkdir -p initramfs proc tmp run sys 2>/dev/null
-                        chmod 1777 tmp
+                                                fi
+                                        done
+                        fi
+                done
 
-                fi # if [ ! "${USE_AUFS_NORMAL}" -eq '1' ]
-                #XXX: end extremely confusing hunk
+                mkdir -p initramfs proc tmp run sys 2>/dev/null
+                chmod 1777 tmp
 
-                # have handy /mnt/cdrom (CDROOT_PATH) as well
-                _new_cdroot="${NEW_ROOT}${CDROOT_PATH}"
-                [ ! -d "${_new_cdroot}" ] && mkdir -p "${_new_cdroot}"
-                mount --bind "${CDROOT_PATH}" "${_new_cdroot}"
+        fi
 
-        fi # if [ "${USE_UNIONFS_NORMAL}" = '1' ] ... else
+        # Have handy /mnt/cdrom (CDROOT_PATH) as well
+        if [ 1 = "$aufs" ]; then
+                [ ! -d "$CHROOT$CDROOT_PATH" ] && mkdir "$CHROOT$CDROOT_PATH"
+                mount --move "$CDROOT_PATH" "$CHROOT$CDROOT_PATH"
+        else
+                [ ! -d "$NEW_ROOT$CDROOT_PATH" ] && mkdir -p "$NEW_ROOT$CDROOT_PATH"
+                mount --move "$CDROOT_PATH" "$NEW_ROOT$CDROOT_PATH"
+        fi
 
 	#UML=$(cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||')
 	#if [ "${UML}" = 'UML' ]
@@ -916,9 +913,9 @@ else
 		mount -t tmpfs tmpfs /union_changes
 		setup_unionfs /union_changes ${NEW_ROOT}
 		mkdir -p ${UNION}/tmp/.initrd
-	elif [ 1 = "$USE_AUFS_NORMAL" ]; then
-		union_insert_dir "$UNION" "$NEW_ROOT"
-		mkdir -p "$UNION/tmp/.initrd"
+	elif [ 1 = "$aufs" ]; then
+		union_insert_dir "$aufs_union" "$NEW_ROOT"
+		mkdir -p "$aufs_union/tmp/.initrd"
 	fi
 
 fi # if [ "${CDROOT}" = '1' ]
@@ -965,20 +962,20 @@ fi
 
 verbose_kmsg
 
-if [ 1 = "$USE_AUFS_NORMAL" ]; then
-        UNION_MEMORY=$CHROOT/.unions/memory
+if [ 1 = "$aufs" ]; then
+        aufs_union_memory=$CHROOT/.unions/memory
 
-	mkdir -p "$UNION_MEMORY"
-	mount --move "$MEMORY" "$UNION_MEMORY"
-        test_success "Failed to move aufs /memory into the system root"
+	mkdir -p "$aufs_union_memory"
+	mount --move "$aufs_memory" "$aufs_union_memory"
+        test_success "Failed to move aufs $aufs_memory into the system root"
 
-        for dir in /mnt/gentoo $rw_branch $ro_branch $CDROOT_PATH; do
+        for dir in /mnt/gentoo $aufs_rw_branch $aufs_ro_branch; do
 		mkdir -p "$CHROOT$dir"
 		chmod 755 "$CHROOT$dir"
 	done
 
-        for dir in $CDROOT_PATH $rw_branch $ro_branch; do
-                mount --move "$NEW_ROOT$dir" "$CHROOT$dir"
+        for mount in $aufs_rw_branch $aufs_ro_branch; do
+                mount --move "$mount" "$CHROOT$mount"
         done
 fi
 

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

[Richard Farina]

commit:     466e9c7220d6c656113457ddf5aa35c5265a6b7c
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Thu Jul 10 01:53:07 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=466e9c72

Changed to the dd command which creates the livecd.aufs image for
the aufs writable branch to make the process faster we create a
sparse file. Added a check for a block device so that we don't try
mounting the aufs device & some small comestic changes.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2e48504..5c7703b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -376,7 +376,7 @@ create_changefs() {
 	local size
 
 	while :; do
-		read -p '<< Size of file (Press Enter for default 256 Mb): ' size
+		read -p '<< Size of file (Press Enter for default 256 MB): ' size
 
                 size=${size:-256}
 
@@ -386,13 +386,13 @@ create_changefs() {
                 elif [ 15 -ge "$size" ]; then
                         bad_msg "Please give a size of at least 16 Megabytes"
 		else
-			if dd if=/dev/zero "of=$aufs_dev_mnt$aufs_union_file" bs=1M count="$size" &>/dev/null; then
-				good_msg "Creation of $aufs_union_file, ${size}Mb on $aufs_dev successful, formatting it ext2"
+			if dd if=/dev/zero "of=$aufs_dev_mnt$aufs_union_file" bs=1 seek="$size"M count=0 &>/dev/null; then
+				good_msg "Creation of $aufs_union_file, ${size}MB on $aufs_dev successful, formatting it ext2"
 				mke2fs -F "$aufs_dev_mnt$aufs_union_file" &>/dev/null
 				break
 			else
 				rm "$aufs_dev_mnt$aufs_union_file"
-				bad_msg "Unable to create ${aufs_union_file#*/} on $aufs_dev of ${size}Mb"
+				bad_msg "Unable to create ${aufs_union_file#*/} on $aufs_dev of ${size}MB"
 				bad_msg "Ensure your disk is not full or read-only"
 
 				read -p '<< Type "a" to abort, anything else to continue : ' doabort
@@ -410,13 +410,19 @@ create_changefs() {
 setup_aufs() {
 	bootstrapCD
 
-	if [ -n "$aufs_dev" ]; then
-                good_msg "Mounting $aufs_dev to $aufs_memory for aufs support"
+        if [ -n "$aufs_dev" ]; then
+                if [ ! -b $aufs_dev ]; then
+                        bad_msg "$aufs_dev is not a valid block device"
+                        local invalidblk=1
+                        unset aufs_dev
+                else
+                        good_msg "Mounting $aufs_dev to $aufs_memory for aufs support"
 
-		if ! mount -t auto "$aufs_dev" "$aufs_dev_mnt" &>/dev/null; then
-			bad_msg "Mount of $aufs_dev failed, falling back to ramdisk based aufs"
-			unset aufs_dev
-		fi
+                        if ! mount -t auto "$aufs_dev" "$aufs_dev_mnt" &>/dev/null; then
+                                bad_msg "Mount of $aufs_dev failed, falling back to ramdisk based aufs"
+                                unset aufs_dev
+		        fi
+                fi
 
                 # Check and attempt to create the AUFS union file
 	        if [ ! -e $aufs_dev_mnt$aufs_union_file ] && [ -n "$aufs_dev" ]; then
@@ -455,7 +461,12 @@ setup_aufs() {
                         aufs_xino=$aufs_memory
                         umount "$aufs_memory" &>/dev/null
 
-                        bad_msg "Create an extfs ${aufs_union_file#*/} file on this device"
+                        if [ 1 = "$invalidblk" ]; then
+                                bad_msg "Verify that you've entered a valid device path"
+                        else
+                                bad_msg "Create an extfs ${aufs_union_file#*/} file on this device"
+                        fi
+
                         bad_msg "if you wish to have aufs data persistency on reboots"
                         bad_msg "Falling back to ramdisk based aufs"
                         good_msg "Mounting ramdisk to $aufs_memory for aufs support"

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 276f150..3098866 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -786,6 +786,7 @@ distfiles       /usr/portage/distfiles          tmpfs   defaults        0 0
 FSTAB
                 fi
 
+                # When aufs.modules= is used
                 if [ 1 = "$aufs_modules" ]; then
                         warn_msg "Adding all modules in $aufs_modules_dev/modules/"
 
@@ -804,7 +805,7 @@ FSTAB
                         cp /etc/sysconfig/keyboard "$CHROOT/etc/sysconfig/"
                 fi
 
-                # Create the diuectories for our new union mounts
+                # Create the directories for our new union mounts
                 [ ! -d $CHROOT$NEW_ROOT ] && mkdir -p "$CHROOT$NEW_ROOT"
 
                 # Check to see if we successfully mounted $aufs_dev

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

[Richard Farina]

commit:     a6202ee3e4a2098fc17fd64ac3aad46353cff5dd
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Mon Jun 23 20:03:36 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a6202ee3

Introduced a new funtion to test for numeric values that that our changes_fs doesn't fail
when non-numeric values are given, also the styling of changes_fs was changed to
reflect new logic.

 defaults/initrd.scripts | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c258c00..02842bf 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -345,6 +345,18 @@ conf_rc_no_umounts() {
         fi
 }
 
+# is_int "$A" ["$B"..]
+# NOTE we consider a leading 0 false as it would be interpreted as octal
+is_int(){
+        local i
+        for i; do
+                case $i in
+                        ''|*[!0-9]*|0?*) return 1 ;;
+                        *) :
+                esac
+        done
+}
+
 # Function to create an ext2 fs on $CHANGESDEV, $CHANGESMNT mountpoint
 create_changefs() {
 	local size
@@ -352,11 +364,12 @@ create_changefs() {
 	while :; do
 		read -p '<< Size of file (Press Enter for default 256 Mb): ' size
 
-                [ -n "$size" ] || size=256
-
-                size=$size
+                size=${size:-256}
 
-                if [ 15 -ge "$size" ]; then
+                if ! is_int $size; then
+                        bad_msg "Non numeric value given for size, try again"
+                        continue
+                elif [ 15 -ge "$size" ]; then
                         bad_msg "Please give a size of at least 16 Megabytes"
 		else
 			if dd if=/dev/zero "of=$CHANGESMNT$AUFS_CHANGESFILE" bs=1M count="$size" &>/dev/null; then

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

[Richard Yao]

commit:     9a35d09be877f957c46fa374be9d2d3f0b3390ba
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 20:46:29 2015 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 20:46:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9a35d09b

Disable stack protection by default

I had intended for this feature to catch bugs in the kernel that
involved stack corruption so that there would be a chance of debugging
them, but Rick Farina is strongly against turning this on unless it is
the strong version, which we cannot turn on until GCC 4.9+ becomes
widespread. I am turning this off because the controversy is simply not
worth it, but this is a bad decision.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

 defaults/kernel-generic-config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 3738e47..1092aa3 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -4075,7 +4075,6 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 
 CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
 CONFIG_HZ_1000=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_IDLE=y

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

[Richard Yao]

commit:     b3517f3682b17492aaae421d114cafbe9679b13c
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 20:55:38 2015 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 20:55:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b3517f36

Revert "Disable stack protection by default"

This reverts commit 9a35d09be877f957c46fa374be9d2d3f0b3390ba.

The controversy was settled by explaining that
CONFIG_CC_STACKPROTECTOR_REGULAR is -fstack-protector, not
-fstack-protector-all.

 defaults/kernel-generic-config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 1092aa3..3738e47 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -4075,6 +4075,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 
 CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR_REGULAR=y
 CONFIG_HZ_1000=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_IDLE=y

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

[Robin H. Johnson]

commit:     06106b54ce4a767ba201c414a833ba63076dee1f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 03:30:39 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 03:34:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=06106b54

KSUFF variable was never used.

KSUFF variable never got used after it was introduced.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.defaults | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index f6fd564..5e8fdbe 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -55,7 +55,6 @@ MISCOPTS='debug detect'
 QUIET='1'
 ROOT_LINKS='bin sbin lib lib32 lib64 boot usr opt emul'
 ROOT_TREES='etc root home var'
-KSUFF='.ko'
 
 REAL_ROOT=''
 CONSOLE='/dev/console'

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

[Richard Farina]

commit:     065e3157be7c90a27f09bf7b96ae10943db8a0e3
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 19:32:50 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 19:32:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=065e3157

fix test to check for execute bit when we plan to execute

as noticed during review of the patch from haasn for btrfs, many tests
were checking for file existance before trying to execute while checking
for the execute bit makes a bit more sense.

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4724b55..a07a408 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -935,7 +935,7 @@ startVolumes() {
 	
 	if [ "${USE_MDADM}" = '1' ]
 	then
-		if [ -e '/sbin/mdadm' ]
+		if [ -x '/sbin/mdadm' ]
 		then
 			/sbin/mdadm --assemble --scan
 		else
@@ -955,7 +955,7 @@ startVolumes() {
 
 	if [ "${USE_DMRAID_NORMAL}" = '1' ]
 	then
-		if [ -e '/sbin/dmraid' ]
+		if [ -x '/sbin/dmraid' ]
 		then
 			good_msg "Activating Device-Mapper RAID(s)"
 			if [ '${DMRAID_OPTS}' = '' ]
@@ -969,7 +969,7 @@ startVolumes() {
 
 	if [ "${USE_LVM_NORMAL}" = '1' ]
 	then
-		if [ -e '/bin/lvm' ]
+		if [ -x '/bin/lvm' ]
 		then
 			for dev in ${RAID_DEVICES}
 			do
@@ -1232,7 +1232,7 @@ openLUKS() {
 					fi
 					# At this point a candidate key exists (either mounted before or not)
 					good_msg "${LUKS_KEY} on device ${REAL_LUKS_KEYDEV} found" ${CRYPT_SILENT}
-					if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then
+					if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -x /sbin/gpg ] ; then
 						[ -e /dev/tty ] && mv /dev/tty /dev/tty.org
 						mknod /dev/tty c 5 1
 						cryptsetup_options="${cryptsetup_options} -d -"

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

[Richard Farina]

commit:     8d1b1ff68fc56f79739c02bbe5ebe9ef14933825
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 02:25:56 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 02:25:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8d1b1ff6

add in the isoroot/cdroot verification patch from pentoo

 defaults/busy-config     |  2 +-
 defaults/initrd.defaults |  1 +
 defaults/initrd.scripts  | 16 ++++++++++++++++
 defaults/linuxrc         |  3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index b1188e9..aed797e 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -306,7 +306,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y
 #
 # Common options for md5sum, sha1sum, sha256sum, sha512sum
 #
-# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 
 #
 # Console Utilities

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 5e8fdbe..a5eb3ba 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -67,6 +67,7 @@ CDROOT_PATH='/mnt/cdrom'
 # This is the file that the cdroot will be checked for as a
 # marker. It must exist RELATIVE to the cdroot.
 CDROOT_MARKER='/livecd'
+VERIFY=0
 
 # AUFS variables
 aufs=0

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a07a408..2612574 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -233,6 +233,22 @@ bootstrapCD() {
 
 	findmediamount "cdrom" "${SUBDIR}/${CDROOT_MARKER}" \
 		"REAL_ROOT" "${CDROOT_PATH}" ${DEVICES}
+	if [ $VERIFY = 1 ]; then
+		cd "${CDROOT_PATH}"
+		if [ -f isoroot_checksums ]; then
+			good_msg "Verifying checksums, this may take some time..."
+			if ! busybox sha512sum -c isoroot_checksums; then
+				bad_msg "Some checksums failed, press any key to poweroff..."
+				read -n1 -s
+				busybox poweroff -f
+			else
+				good_msg "Checksums all valid, continuing boot..."
+			fi
+			cd $OLDPWD
+		else
+			bad_msg "Verify enabled but no checksums file exists, skipping"
+		fi
+	fi
 }
 
 bootstrapKey() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 46b2151..ebf26b5 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -283,6 +283,9 @@ do
 		nounionfs)
 			USE_UNIONFS_NORMAL=0
 			;;
+		verify)
+			VERIFY=1
+		;;
 	esac
 done
 

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

[Richard Farina]

commit:     694a32701cb36b5bba132f0a99394402aae743d8
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 16:05:32 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 16:05:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=694a3270

fix for bug #444574 from floppym

also fixed bug #461910, possibly others

 defaults/linuxrc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ebf26b5..35f39bc 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -39,7 +39,6 @@ CMDLINE=$(cat /proc/cmdline)
 FAKE_ROOT=''
 FAKE_INIT=''
 FAKE_ROOTFLAGS=''
-INIT_OPTS=''
 ROOTFSTYPE='auto'
 CRYPT_SILENT=0
 QUIET=''
@@ -63,9 +62,6 @@ do
 		init=*)
 			FAKE_INIT=${x#*=}
 		;;
-		init_opts=*)
-			INIT_OPTS=${x#*=}
-		;;
 		# Livecd options
 		cdroot)
 			CDROOT=1
@@ -1020,7 +1016,8 @@ fi
 # Run debug shell if requested
 rundebugshell "before entering switch_root"
 
-exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}"
+# init_opts is set in the environment by the kernel when it parses the command line
+exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" ${init_opts}
 
 # If we get here, something bad has happened
 splash 'verbose'

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

[Richard Farina]

commit:     33c3c90cce2a242a7d6e45effa48ebbd91f63cff
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 16:13:48 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 16:13:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=33c3c90c

run startVolumes after opening luks

some users put lvm (etc) inside luks containers, which may require rescanning of lvm, btrfs, etc
bug #390079

 defaults/linuxrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 35f39bc..877d845 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -434,6 +434,9 @@ then
 	fi
 fi
 
+#scan for volumes again in case of lvm inside luks
+startVolumes
+
 mkdir -p "${NEW_ROOT}"
 CHROOT="${NEW_ROOT}"
 

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

[Richard Yao]

commit:     fa42dd9682043ad42dc70c4a47d7f8847403c946
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 21:24:09 2015 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 20:52:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fa42dd96

Include less and vi in busybox for debug shells

Having access to less and vi in the debug shell would make debugging
easier, especially in cases where the debug shell is used as a rescue
shell.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

 defaults/busy-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 0a0e1bc..c3a4238 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -355,7 +355,7 @@ CONFIG_WHICH=y
 # Editors
 #
 # CONFIG_PATCH is not set
-# CONFIG_VI is not set
+CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=0
 # CONFIG_FEATURE_VI_8BIT is not set
 # CONFIG_FEATURE_VI_COLON is not set
@@ -627,7 +627,7 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
 # Miscellaneous Utilities
 #
 # CONFIG_CONSPY is not set
-# CONFIG_LESS is not set
+CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_FEATURE_LESS_BRACKETS is not set
 # CONFIG_FEATURE_LESS_FLAGS is not set

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

[Richard Farina]

commit:     c7a2fbef56b808b97135307621dc43b4fe970a44
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 04:36:30 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 04:36:30 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c7a2fbef

Revert "run startVolumes after opening luks"

This reverts commit 33c3c90cce2a242a7d6e45effa48ebbd91f63cff.

As correctly pointed out by Whissi on bug #390079 users should be using
CRYPT_ROOT and REAL_ROOT which work properly, this commit causes a double
lvm scan which isn't needed.

 defaults/linuxrc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 877d845..35f39bc 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -434,9 +434,6 @@ then
 	fi
 fi
 
-#scan for volumes again in case of lvm inside luks
-startVolumes
-
 mkdir -p "${NEW_ROOT}"
 CHROOT="${NEW_ROOT}"
 

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

[Richard Farina]

commit:     28fddfdbf0977e33c84fc205c380657b751c2c98
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 20:02:12 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 20:02:12 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=28fddfdb

whitespace ocd

 defaults/initrd.scripts | 100 ++++++++++++++++++++++++------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 763468a..f7f0233 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -78,7 +78,7 @@ findmediamount() {
 	# $2 = recognition file
 	# $3 = variable to have the device path
 	# $4 = actual mount dir path (full path)
-	# args remaining are possible devices 
+	# args remaining are possible devices
 
 	local media=$1 recon=$2 vrbl=$3 mntdir=$4
 	shift 4
@@ -534,7 +534,7 @@ findnfsmount() {
 
 		if [ "${NFSROOT}" = '' ]
 		then
-			# Obtain NFSIP	
+			# Obtain NFSIP
 			OPTIONS=`busybox dmesg | grep rootserver | sed -e "s/,/ /g"`
 			for OPTION in $OPTIONS
 			do
@@ -543,9 +543,9 @@ findnfsmount() {
 					NFSIP=`echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 2`
 				fi 
 			done
-			
+
 			# Obtain NFSPATH
-			OPTIONS=`busybox dmesg | grep rootpath | sed -e "s/,/ /g"`	
+			OPTIONS=`busybox dmesg | grep rootpath | sed -e "s/,/ /g"`
 			for OPTION in $OPTIONS
 			do
 				if [ `echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 1` = 'rootpath' ]
@@ -585,7 +585,7 @@ findnfsmount() {
 				else
 					bad_msg "NFS Mounting failed. Is the path corrent ?"
 				fi
-			else	
+			else
 				good_msg "Attempting to mount NFS root on ${NFSROOT} with options ${NFSOPTIONS}"
 				mount -t nfs -o ${NFSOPTIONS} ${NFSROOT} ${NEW_ROOT}
 				if [ "$?" = '0' ]
@@ -635,11 +635,11 @@ find_real_device() {
 check_loop() {
 	if [ "${LOOP}" = '' -o ! -e "${CDROOT_PATH}/${LOOP}" ]
 	then
-	
+
 		bad_msg "Invalid loop location: ${LOOP}"
 		bad_msg 'Please export LOOP with a valid location, or reboot and pass a proper loop=...'
 		bad_msg 'kernel command line!'
-	
+
 		run_shell
 	fi
 }
@@ -676,7 +676,7 @@ mount_devfs () {
 
 test_success() {
 	retcode=$?
-	# If last command failed send error message and fall back to a shell	
+	# If last command failed send error message and fall back to a shell
 	if [ "$retcode" != '0' ]
 	then
 		error_string=$1
@@ -707,7 +707,7 @@ bad_msg() {
 		splash 'verbose' > /dev/null &
 		echo -e "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
 	fi
-} 
+}
 
 warn_msg() {
 	msg_string=$1
@@ -792,18 +792,18 @@ cmdline_hwopts() {
 			fi
 		done
 	done
-   
+
 	# Shouldnt need to sort this as the following loop should figure out the
 	# duplicates and strip them out
 	#MY_HWOPTS=`echo ${MY_HWOPTS}|  sort`
-	
+
 	for x in ${MY_HWOPTS}
 	do
 		FOUND=0
 		for y in ${TMP_HWOPTS}
 		do
 			if [ "${y}" = "${x}" ]
-			then 
+			then
 				continue 2
 			fi
 		done
@@ -843,7 +843,7 @@ setup_keymap() {
 		[ -f /lib/keymaps/keymapList ] && chooseKeymap
 
 		[ "${DEVBIND}" = '1' ] && umount /dev
-		
+
 		if [ -e /etc/sysconfig/keyboard -a "${CDROOT}" = '1' ]
 		then
 			mkdir -p ${NEW_ROOT}/etc/sysconfig/
@@ -948,7 +948,7 @@ startVolumes() {
 		mkdir -p /dev/mapper
 		ln -sf /dev/device-mapper /dev/mapper/control
 	fi
-	
+
 	if [ "${USE_MDADM}" = '1' ]
 	then
 		if [ -x '/sbin/mdadm' ]
@@ -959,8 +959,8 @@ startVolumes() {
 		fi
 	fi
 
-	if [ "${USE_MULTIPATH_NORMAL}" = '1' ] 
-	then 
+	if [ "${USE_MULTIPATH_NORMAL}" = '1' ]
+	then
 		for multipath_path in /sbin/multipath /bin/multipath MISSING ; do
 			[ -x "$multipath_path " ] && break
 		fi
@@ -983,7 +983,7 @@ startVolumes() {
 			$dmsetup_path ls --target multipath --exec "$kpartx_path -a -v"
 			#for MULTIPATH_VOLUMES in /dev/mapper/*; do $kpartx_path -a $MULTIPATH_VOLUMES; done
 		fi
-	fi 
+	fi
 
 	if [ "${USE_DMRAID_NORMAL}" = '1' ]
 	then
@@ -1021,7 +1021,7 @@ startVolumes() {
 
 			# To activate volumegroups on all devices in the cache
 			lvm_commands="${lvm_commands} \nvgchange -ay --sysinit"
-			
+
 			# To create symlinks so users can use real_root=/dev/vg/root
 			# This needs to run after vgchange, using vgchange --mknodes is too
 			# early.
@@ -1042,7 +1042,7 @@ startVolumes() {
 			bad_msg "btrfs not found: skipping btrfs device scanning!"
 		fi
 	fi
-	
+
 	if [ "${USE_ZFS}" = '1' ]
 	then
 
@@ -1091,7 +1091,7 @@ startVolumes() {
 }
 
 startiscsi() {
-	
+
 	if [ ! -n "${ISCSI_NOIBFT}" ]
 	then
 		good_msg "Activating iSCSI via iBFT"
@@ -1108,7 +1108,7 @@ startiscsi() {
 		else
 			ADDITIONAL="${ADDITIONAL} -g 1"
 		fi
-		
+
 		if [ "${ISCSI_PORT}" ]
 		then
 			ADDITIONAL="${ADDITIONAL} -p ${ISCSI_PORT}"
@@ -1205,10 +1205,10 @@ openLUKS() {
 					cryptsetup_options="${cryptsetup_options} --allow-discards"
 				fi
 
-				if [ -n "${LUKS_KEY}" ] 
+				if [ -n "${LUKS_KEY}" ]
 				then
 					local REAL_LUKS_KEYDEV="${LUKS_KEYDEV}"
-					if [ ! -e "${mntkey}${LUKS_KEY}" ] 
+					if [ ! -e "${mntkey}${LUKS_KEY}" ]
 					then
 						REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
 						if [ -b "${REAL_LUKS_KEYDEV}" ]
@@ -1218,7 +1218,7 @@ openLUKS() {
 							# abort after 10 secs
 							local count=10
 							while [ ${count} -gt 0 ]
-							do 
+							do
 								count=$((count-1))
 								sleep 1
 								REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
@@ -1304,7 +1304,7 @@ openLUKS() {
 startLUKS() {
 
 	# if key is set but key device isn't, find it
-	
+
 	[ -n "${CRYPT_ROOT_KEY}" ] && [ -z "${CRYPT_ROOT_KEYDEV}" ] \
 		&& sleep 6 && bootstrapKey "ROOT"
 
@@ -1537,32 +1537,32 @@ setup_unionfs() {
 		mkdir -p ${UNION}
 		good_msg "Loading fuse module"
 		modprobe fuse > /dev/null 2>&1
-#                 if [ -n "${UNIONFS}" ] 	 
-#                 then 	 
-#                         CHANGESDEV=${UNIONFS} 	 
-#                         good_msg "mounting $CHANGESDEV to $MEMORY for unionfs support" 	 
-#                         mount -t auto $CHANGESDEV $MEMORY 	 
-#                         # mount tmpfs only in the case when changes= boot parameter was 	 
-#                         # empty or we were not able to mount the storage device 	 
-#                         ret=$? 	 
+#                 if [ -n "${UNIONFS}" ]
+#                 then
+#                         CHANGESDEV=${UNIONFS}
+#                         good_msg "mounting $CHANGESDEV to $MEMORY for unionfs support"
+#                         mount -t auto $CHANGESDEV $MEMORY
+#                         # mount tmpfs only in the case when changes= boot parameter was
+#                         # empty or we were not able to mount the storage device
+#                         ret=$?
 #                         if [ ${ret} -ne 0 ]
-#                         then 	 
-#                                 bad_msg "mount of $CHANGESDEV failed falling back to ramdisk based unionfs" 	 
-#                                 mount -t tmpfs tmpfs $MEMORY 	 
-#                         fi 	 
-#                         if [ "${CDROOT}" -eq '1' -a ! -f ${MEMORY}/livecd.unionfs  ] 	 
-#                         then 	 
-#                                 umount $MEMORY 	 
-#                                 bad_msg "failed to find livecd.unionfs file on $CHANGESDEV" 	 
-#                                 bad_msg "create a livecd.unionfs file on this device if you wish to use it for unionfs" 	 
-#                                 bad_msg "falling back to ramdisk based unionfs for safety" 	 
-#                                 mount -t tmpfs tmpfs $MEMORY 	 
-#                         fi 	 
-#                 else 	 
-#                         good_msg "Mounting ramdisk to $MEMORY for unionfs support..." 	 
-#                         mount -t tmpfs tmpfs $MEMORY 	 
-#                 fi 	 
-  	 
+#                         then
+#                                 bad_msg "mount of $CHANGESDEV failed falling back to ramdisk based unionfs"
+#                                 mount -t tmpfs tmpfs $MEMORY
+#                         fi
+#                         if [ "${CDROOT}" -eq '1' -a ! -f ${MEMORY}/livecd.unionfs  ]
+#                         then
+#                                 umount $MEMORY
+#                                 bad_msg "failed to find livecd.unionfs file on $CHANGESDEV"
+#                                 bad_msg "create a livecd.unionfs file on this device if you wish to use it for unionfs"
+#                                 bad_msg "falling back to ramdisk based unionfs for safety"
+#                                 mount -t tmpfs tmpfs $MEMORY
+#                         fi
+#                 else
+#                         good_msg "Mounting ramdisk to $MEMORY for unionfs support..."
+#                         mount -t tmpfs tmpfs $MEMORY
+#                 fi
+
 		mkdir /tmp
 		mkdir -p ${UNION}
 #		mkdir -p $CHANGES

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

[Robin H. Johnson]

commit:     8c525fa4528c39b57c8194b749edc8ba29cf9126
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 20:05:06 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 20:05:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8c525fa4

thinko fix.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f7f0233..a908cba 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -963,13 +963,13 @@ startVolumes() {
 	then
 		for multipath_path in /sbin/multipath /bin/multipath MISSING ; do
 			[ -x "$multipath_path " ] && break
-		fi
+		done
 		for dmsetup_path in /sbin/dmsetup /bin/dmsetup MISSING ; do
 			[ -x "$dmsetup_path " ] && break
-		fi
+		done
 		for kpartx_path in /sbin/kpartx /bin/kpartx MISSING ; do
 			[ -x "$kpartx_path " ] && break
-		fi
+		done
 		fail=0
 		["${multipath_path}" = "MISSING" ] && fail=1 && bad_msg "domultipath called, but multipath binary missing! Skipping multipath"
 		["${dmsetup_path}" = "MISSING" ] && fail=1 && bad_msg "domultipath called, but dmsetup binary missing! Skipping multipath"
@@ -1003,7 +1003,7 @@ startVolumes() {
 	then
 		for lvm_path in /sbin/lvm /bin/lvm MISSING ; do
 			[ -x "$lvm_path" ] && break
-		fi
+		done
 		if [ "${lvm_path}" = "MISSING" ]
 		then
 			bad_msg "dolvm invoked, but LVM binary not available! skipping LVM volume group activation!"

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

[Richard Yao]

commit:     1b8eb107085e8e30a47a3eebbcbce1dda4afb5e1
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 18:54:33 2016 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 19:03:37 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1b8eb107

busybox mount takes -o move instead of --move

Our attempt to move /dev into /newroot/dev fails because busybox's mount
does not understand --move. Instead it requires `-o move`. This failure
causes us to unmount /dev causing ZFS /dev/zd* device nodes to be lost
during the boot process.

There is nothing in userland that presently knows how to recreate zd*
devices from `/sys/devices/virtual/block`. ZFS is not necessarily the
only driver affected, so while this is definitely a bug in the zfs udev
rules we should try to preserve /dev to avoid triggering such bugs in
other subsystems.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 35f39bc..e47c10e 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -997,7 +997,7 @@ for fs in /dev /sys /proc
 do
 	if grep -qs "$fs" /proc/mounts
 	then
-		if ! mount --move $fs "${CHROOT}"$fs
+		if ! mount -o move $fs "${CHROOT}"$fs
 		then
 			umount $fs || \
 			bad_msg "Failed to move and unmount the ramdisk $fs!"

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

[Robin H. Johnson]

commit:     945a877a0277befb1fa21281e61ae138af19d356
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 21:03:45 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 21:05:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=945a877a

kconfig: Disable CONFIG_KALLSYMS_ALL and CONFIG_DEBUG_INFO* by default, like older kernels.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 4dadf57..f1bfb56 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -41,7 +41,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_BPF_SYSCALL=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
+# CONFIG_KALLSYMS_ALL is not set
 CONFIG_KALLSYMS_EXTRA_PASS=y
 CONFIG_KALLSYMS_STRIP_GENERATED=y
 CONFIG_FUTEX=y
@@ -3637,8 +3637,8 @@ CONFIG_JUMP_LABEL=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_DEBUG_DRIVER is not set

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

[Robin H. Johnson]

commit:     e91e5c10e37a961d43049b0d4d03e59d89c9a67f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 20:07:31 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 21:05:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e91e5c10

kernel-generic-config: fix bad patch of CONFIG_MEDIA_USB_SUPPORT.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 3738e47..463393d 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -2522,8 +2522,8 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 #
 # Media drivers
 #
--# CONFIG_MEDIA_USB_SUPPORT is not set
-+CONFIG_MEDIA_USB_SUPPORT=y
+# CONFIG_MEDIA_USB_SUPPORT is not set
+CONFIG_MEDIA_USB_SUPPORT=y
 
 #
 # Video For Linux

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

[Robin H. Johnson]

commit:     333a300e9f40996750a2622c634b0ca5a04469ab
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 20:34:24 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 21:05:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=333a300e

kernel: Disable DLM & ZRAM debug in generic config.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 463393d..4dadf57 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -3547,7 +3547,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m
-CONFIG_DLM_DEBUG=y
+# CONFIG_DLM_DEBUG is not set
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_DLM=y
 
@@ -4505,7 +4505,7 @@ CONFIG_SCSI_MPT3SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS_LOGGING=y
 CONFIG_MFD_WM8350_CONFIG_MODE_0=y
 CONFIG_ZRAM=m
-CONFIG_ZRAM_DEBUG=y
+# CONFIG_ZRAM_DEBUG is not set
 CONFIG_COMPACTION=y
 CONFIG_CHELSIO_T4=m
 CONFIG_SECURITY_DMESG_RESTRICT=n

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

[Robin H. Johnson]

commit:     247626b6d8b30eb3ed13cb23226c149169607c5e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 21:23:53 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 21:27:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=247626b6

kconfig: disable extranenous debug.

The older kernel-configs did not enable much debugging, and when we
switched to the newer debug infrastructure, a lot of it wound up turned
on implicitly.

List of options returning to disabled:
CONFIG_ACPI_APEI_ERST_DEBUG
CONFIG_DEBUG_HIGHMEM
CONFIG_DEBUG_LIST
CONFIG_DEBUG_NX_TEST
CONFIG_DEBUG_RODATA_TEST
CONFIG_DEBUG_SPINLOCK_SLEEP
CONFIG_DM_DEBUG
CONFIG_DM_DEBUG_BLOCK_STACK_TRACING
CONFIG_DM_DEBUG_SPACE_MAPS
CONFIG_FIREWIRE_OHCI_DEBUG
CONFIG_IWL3945_DEBUG
CONFIG_LIBERTAS_DEBUG
CONFIG_SCSI_DEBUG

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index f1bfb56..a088fc3 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -675,7 +675,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_NSP32 is not set
-CONFIG_SCSI_DEBUG=m
+# CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_DC390T is not set
 CONFIG_SCSI_QLA_FC=m
 CONFIG_SCSI_QLA_ISCSI=m
@@ -713,7 +713,7 @@ CONFIG_MD_RAID456=m
 CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
-CONFIG_DM_DEBUG=y
+# CONFIG_DM_DEBUG is not set
 CONFIG_DM_DELAY=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_MULTIPATH=m
@@ -746,7 +746,7 @@ CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_OHCI_DEBUG=y
+# CONFIG_FIREWIRE_OHCI_DEBUG is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 
 #
@@ -1628,7 +1628,7 @@ CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_DEBUG=y
+# CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_IWLWIFI=m
@@ -1644,7 +1644,7 @@ CONFIG_IWL5000=y
 CONFIG_IWL5000_RUN_TIME_CALIB=y
 CONFIG_IWL3945=m
 CONFIG_IWL3945_RFKILL=y
-CONFIG_IWL3945_DEBUG=y
+# CONFIG_IWL3945_DEBUG is not set
 CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
 CONFIG_IWL3945_LEDS=y
 CONFIG_IWM=m
@@ -4391,15 +4391,15 @@ CONFIG_PPS=m
 # They aren't that much of a performance impact, and the value
 # from getting useful bug-reports makes it worth leaving them on.
 CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_HIGHMEM=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_LIST is not set
 CONFIG_DEBUG_SHIRQ=y
 # CONFIG_DEBUG_DEVRES is not set
-CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_DEBUG_SET_MODULE_RONX=y
-CONFIG_DEBUG_NX_TEST=m
+# CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DEBUG_BOOT_PARAMS=y
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@@ -4424,8 +4424,8 @@ CONFIG_DM_BUFIO=m
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
 CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_DEBUG_BLOCK_STACK_TRACING=n
-CONFIG_DM_DEBUG_SPACE_MAPS=n
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -4519,7 +4519,7 @@ CONFIG_ACPI_HED=m
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_PSTORE=y
 CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y

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

[Robin H. Johnson]

commit:     edca92475c35d93185ca48f8956e290370acad2b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 22:43:30 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 22:43:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=edca9247

kconfig/generic: Remove dupe option CONFIG_NET_IPGRE_DEMUX.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index a088fc3..d608c1d 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -4443,7 +4443,6 @@ CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
 CONFIG_ANON_ZERO_PAGE=y
 CONFIG_TREE_RCU=y
-CONFIG_NET_IPGRE_DEMUX=y
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_NETFILTER_XT_TARGET_AUDIT=m

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

[Stefan Behte]

commit:     c157e8a5cfab8133a94eab7a765152fc45d3a2a8
Author:     craig <craig <AT> haquarter <DOT> de>
AuthorDate: Thu Feb  4 02:53:48 2016 +0000
Commit:     Stefan Behte <craig <AT> gentoo <DOT> org>
CommitDate: Thu Feb  4 02:54:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c157e8a5

Wait for iscsi to settle, use scandelay method

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a908cba..890893e 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1140,9 +1140,6 @@ startiscsi() {
 		fi
 
 		iscsistart -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -a "${ISCSI_ADDRESS}" ${ADDITIONAL}
-
-		# let iscsid settle - otherwise mounting the iSCSI-disk will fail (very rarely, though)
-		sleep 1
 	fi
 }
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index e47c10e..ac8f215 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -374,9 +374,6 @@ fi
 # Ensure that device nodes are properly configured
 mdev -s || bad_msg "mdev -s failed"
 
-# Apply scan delay if specified
-sdelay
-
 cd /
 
 # Start iSCSI
@@ -385,6 +382,9 @@ then
 	startiscsi
 fi
 
+# Apply scan delay if specified
+sdelay
+
 # Setup btrfs, see bug 303529
 setup_btrfsctl
 

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

[Robin H. Johnson]

commit:     0d600946372f19c786655a1a85c79ea135d83e78
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 20:52:53 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 20:52:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0d600946

kconfig: disable CONFIG_FB_NVIDIA per bug #574358; obsolete with Nouveau

 defaults/kernel-generic-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index d608c1d..7b8826d 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -2744,9 +2744,9 @@ CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
 # CONFIG_FB_NEOMAGIC is not set
-CONFIG_FB_NVIDIA=m
+# CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_I2C is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 # CONFIG_FB_PM3 is not set

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

[Robin H. Johnson]

commit:     4b467f0ab3dccc518355fe42f089c01a761ebaf7
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 06:55:26 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 06:55:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4b467f0a

defaults/initrd.scripts: bug #449186, strip iversion from mountopts.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 1395690..703c0fe 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1627,5 +1627,7 @@ get_mount_device()
 # trailing or duplicate commas.
 strip_mount_options()
 {
-	sed -r 's/(,|^)(no)?auto(,|$)/,/g'
+	sed -r \
+		-e 's/(,|^)(no)?auto(,|$)/,/g' \
+		-e 's/(,|^)iversion(,|$)/,/g'
 }

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

[Robin H. Johnson]

commit:     5276cd77b5ac4e6f2442bb84573559545f7ad4a2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 06:53:24 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 06:53:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5276cd77

defaults/initrd.scripts: bug #519742, fix multipath detection.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 890893e..1395690 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -977,6 +977,12 @@ startVolumes() {
 		if [ "$fail" = "0" ]
 		then
 			good_msg "Scanning for multipath devices"
+			good_msg ":: Populating scsi_id info for libudev queries"
+			mkdir -p /run/udev/data
+			for ech in /sys/block/* ; do
+				local tgtfile=b$(cat ${ech}/dev)
+				/lib/udev/scsi_id -g -x /dev/${ech##*/} |sed -e 's/^/E:/' >/run/udev/data/${tgtfile}
+			done
 			$multipath_path  -v 0
 			sleep 2
 			good_msg "Activating multipath devices"

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

[Robin H. Johnson]

commit:     8336d3de653db02f1cc558a04560aaa76722ef4e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 19:47:47 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 19:47:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8336d3de

busybox features, pass 2

Start to tune busybox features, based on pieces I've used to bring up
systems, as well as turning off pieces that have no use.

conspy could be useful to get genkernel printing on all consoles before
OpenRC starts up, just like the kernel does.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/busy-config | 68 ++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 9f36eea..2d8af84 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -139,7 +139,7 @@ CONFIG_CPIO=y
 CONFIG_FEATURE_CPIO_O=y
 CONFIG_FEATURE_CPIO_P=y
 CONFIG_DPKG=y
-# CONFIG_DPKG_DEB is not set
+CONFIG_DPKG_DEB=y
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
 CONFIG_GUNZIP=y
 CONFIG_GZIP=y
@@ -157,7 +157,7 @@ CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
 # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-# CONFIG_FEATURE_TAR_TO_COMMAND is not set
+CONFIG_FEATURE_TAR_TO_COMMAND=y
 CONFIG_FEATURE_TAR_UNAME_GNAME=y
 CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
 # CONFIG_FEATURE_TAR_SELINUX is not set
@@ -182,7 +182,7 @@ CONFIG_HOSTID=y
 CONFIG_ID=y
 CONFIG_GROUPS=y
 CONFIG_TEST=y
-# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
 CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
@@ -192,7 +192,7 @@ CONFIG_BASE64=y
 # CONFIG_WHO is not set
 # CONFIG_USERS is not set
 # CONFIG_CAL is not set
-# CONFIG_CATV is not set
+ CONFIG_CATV is not set
 CONFIG_CHGRP=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
@@ -248,14 +248,14 @@ CONFIG_MKNOD=y
 CONFIG_MV=y
 # CONFIG_FEATURE_MV_LONG_OPTIONS is not set
 CONFIG_NICE=y
-# CONFIG_NOHUP is not set
-# CONFIG_OD is not set
+CONFIG_NOHUP=y
+CONFIG_OD=y
 CONFIG_PRINTENV=y
 CONFIG_PRINTF=y
 CONFIG_PWD=y
 CONFIG_READLINK=y
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
-# CONFIG_REALPATH is not set
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
 CONFIG_RM=y
 CONFIG_RMDIR=y
 CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
@@ -264,12 +264,12 @@ CONFIG_SHA1SUM=y
 CONFIG_SHA256SUM=y
 CONFIG_SHA512SUM=y
 CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_FEATURE_FLOAT_SLEEP=y
 CONFIG_SORT=y
 CONFIG_FEATURE_SORT_BIG=y
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
+CONFIG_SPLIT=y
+CONFIG_FEATURE_SPLIT_FANCY=y
 CONFIG_STAT=y
 CONFIG_FEATURE_STAT_FORMAT=y
 CONFIG_STTY=y
@@ -335,7 +335,7 @@ CONFIG_SETFONT=y
 CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
 CONFIG_DEFAULT_SETFONT_DIR=""
 CONFIG_SETKEYCODES=y
-# CONFIG_SETLOGCONS is not set
+CONFIG_SETLOGCONS=y
 CONFIG_SHOWKEY=y
 
 #
@@ -367,7 +367,7 @@ CONFIG_FEATURE_VI_MAX_LEN=4096
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
+CONFIG_FEATURE_VI_REGEX_SEARCH=y
 CONFIG_FEATURE_VI_USE_SIGNALS=y
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y
@@ -435,7 +435,7 @@ CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
 # CONFIG_FEATURE_KILL_REMOVED is not set
 CONFIG_FEATURE_KILL_DELAY=0
-# CONFIG_FEATURE_INIT_SCTTY is not set
+CONFIG_FEATURE_INIT_SCTTY is not set
 # CONFIG_FEATURE_INIT_SYSLOG is not set
 CONFIG_FEATURE_EXTRA_QUIET=y
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
@@ -634,7 +634,7 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
 #
 # Miscellaneous Utilities
 #
-# CONFIG_CONSPY is not set
+CONFIG_CONSPY=y
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_FEATURE_LESS_BRACKETS is not set
@@ -660,14 +660,14 @@ CONFIG_FEATURE_COMPRESS_BBCONFIG=y
 CONFIG_BEEP=y
 CONFIG_FEATURE_BEEP_FREQ=4000
 CONFIG_FEATURE_BEEP_LENGTH_MS=30
-CONFIG_CHAT=y
-CONFIG_FEATURE_CHAT_NOFAIL=y
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
 # CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
-CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
-CONFIG_FEATURE_CHAT_SEND_ESCAPES=y
-CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y
-CONFIG_FEATURE_CHAT_CLR_ABORT=y
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
 # CONFIG_CHRT is not set
 # CONFIG_CROND is not set
 # CONFIG_FEATURE_CROND_D is not set
@@ -712,14 +712,14 @@ CONFIG_RAIDAUTORUN=y
 CONFIG_READAHEAD=y
 # CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-# CONFIG_SETSID is not set
+CONFIG_RX=y
+CONFIG_SETSID=y
 CONFIG_STRINGS=y
 # CONFIG_TASKSET is not set
 # CONFIG_FEATURE_TASKSET_FANCY is not set
 CONFIG_TIME=y
 CONFIG_TIMEOUT=y
-# CONFIG_TTYSIZE is not set
+CONFIG_TTYSIZE=y
 CONFIG_VOLNAME=y
 # CONFIG_WALL is not set
 # CONFIG_WATCHDOG is not set
@@ -743,7 +743,7 @@ CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
 CONFIG_VERBOSE_RESOLUTION_ERRORS=y
 # CONFIG_ARP is not set
-# CONFIG_ARPING is not set
+CONFIG_ARPING=y
 CONFIG_BRCTL=y
 CONFIG_FEATURE_BRCTL_FANCY=y
 CONFIG_FEATURE_BRCTL_SHOW=y
@@ -816,7 +816,7 @@ CONFIG_FEATURE_NETSTAT_PRG=y
 CONFIG_NSLOOKUP=y
 CONFIG_NTPD=y
 CONFIG_FEATURE_NTPD_SERVER=y
-# CONFIG_PSCAN is not set
+CONFIG_PSCAN=y
 CONFIG_ROUTE=y
 # CONFIG_SLATTACH is not set
 # CONFIG_TCPSVD is not set
@@ -844,10 +844,10 @@ CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
 CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
 CONFIG_TUNCTL=y
 CONFIG_FEATURE_TUNCTL_UG=y
-# CONFIG_UDHCPC6 is not set
-CONFIG_UDHCPD=y
-CONFIG_DHCPRELAY=y
-CONFIG_DUMPLEASES=y
+CONFIG_UDHCPC6=y
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
 # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
 CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
@@ -867,7 +867,7 @@ CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 CONFIG_FEATURE_WGET_TIMEOUT=y
-# CONFIG_ZCIP is not set
+CONFIG_ZCIP=y
 
 #
 # Print Utilities
@@ -971,7 +971,7 @@ CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_BUILTIN_ECHO=y
 CONFIG_ASH_BUILTIN_PRINTF=y
 CONFIG_ASH_BUILTIN_TEST=y
-# CONFIG_ASH_CMDCMD is not set
+CONFIG_ASH_CMDCMD=y
 CONFIG_ASH_MAIL=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_RANDOM_SUPPORT=y

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

[Robin H. Johnson]

commit:     20e2e9866b5d9d58ff6cb4e9b089fb9ff5435fbc
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 22:22:57 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 22:23:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=20e2e986

Bug #591770: typo fixup from script problems.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/busy-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 2d8af84..00d3f0a 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -192,7 +192,7 @@ CONFIG_BASE64=y
 # CONFIG_WHO is not set
 # CONFIG_USERS is not set
 # CONFIG_CAL is not set
- CONFIG_CATV is not set
+# CONFIG_CATV is not set
 CONFIG_CHGRP=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
@@ -435,7 +435,7 @@ CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
 # CONFIG_FEATURE_KILL_REMOVED is not set
 CONFIG_FEATURE_KILL_DELAY=0
-CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_INIT_SCTTY is not set
 # CONFIG_FEATURE_INIT_SYSLOG is not set
 CONFIG_FEATURE_EXTRA_QUIET=y
 # CONFIG_FEATURE_INIT_COREDUMPS is not set

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

[Richard Farina]

commit:     87de69ac88fb7b6e3f6424154d3721124793f024
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 18:00:05 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 18:00:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=87de69ac

fix for bug 598694

looks like a little typo, missing $ on an obvious check on two lines.
thanks to grknight for pointing it out

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 72e1543..df2272b 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -322,7 +322,7 @@ case "${REAL_ROOT}" in
 esac
 
 # Verify that it is safe to use ZFS
-if [ "USE_ZFS" = "1" ]
+if [ "$USE_ZFS" = "1" ]
 then
 	for i in /sbin/zfs /sbin/zpool
 	do
@@ -334,7 +334,7 @@ then
 		fi
 	done
 
-	[ "USE_ZFS" = "1" ] && MY_HWOPTS="${MY_HWOPTS} zfs"
+	[ "$USE_ZFS" = "1" ] && MY_HWOPTS="${MY_HWOPTS} zfs"
 fi
 
 splash 'init'

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

[Richard Farina]

commit:     8660bd6529394dc38975dd8ef0d6a2a80013ffd2
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  8 04:53:10 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 04:53:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8660bd65

fix for bug #597154

I was unable to boot my zfs system without this and able to boot with
it.

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index df2272b..965d28f 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -596,7 +596,7 @@ do
 			got_good_root=0
 
 		# Check for a block device or /dev/nfs
-		elif [ -b "${REAL_ROOT}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ]
+		elif [ -b "${REAL_ROOT}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ] || [ "${ROOTFSTYPE}" = "zfs" ]
 		then
 			got_good_root=1
 

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

[Matt Thode]

commit:     85ced9613e5c16795632c9dcdbf12a9387c3b978
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Jan  2 20:04:25 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 20:04:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=85ced961

unset CONFIG_FEATURE_VI_REGEX_SEARCH to fix musl builds

 defaults/busy-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 00d3f0a..74938c6 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -367,7 +367,7 @@ CONFIG_FEATURE_VI_MAX_LEN=4096
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_REGEX_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
 CONFIG_FEATURE_VI_USE_SIGNALS=y
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y

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

[Robin H. Johnson]

commit:     efc3d67b0ab49ca3ffed142d811f45a3defc0822
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 22:41:09 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 22:41:09 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=efc3d67b

kconfig: CONFIG_BUILD_DOCSRC not needed.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=601224
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 820b49b..34ce713 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -20,7 +20,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
-CONFIG_BUILD_DOCSRC=y
+# CONFIG_BUILD_DOCSRC is not set
 
 #
 # General setup

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

[Robin H. Johnson]

commit:     629ea57860b7332a4922fc77b07a9118551eec0f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 23:15:05 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 23:37:17 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=629ea578

Improve documentation for HWOPTS/MY_HWOPTS.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.defaults | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 43f5c09..b7128eb 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -79,10 +79,17 @@ LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop'
 
 DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"
 
-# This should list all possible hwopts that take do/no prefixes
-# this is part of the load order too fyi
-HWOPTS='keymap cache modules nvme pata sata scsi usb firewire waitscan lvm dmraid multipath mdadm zfs fs net'
+# HWOPTS is the list of ALL options that take do/no prefixes, almost all of
+# which match a MODULES_* variable; it is ALSO the order of evaluation.
+#
+# The following entries are special behavior, rather than module loading
+# - keymap
+# - cache
+# - modules
+HWOPTS_BLK='nvme pata sata scsi usb firewire waitscan'
+HWOPTS_OBSOLETE='pcmcia ataraid' # Obsolete stuff that might be useful on old hardware, do$X only.
+HWOPTS="keymap cache modules ${HWOPTS_BLK} lvm dmraid multipath mdadm zfs fs net iscsi crypto"
 
-# Only sections that are in by default or those that
-# are not module groups need to be defined here...
-MY_HWOPTS='modules pata nvme sata scsi usb firewire waitscan dmraid mdadm fs net iscsi crypto'
+# This is the set of default HWOPTS, in the order that they are loaded.
+# This is whitespace aligned with HWOPTS above.
+MY_HWOPTS="          modules ${HWOPT_BLK}      dmraid           mdadm     fs net       crypto"

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

[Robin H. Johnson]

commit:     5a20e6cb2d0fec5787ac38c23f688e429e833976
Author:     NP-Hardass <np.hardass <AT> gmail <DOT> com>
AuthorDate: Mon Aug  8 02:05:33 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 23:42:32 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5a20e6cb

defaults/initrd.scripts: bug #590610, fix typo in sdelay

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 31ebeec..1ee1699 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1345,7 +1345,7 @@ sdelay() {
 		sleep ${SDELAY}
 	elif [ "${CDROOT}" = '1' ]
 	then
-		good_msg 'Hint: Use scandelay[=seconds] if your live medium is slowand boot fails'
+		good_msg 'Hint: Use scandelay[=seconds] if your live medium is slow and boot fails'
 	fi
 }
 

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

[Robin H. Johnson]

commit:     e249807ef16b86e3223e05d6657698c2a4d77993
Author:     Daniel Robbins <drobbins <AT> funtoo <DOT> org>
AuthorDate: Thu Feb 26 06:08:55 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 00:09:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e249807e

Add firstmods boot option (from Funtoo genkernel).

Add firstmods boot option, which allows for a comma-delimited list of modules to try loading first. If rootfstype is specified too, and the block device is visible after these modules are loaded, then the massive module loading is skipped.

(cherry picked from commit 7059bfd8c6a4a6ef9c0f3307388d37ad817dd3af)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 17166e4..d00e1c7 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -19,12 +19,14 @@ call_func_timeout()
 }
 
 modules_load() {
+	fn=$1
+	shift
 	for module in $*
 	do
-		echo ${module} >> /etc/modules/extra_load
+		echo ${module} >> /etc/modules/$fn
 	done
 
-	modules_scan extra_load
+	modules_scan $fn
 }
 
 modules_scan() {
@@ -44,6 +46,10 @@ modules_scan() {
 				printf "%b\n" "${BOLD}   ::${NORMAL} Skipping ${x}..."
 		elif [ "${MLOAD}" = "${MLIST}" ]
 		then
+			if [ "${ROOTFSTYPE}" != 'auto' ] && [ -b "${REAL_ROOT}" ]; then
+				echo "Root block device found, continuing..."
+				break
+			fi
 			if [ -n "${DEBUG}" ]; then
 				printf "%b" "${BOLD}   ::${NORMAL} "
 				printf "%b" "Scanning for ${x}..."

diff --git a/defaults/linuxrc b/defaults/linuxrc
index d09b96f..db8c490 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -139,6 +139,10 @@ do
 		rootdelay|rootwait)
 			ROOTDELAY=5
 		;;
+		firstmods=*)
+			FIRSTMODS=${x#*=}
+			FIRSTMODS=$(echo ${MDOLIST} | sed -e 's/,/ /g')
+			;;
 		# Module no-loads
 		doload=*)
 			MDOLIST=${x#*=}
@@ -363,6 +367,10 @@ then
 elif [ -d "/lib/modules/${KV}" ]
 then
 	good_msg 'Loading modules'
+	if [ -n "$FIRSTMODS" ]; then
+		# try these modules first -- detected modules for root device:
+		modules_load firstmods ${FIRSTMODS}
+	fi
 	# Load appropriate kernel modules
 	if [ "${NODETECT}" != '1' ]
 	then
@@ -372,7 +380,7 @@ then
 		done
 	fi
 	# Always eval doload=...
-	modules_load ${MDOLIST}
+	modules_load extra_load ${MDOLIST}
 else
 	good_msg 'Skipping module load; no modules in the ramdisk!'
 fi

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

[Robin H. Johnson]

commit:     2c45090d0488e5637b83631619caed10346c5a2e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 00:11:03 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 00:11:03 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2c45090d

firstmods: Fix wrong module variable.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index db8c490..950537a 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -141,7 +141,7 @@ do
 		;;
 		firstmods=*)
 			FIRSTMODS=${x#*=}
-			FIRSTMODS=$(echo ${MDOLIST} | sed -e 's/,/ /g')
+			FIRSTMODS=$(echo ${FIRSTMODS} | sed -e 's/,/ /g')
 			;;
 		# Module no-loads
 		doload=*)

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

[Robin H. Johnson]

commit:     bfd093141d584d42aed0a3c881986c7bbbc3589d
Author:     Tomasz Wasiak <tjwasiak <AT> poczta <DOT> onet <DOT> pl>
AuthorDate: Mon Dec 30 17:10:46 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 01:50:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bfd09314

Real root mount flags verbosity

Inform about all real root filesystem mount parameters.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=496512#c5
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ae83023..7133cd4 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -646,10 +646,10 @@ do
 			[ -L ${REAL_ROOT} ] && REAL_ROOT=`readlink ${REAL_ROOT}`
 			# mount ro so fsck doesn't barf later
 			if [ "${REAL_ROOTFLAGS}" = '' ]; then
-				good_msg "Using mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE}"
+				good_msg "Using mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE} ${REAL_ROOT} ${NEW_ROOT}"
 				mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE} ${REAL_ROOT} ${NEW_ROOT}
 			else
-				good_msg "Using mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE},${REAL_ROOTFLAGS}"
+				good_msg "Using mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE},${REAL_ROOTFLAGS} ${REAL_ROOT} ${NEW_ROOT}"
 				mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE},${REAL_ROOTFLAGS} ${REAL_ROOT} ${NEW_ROOT}
 			fi
 		fi

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

[Robin H. Johnson]

commit:     79036b237655963983c2cc7992a97086c9495559
Author:     Tomasz Wasiak <tjwasiak <AT> poczta <DOT> onet <DOT> pl>
AuthorDate: Mon Dec 30 17:09:41 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 01:50:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=79036b23

doload= and noload= enhancements

Support for comma separated multiple module list for doload and noload kernel command line parameters.

(minor cleanups to apply & be shorter)

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=496512#c4
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/linuxrc | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 950537a..ae83023 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -140,20 +140,17 @@ do
 			ROOTDELAY=5
 		;;
 		firstmods=*)
-			FIRSTMODS=${x#*=}
-			FIRSTMODS=$(echo ${FIRSTMODS} | sed -e 's/,/ /g')
+			FIRSTMODS=$(echo ${FIRSTMODS} ${x#*=} | sed -e 's/^\ *//;s/,/ /g')
 			;;
 		# Module no-loads
 		doload=*)
-			MDOLIST=${x#*=}
-			MDOLIST=$(echo ${MDOLIST} | sed -e 's/,/ /g')
+			MDOLIST=$(echo ${MDOLIST} ${x#*=} | sed -e 's/^\ *//;s/,/ /g')
 		;;
 		nodetect)
 			NODETECT=1
 		;;
 		noload=*)
-			MLIST=${x#*=}
-			MLIST="$(echo ${MLIST} | sed -e 's/,/ /g')"
+			MLIST=$(echo ${MLIST} ${x#*=} | sed -e 's/^\ *//;s/,/ /g')
 			export MLIST
 		;;
 		# Redirect output to a specific tty

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

[Robin H. Johnson]

commit:     5eaf116d571a17fdc0bd14fdb6761557bc4fa763
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 21:51:16 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 21:52:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5eaf116d

linuxrc: show why switch_root might fail, and make related code more readable.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d00e1c7..efc6421 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -567,6 +567,7 @@ findnfsmount() {
 			else
 				bad_msg "The DHCP Server did not send a valid root-path."
 				bad_msg "Please check your DHCP setup, or provide a nfsroot=<...> parameter."
+				return 1
 			fi
 		fi
 
@@ -590,6 +591,7 @@ findnfsmount() {
 					REAL_ROOT="/dev/nfs"
 				else
 					bad_msg "NFS Mounting failed. Is the path corrent ?"
+					return 1
 				fi
 			else
 				good_msg "Attempting to mount NFS root on ${NFSROOT} with options ${NFSOPTIONS}"
@@ -599,12 +601,15 @@ findnfsmount() {
 					REAL_ROOT="/dev/nfs"
 				else
 					bad_msg "NFS Mounting failed. Is the path correct ?"
+					return 1
 				fi
 				# FIXME: Need to start portmap and the other rpc daemons in
 				# order to remount rw.
 			fi
 
 		fi
+	else # IP / DHCP
+		return 1
 	fi
 }
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 66f7bd9..b227ed2 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -640,6 +640,7 @@ do
 		# Try to mount the device as ${NEW_ROOT}
 		if [ "${REAL_ROOT}" = '/dev/nfs' ]; then
 			findnfsmount
+			mountret=$?
 		else
 			# If $REAL_ROOT is a symlink
 			# Resolve it like util-linux mount does
@@ -648,15 +649,17 @@ do
 			if [ "${REAL_ROOTFLAGS}" = '' ]; then
 				good_msg "Using mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE} ${REAL_ROOT} ${NEW_ROOT}"
 				mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE} ${REAL_ROOT} ${NEW_ROOT}
+				mountret=$?
 			else
 				good_msg "Using mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE},${REAL_ROOTFLAGS} ${REAL_ROOT} ${NEW_ROOT}"
 				mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE},${REAL_ROOTFLAGS} ${REAL_ROOT} ${NEW_ROOT}
+				mountret=$?
 			fi
 		fi
 
 		# If mount is successful break out of the loop
 		# else not a good root and start over.
-		if [ "$?" = '0' ]
+		if [ "$mountret" = '0' ]
 		then
 			if [ -d ${NEW_ROOT}/dev -a -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ]
 			then
@@ -1037,12 +1040,22 @@ fi
 rundebugshell "before entering switch_root"
 
 # init_opts is set in the environment by the kernel when it parses the command line
-exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" ${init_opts}
+init=${REAL_INIT:-/sbin/init}
+if ! mountpoint "${CHROOT}"; then
+	bad_msg "$CHROOT was not a mountpoint"
+elif [ ! -x ${CHROOT}/${init} ]; then
+	bad_msg "init=${init} does not exist in the rootfs!"
+elif [ $$ != 1 ]; then
+	bad_msg "PID was not 1! switch_root would fail"
+else
+	good_msg "Switching to real root: /sbin/switch_root -c /dev/console ${CHROOT} ${init} ${init_opts}"
+	exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${init}" ${init_opts}
+fi
 
 # If we get here, something bad has happened
 splash 'verbose'
 
-bad_msg "A fatal error has occured since ${REAL_INIT:-/sbin/init} did not"
+bad_msg "A fatal error has occured since ${init} did not"
 bad_msg "boot correctly. Trying to open a shell..."
 
 exec /bin/bash

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

[Robin H. Johnson]

commit:     cd9bc0d95e5b904ce55d354c1aa3f2d69ee3d4e0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 18:14:20 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 18:14:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cd9bc0d9

defaults/initrd.defaults: Fix misnamed variable.

Thanks to Andrey Tikhomirov <vamp <AT> vampik.ru> for catching this!

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=622930
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index b7128eb..b028f72 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -92,4 +92,4 @@ HWOPTS="keymap cache modules ${HWOPTS_BLK} lvm dmraid multipath mdadm zfs fs net
 
 # This is the set of default HWOPTS, in the order that they are loaded.
 # This is whitespace aligned with HWOPTS above.
-MY_HWOPTS="          modules ${HWOPT_BLK}      dmraid           mdadm     fs net       crypto"
+MY_HWOPTS="          modules ${HWOPTS_BLK}      dmraid           mdadm     fs net       crypto"

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

[Robin H. Johnson]

commit:     2ed47ccb70055afb8f229a51174e93ef38e8697b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 06:24:12 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 06:28:15 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2ed47ccb

software: newer mdadm is xz-compressed.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index fe2962e..ae63197 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -21,7 +21,7 @@ LVM_BINCACHE="${LVM_BINCACHE:-%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2}"
 
 MDADM_VER="${MDADM_VER:-VERSION_MDADM}"
 MDADM_DIR="${MDADM_DIR:-mdadm-${MDADM_VER}}"
-MDADM_SRCTAR="${MDADM_SRCTAR:-${DISTDIR}/mdadm-${MDADM_VER}.tar.bz2}"
+MDADM_SRCTAR="${MDADM_SRCTAR:-${DISTDIR}/mdadm-${MDADM_VER}.tar.xz}"
 MDADM_BINCACHE="${MDADM_BINCACHE:-%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2}"
 
 DMRAID_VER="${DMRAID_VER:-VERSION_DMRAID}"

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

[Robin H. Johnson]

commit:     5e669a801c9c93d9852c1904b19b5a39937898bf
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  4 02:38:27 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Sep  4 02:43:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5e669a80

defaults/kernel-generic-config: expand all network vendors

The network Kconfig file hide most drivers behind if blocks for the
vendor. Enabling the CONFIG_NET_VENDOR_* blocks is needed to ensure
directly setting a specific driver in the config actually works (e.g.,
CONFIG_E100 does NOT enable CONFIG_NET_VENDOR_INTEL otherwise)

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 76 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 3 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 34ce713..0b597c9 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -1387,7 +1387,6 @@ CONFIG_VITESSE_PHY=m
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
-CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
 CONFIG_DNET=m
@@ -3883,11 +3882,9 @@ CONFIG_SCSI_ARCMSR_AER=y
 CONFIG_EL3=m
 # CONFIG_3C515 is not set
 # CONFIG_LANCE is not set
-CONFIG_NET_VENDOR_SMC=y
 # CONFIG_WD80x3 is not set
 CONFIG_ULTRA=m
 # CONFIG_SMC9194 is not set
-# CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NI52 is not set
 # CONFIG_NI65 is not set
 # CONFIG_AT1700 is not set
@@ -4731,3 +4728,76 @@ CONFIG_BNX2X_SRIOV=y
 CONFIG_DRM_RADEON_UMS=y
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+
+# Enable all network vendors:
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_NET_VENDOR_APPLE=y
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_NET_VENDOR_AURORA=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_FARADAY=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_NET_VENDOR_HISILICON=y
+CONFIG_NET_VENDOR_HP=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MEDIATEK=y
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_NET_VENDOR_MOXART=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NET_VENDOR_NUVOTON=y
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_NET_VENDOR_PASEMI=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_NET_VENDOR_SGI=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_TOSHIBA=y
+CONFIG_NET_VENDOR_TUNDRA=y
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_NET_VENDOR_XSCALE=y

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

[Robin H. Johnson]

commit:     f7664921cf99cb1072215c488bb7a5f4018ff419
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  4 02:54:05 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Sep  4 02:54:05 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f7664921

defaults/kernel-generic-config: NVME support.

Ensure NVME kernel is built for all platforms.

Fixes: https://bugs.gentoo.org/624854
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 0b597c9..8c2c343 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -4728,6 +4728,11 @@ CONFIG_BNX2X_SRIOV=y
 CONFIG_DRM_RADEON_UMS=y
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_NVME_SCSI=y
+CONFIG_NVM=y
+CONFIG_NVM_RRPC=m
 
 # Enable all network vendors:
 CONFIG_NET_VENDOR_3COM=y

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

[Robin H. Johnson]

commit:     3a005bbaea41cf1e87e6a256bbf9e53cd26584a9
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  4 05:52:41 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Sep  4 05:52:41 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3a005bba

initrd.scripts: fix cdupdate.sh path check

This has been broken since the v3.4.52 release, more than 2 years ago.
Looks like cdupdate.sh gets very little use.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=593866
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index efc6421..ee9aeb5 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1410,10 +1410,14 @@ verbose_kmsg() {
 cdupdate() {
 	if [ "${CDROOT}" = '1' ]
 	then
-		if [ -x /${CDROOT_PATH}/cdupdate.sh ]
+		cdupdate_path=''
+		for p in /${NEW_ROOT}/${CDROOT_PATH}/ /${CDROOT_PATH}/ ; do
+			[ -x "${p}/cdupdate.sh" ] && cdupdate_path="${p}/cdupdate.sh" && break
+		done
+		if [ -n "${cdupdate_path}" ]
 		then
-			good_msg "Running cdupdate.sh"
-			${CDROOT_PATH}/cdupdate.sh
+			good_msg "Running cdupdate.sh ($cdupdate_path)"
+			${cdupdate_path}
 			if [ "$?" != '0' ]
 			then
 				bad_msg "Executing cdupdate.sh failed!"

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

[Robin H. Johnson]

commit:     bc0cab8c051d88dbeedffa310aec29eef3ea3c24
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  4 06:33:14 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Sep  4 06:33:14 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bc0cab8c

defaults/kernel-generic-config: CONFIG_BCACHE=m.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=522688
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 50fa77d..2f57c9c 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -3398,6 +3398,7 @@ CONFIG_AUTOFS4_FS=m
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_NILFS2_FS=m
 
+CONFIG_BCACHE=m
 CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
 # CONFIG_FSCACHE_HISTOGRAM is not set

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

[Robin H. Johnson]

commit:     2f8eece2e2f4f646476ba5fd8ed89d66b2662f41
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 00:49:23 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 00:49:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2f8eece2

kernel-generic-config: Intel PATA SCH support

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=566332
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 79adb61..cd5508f 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -658,6 +658,7 @@ CONFIG_PATA_SIS=m
 CONFIG_PATA_VIA=m
 # CONFIG_PATA_WINBOND is not set
 CONFIG_PATA_ATP867X=m
+CONFIG_PATA_SCH=m
 
 # CONFIG_SCSI_BUSLOGIC is not set
 CONFIG_SCSI_INITIO=m

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

[Robin H. Johnson]

commit:     1da49d6c54c0eeadee82688f46c93e720248e694
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 00:36:33 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 00:36:33 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1da49d6c

kernel-generic-config: set all options for openrc & systemd.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=482964
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 8b8b54f..2d6ef3a 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -5,6 +5,7 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_MMU=y
+CONFIG_SHMEM=y
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_LOCALVERSION=""
@@ -180,6 +181,7 @@ CONFIG_EDAC_I7300=m
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_SCRIPT=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
@@ -3827,6 +3829,20 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 
+CONFIG_EXPERT=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_DMIID=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_SIGNALFD=y
+CONFIG_SYSFS=y
+CONFIG_TIMERFD=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_ANON_INODES=y
+CONFIG_EVENTFD=y
+CONFIG_NLATTR=y
+
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set

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

[Robin H. Johnson]

commit:     859cfb6823a2ad2eb2a3d3132553b28273c2f32a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 00:51:42 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 00:51:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=859cfb68

defaults/kernel-generic-config: CONFIG_FB_RADEON conflicts with CONFIG_DRM_RADEON.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=575400
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index cd5508f..369c6d1 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -2780,9 +2780,6 @@ CONFIG_FB_MATROX_MULTIHEAD=y
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 # CONFIG_FB_PM3 is not set
-CONFIG_FB_RADEON=m
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_RADEON_I2C=y
 CONFIG_FB_RIVA=m
 # CONFIG_FB_RIVA_DEBUG is not set
 # CONFIG_FB_RIVA_I2C is not set
@@ -3811,7 +3808,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_FB_NVIDIA_BACKLIGHT=y
 CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_RADEON_BACKLIGHT=y
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
 # CONFIG_BACKLIGHT_SAHARA is not set

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

[Robin H. Johnson]

commit:     9fcf7cc2e828dea9829e4860b80b0ff207f7bbdf
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 00:42:02 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 00:42:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9fcf7cc2

kernel-generic-config: include pstore captures & ramoops module for debugging

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 2d6ef3a..79adb61 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -4553,6 +4553,10 @@ CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_EINJ=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_PSTORE=y
+CONFIG_PSTORE_CONSOLE=y
+CONFIG_PSTORE_PMSG=y
+CONFIG_PSTORE_FTRACE=y
+CONFIG_PSTORE_RAM=m
 CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_IPMI=y

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

[Robin H. Johnson]

commit:     f6cc1eaabe9d6cb27c12fa89d170b2a87bcd0781
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 18:55:43 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 18:55:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f6cc1eaa

initrd.default: dolvm by default, was already implied by dodmraid.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index f924140..49bf1ba 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -92,4 +92,4 @@ HWOPTS="keymap cache modules virtio ${HWOPTS_BLK} lvm dmraid multipath mdadm zfs
 
 # This is the set of default HWOPTS, in the order that they are loaded.
 # This is whitespace aligned with HWOPTS above.
-MY_HWOPTS="          modules virtio ${HWOPTS_BLK}     dmraid           mdadm     fs net       crypto"
+MY_HWOPTS="          modules virtio ${HWOPTS_BLK} lvm dmraid           mdadm     fs net       crypto"

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

[Robin H. Johnson]

commit:     7254cffefdf4c7e971c4417c69ca70f8f4ac8fc9
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 18:55:01 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 18:55:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7254cffe

initrd.defaults: virtio modules in initramfs, enabled by default.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.defaults | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index b028f72..f924140 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -88,8 +88,8 @@ DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"
 # - modules
 HWOPTS_BLK='nvme pata sata scsi usb firewire waitscan'
 HWOPTS_OBSOLETE='pcmcia ataraid' # Obsolete stuff that might be useful on old hardware, do$X only.
-HWOPTS="keymap cache modules ${HWOPTS_BLK} lvm dmraid multipath mdadm zfs fs net iscsi crypto"
+HWOPTS="keymap cache modules virtio ${HWOPTS_BLK} lvm dmraid multipath mdadm zfs fs net iscsi crypto"
 
 # This is the set of default HWOPTS, in the order that they are loaded.
 # This is whitespace aligned with HWOPTS above.
-MY_HWOPTS="          modules ${HWOPTS_BLK}      dmraid           mdadm     fs net       crypto"
+MY_HWOPTS="          modules virtio ${HWOPTS_BLK}     dmraid           mdadm     fs net       crypto"

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

[Robin H. Johnson]

commit:     9ea451c536588ffa0579f57ca092609661b47442
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 03:03:38 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 03:03:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9ea451c5

modules_load: sync MODULES_SCSI

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 9aa16c1..4ad3304 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -11,7 +11,7 @@ MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm
 MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas virtio_scsi virtio_blk"
 MODULES_WAITSCAN="scsi_wait_scan"
 
 # Hardware (Network)

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

[Robin H. Johnson]

commit:     88fb7f3aacdf3be6c1461ea37d42119a08fbe50c
Author:     Daniel Robbins <drobbins <AT> funtoo <DOT> org>
AuthorDate: Sun Nov 12 02:39:18 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 03:06:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=88fb7f3a

Add f2fs support.

 defaults/linuxrc      | 5 +++++
 defaults/modules_load | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index b227ed2..7fd32f0 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -338,6 +338,11 @@ then
 	[ "$USE_ZFS" = "1" ] && MY_HWOPTS="${MY_HWOPTS} zfs"
 fi
 
+# Hack for f2fs, which uses crc32 but does not depend on it (in many kernels at least):
+if [ "${ROOTFSTYPE}" = "f2fs" ]; then
+	FIRSTMODS="${FIRSTMODS} crc32_generic"
+fi
+
 splash 'init'
 
 cmdline_hwopts

diff --git a/defaults/modules_load b/defaults/modules_load
index 4ad3304..67ef3b9 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -29,7 +29,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32_generic aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto virtio_net"

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

[Robin H. Johnson]

commit:     6b7f6aa82313e01f88228f871239f34f726d6afb
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 02:57:36 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 02:57:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6b7f6aa8

defaults/modules_load: sync MODULES_USB with arches, was missing ehci-pci,xhci-pci.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 333c5b8..b17b84a 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -23,7 +23,7 @@ MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"
-MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd xhci-hcd xhci-plat usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
+MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
 
 # Filesystems
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"

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

[Richard Farina]

commit:     7a76477029553eafbe0caa48932b0728b180fda4
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  5 22:51:58 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr  5 22:51:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7a764770

I hate myself for this missing {

 defaults/initrd.scripts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 740b342..2fb0eb4 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1795,6 +1795,7 @@ strip_mount_options()
 }
 
 checkfs()
+{
 	if [ -r "/proc/filesystems" ]; then
 		if grep -qs "$1" /proc/filesystems ; then
 			return 0

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

[Richard Farina]

commit:     24ad5065fa856389ee9b058f57adffbe752da157
Author:     Christian Nilsson <nikize <AT> gmail <DOT> com>
AuthorDate: Tue Jul 24 23:08:23 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 15:10:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=24ad5065

linuxrc: Add detection of squashfs in initrd root

Allows for the squashfs to be found in the initrd root without mounting CD
This allows iPXE boot by adding the squashfs in a extra cpio initrd

Related: https://bugs.gentoo.org/74628
Related: https://bugs.gentoo.org/494300
Closes: https://bugs.gentoo.org/396467
Signed-off-by: Christian Nilsson <nikize <AT> gmail.com>

 defaults/initrd.defaults |  5 +++++
 defaults/linuxrc         | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 924bdea..2bf14f4 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -70,6 +70,11 @@ CDROOT_PATH='/mnt/cdrom'
 CDROOT_MARKER='/livecd'
 VERIFY=0
 
+# Flag for if ok when using CDROOT
+got_good_root='0'
+# if LOOP found on root before mount, trigger Unpacking additional packages
+got_loop_wo_mount='0'
+
 # AUFS variables
 aufs=0
 aufs_union_file=/livecd.aufs

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 81e7799..17697fc 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -431,6 +431,15 @@ then
 	startiscsi
 fi
 
+# Loop file already exists on fs, assume no mount needed,
+# This allows for squashfs in initrd, which can be used for (i)PXE booting
+if [ -e "${LOOP}" ]
+then
+	got_good_root=1
+	got_loop_wo_mount=1
+	CDROOT_PATH=$(dirname "${LOOP}")
+fi
+
 # Apply scan delay if specified
 sdelay
 
@@ -497,16 +506,16 @@ then
 	if [ 1 = "$aufs" ]; then
                 setup_aufs
 		CHROOT=$aufs_union
-        elif [ 1 = "$overlayfs" ]; then
+        elif [ 1 = "$overlayfs" ] && [ "${got_good_root}" != '1' ]; then
                 bootstrapCD
 		CHROOT=${NEW_ROOT}
 	fi
 
-	if [ /dev/nfs != "$REAL_ROOT" ] && [ sgimips != "$LOOPTYPE" ] && [ 1 != "$aufs" ] && [ 1 != "$overlayfs" ]; then
+	if [ "${got_good_root}" != '1' ] && [ /dev/nfs != "$REAL_ROOT" ] && [ sgimips != "$LOOPTYPE" ] && [ 1 != "$aufs" ] && [ 1 != "$overlayfs" ]; then
 		bootstrapCD
 	fi
 
-	if [ "${REAL_ROOT}" = '' ]
+	if [ "${REAL_ROOT}" = '' ] && [ "${got_good_root}" != '1' ]
 	then
 		warn_msg "No bootable medium found. Waiting for new devices..."
 		COUNTER=0
@@ -518,7 +527,7 @@ then
 		bootstrapCD
 	fi
 
-	if [ "${REAL_ROOT}" = '' ]
+	if [ "${REAL_ROOT}" = '' ] && [ "${got_good_root}" != '1' ]
 	then
 		# Undo stuff
 		umount  "${NEW_ROOT}/dev" 2>/dev/null
@@ -865,10 +874,10 @@ FSTAB
                 fi
 	fi
 
-	# Unpacking additional packages from NFS mount
+	# Unpacking additional packages from NFS mount, or root (if squashfs was found there)
 	# This is useful for adding kernel modules to /lib
 	# We do this now, so that additional packages can add whereever they want.
-	if [ "${REAL_ROOT}" = '/dev/nfs' ]
+	if [ "${REAL_ROOT}" = '/dev/nfs' ] || [ "${got_loop_wo_mount}" == '1' ]
 	then
 		if [ -e "${CDROOT_PATH}/add" ]
 		then

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

[Robin H. Johnson]

commit:     a018edd880c62631f92707fc03ea3680b569cd7b
Author:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  4 15:54:34 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 07:35:29 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a018edd8

allow KERNEL_BINARY_OVERRIDE from genkernel.conf

As it is empty don't set KERNEL_BINARY_OVERRIDE in defaults/config.sh

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/config.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/config.sh b/defaults/config.sh
index 3be9e4d..72487b8 100755
--- a/defaults/config.sh
+++ b/defaults/config.sh
@@ -11,7 +11,6 @@ DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE="--INVALID--"
 KERNEL_MAKE_DIRECTIVE_OVERRIDE="${KERNEL_MAKE_DIRECTIVE_OVERRIDE:-${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}}"
 KERNEL_MAKE_DIRECTIVE_2=""
 KERNEL_BINARY="--INVALID--"
-KERNEL_BINARY_OVERRIDE=""
 
 # At a bare minimum, every arch MUST override these two options:
 # KERNEL_MAKE_DIRECTIVE

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

[Robin H. Johnson]

commit:     aa0c1b8902caaf411e6a1abf46fb4d8f5e5867ed
Author:     Christoph Junghans <junghans <AT> lanl <DOT> gov>
AuthorDate: Tue Jul  3 22:00:18 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 07:35:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=aa0c1b89

fix override of KERNEL_MAKE_DIRECTIVE_OVERRIDE

Setting KERNEL_MAKE_DIRECTIVE_OVERRIDE in genkernel.conf didn't
work. As default get loaded afterwards.

Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/config.sh b/defaults/config.sh
index b961f68..3be9e4d 100755
--- a/defaults/config.sh
+++ b/defaults/config.sh
@@ -8,7 +8,7 @@ KERNEL_MAKE_DIRECTIVE="--INVALID--"
 # for xen-based kernels, the default value of
 # KERNEL_MAKE_DIRECTIVE_OVERRIDE cannot be ""
 DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE="--INVALID--"
-KERNEL_MAKE_DIRECTIVE_OVERRIDE="${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}"
+KERNEL_MAKE_DIRECTIVE_OVERRIDE="${KERNEL_MAKE_DIRECTIVE_OVERRIDE:-${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}}"
 KERNEL_MAKE_DIRECTIVE_2=""
 KERNEL_BINARY="--INVALID--"
 KERNEL_BINARY_OVERRIDE=""

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

[Robin H. Johnson]

commit:     03b4d75447212ea5bd529d0757c42ee7b2de4169
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 00:22:11 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 00:22:11 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=03b4d754

Fix 'legacy' mountpoint detection

Was broken due to missing $()

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 7c9fac8..0776423 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -666,7 +666,7 @@ do
 
 		if [ "${ROOTFSTYPE}" = 'zfs' ]
 		then
-			if [ "zfs get -H -o value mountpoint ${REAL_ROOT}" = 'legacy' ]
+			if [ "$(zfs get -H -o value mountpoint "${REAL_ROOT}")" = 'legacy' ]
 			then
 				MOUNT_STATE=rw
 			else

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

[Robin H. Johnson]

commit:     21e016c99f178d9abfb526bbd7fff45a6357d7ef
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 00:21:23 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 00:21:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=21e016c9

whitespace cleanup

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 defaults/linuxrc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 81e7799..38a2ecb 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -104,9 +104,9 @@ do
 			DMRAID_OPTS=${x#*=}
 			USE_DMRAID_NORMAL=1
 		;;
-		domultipath) 
-			good_msg "Booting with multipath activated." 
-			USE_MULTIPATH_NORMAL=1 
+		domultipath)
+			good_msg "Booting with multipath activated."
+			USE_MULTIPATH_NORMAL=1
 		;;
 		dozfs*)
 			USE_ZFS=1
@@ -578,9 +578,9 @@ do
 					prompt_user "REAL_ROOT" "root block device"
 					continue
 				fi
-					
+
 				ROOT_DEV="${REAL_ROOT#*=}"
-				if [ "${ROOT_DEV}" != 'ZFS' ] 
+				if [ "${ROOT_DEV}" != 'ZFS' ]
 				then
 					if [ "$(zfs get type -o value -H ${ROOT_DEV})" = 'filesystem' ]
 					then
@@ -609,8 +609,8 @@ do
 								REAL_ROOT=${i}
 								ROOTFSTYPE=zfs
 								break
-							fi	
-						
+							fi
+
 						done;
 
 					else
@@ -623,7 +623,7 @@ do
 					prompt_user "REAL_ROOT" "root block device"
 					got_good_root=0
 				fi
-					
+
 				continue
 				;;
 		esac
@@ -975,7 +975,7 @@ FSTAB
 if [ -f ${NEW_ROOT}/etc/initramfs.mounts ]; then
 	fslist=$(get_mounts_list)
 else
-	fslist="/usr" 
+	fslist="/usr"
 fi
 
 for fs in $fslist; do

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

[Robin H. Johnson]

commit:     9ae0c9752add3ff79c0eeedbe8f2d6c8aae6b6fe
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 00:22:32 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 00:22:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9ae0c975

Add basic zfs encryption support

This very simple implementation only supports passphrase.

It does not affect booting ecryption-unaware zfs, since
'zpool list -H -o feature <AT> encryption ...' will return 0
on systems where zfs userland utils do not support encryption.

Closes: https://bugs.gentoo.org/show_bug.cgi?id=657374
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 defaults/linuxrc | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 0776423..880d668 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -639,11 +639,32 @@ do
 			prompt_user "REAL_ROOT" "root block device"
 			got_good_root=0
 
-		# Check for a block device or /dev/nfs
+		# Check for a block device or /dev/nfs or zfs encryption
 		elif [ -b "${REAL_ROOT}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ] || [ "${ROOTFSTYPE}" = "zfs" ]
 		then
-			got_good_root=1
-
+			if [ "${ROOTFSTYPE}" = "zfs" ]; then
+				# at this point we determined dataset and are ready to mount
+				# let's check if this dataset is encrypted and ask for passphrase
+				if [ "$(zpool list -H -o feature@encryption "${REAL_ROOT%%/*}")" = 'active' ]; then
+					ZFS_KEYSTATUS="$(zfs get -H -o value keystatus "${REAL_ROOT}")"
+					ZFS_ENCRYPTIONROOT="$(zfs get -H -o value encryptionroot "${REAL_ROOT}")"
+					if ! [ "${ZFS_ENCRYPTIONROOT}" = '-' ] || [ "${ZFS_KEYSTATUS}" = 'available' ]; then
+						good_msg "Detected ZFS encryption, asking for key"
+						zfs load-key "${ZFS_ENCRYPTIONROOT}"
+						retval=$?
+						# if the key loaded fine, confirm got_good_root to exit second while loop
+						if [ ${retval} -eq 0 ];	then
+							got_good_root=1
+						else
+							bad_msg "${ROOT_DEV} is encrypted and not mountable without key"
+							prompt_user "REAL_ROOT" "root block device"
+							got_good_root=0
+						fi
+					fi
+				fi
+			else
+				got_good_root=1
+			fi
 		else
 			bad_msg "Block device ${REAL_ROOT} is not a valid root device..."
 			REAL_ROOT=""

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

[Robin H. Johnson]

commit:     1666b4dec1cd77842d7928f1cb05bcdcba572fe0
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 00:21:39 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 00:21:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1666b4de

Fix leaking stderr

'no such dataset '-'' messages leaking while scanning for bootfs

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 38a2ecb..7c9fac8 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -601,7 +601,7 @@ do
 						for i in ${BOOTFS}
 						do
 
-							zfs get type ${i} > /dev/null
+							zfs get type ${i} > /dev/null 2>&1
 							retval=$?
 
 							if [ ${retval} -eq 0 ];	then

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

[Robin H. Johnson]

commit:     205135d844f76de534417a67235bfcf9ec4eecca
Author:     Guido Jäkel <g.jaekel <AT> dnb <DOT> de>
AuthorDate: Wed Jun 20 08:34:24 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:52:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=205135d8

remove NFS rsize/wsize options from default

I suggest to completely remove "rsize=1024,wsize=1024" from the DEFAULT_NFSOPTIONS:
* The kernel/mount default is "unlimited" and the concrete values will be with negotiated with the NFS server.
* If optional values for {r,w}size are passed to the kernel commandline parameter "nfrsoot=...,<options>", this additinal options are *appended* to the resulting mount options. But (at least) for {r,w}size, the first occurrence strikes; i.e. the values passed via the commandline are ignored in fact.

As a more complex alternative, the function "findnfsmount()" ( <AT>  initrd.scripts, 569ff.) may be rewritten to parse and kick out double-occurences of options.

Background: I run into this issue booting a diskless server; using PXE for the kernel and initramfs and NFS for the rootfs.

Signed-off-by: Guido Jäkel <G.Jaekel <AT> DNB.DE>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 924bdea..8ef8d3c 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -81,7 +81,7 @@ overlayfs_modules_dir=mnt/cdrom
 
 LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop'
 
-DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"
+DEFAULT_NFSOPTIONS="ro,nolock"
 
 # HWOPTS is the list of ALL options that take do/no prefixes, almost all of
 # which match a MODULES_* variable; it is ALSO the order of evaluation.

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

[Robin H. Johnson]

commit:     71016e53a2c77d33e57817f97f9a3c47302daba0
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Jan  5 01:08:45 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:58:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=71016e53

login-remote.sh: remove useless echo and sleep

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/login-remote.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 47e6abf..7a1b21b 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -45,8 +45,6 @@ openLUKSremote() {
 	while [ 1 ]
 	do
 		local gpg_cmd="" crypt_filter_ret=42
-		echo $-
-		sleep 1
 
 		if [ -e ${flag_opened} ]
 		then

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

[Robin H. Johnson]

commit:     93f00250b4596e7f04959485c139bea92e77da2c
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Jan  5 01:07:12 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:58:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=93f00250

Don't set QUIET=1 by default, fixes login-remote.sh messages

QUIET should not be enabled by default, otherwise login-remote.sh will
be quiet and lack messages like "LUKS device /dev/xxx opened".

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 2bf14f4..6a3b792 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -52,7 +52,7 @@ KMINOR=`echo $KV | cut -f2 -d.`
 KVER="${KMAJOR}.${KMINOR}"
 MISCOPTS='debug detect'
 
-QUIET='1'
+QUIET=''
 ROOT_LINKS='bin sbin lib lib32 lib64 boot usr opt emul'
 ROOT_TREES='etc root home var'
 

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

[Robin H. Johnson]

commit:     8aa79ee17291ca2bef5c9117b14d4553afe00fde
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Jan  5 01:11:26 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:58:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8aa79ee1

Fix inconsistent case for ROOT/SWAP.encrypted flag filenames

openLUKS() creates files using upper case names, not lower case.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f8f9825..a88ed60 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1472,12 +1472,12 @@ startLUKS() {
 		/sbin/ifconfig $(echo "${IP}" | awk -F":" '{print $6}' ) 0.0.0.0
 	fi
 
-	if [ -e /root.decrypted ]; then
-		rm /root.decrypted
+	if [ -e /ROOT.decrypted ]; then
+		rm /ROOT.decrypted
 	fi
 
-	if [ -e /swap.decrypted ]; then
-		rm /swap.decrypted
+	if [ -e /SWAP.decrypted ]; then
+		rm /SWAP.decrypted
 	fi
 }
 

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

[Robin H. Johnson]

commit:     05f7b1ab0e7e474358e4da2e0cee6f12f06a1f20
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Jan  5 01:16:34 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:59:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=05f7b1ab

login-remote.sh: unnest second LUKS decryption try

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/login-remote.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 9b52037..a7bba43 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -77,20 +77,20 @@ openLUKSremote() {
 					# 1st try: unencrypted keyfile
 					crypt_filter "cryptsetup ${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
 					crypt_filter_ret=$?
+				fi
 
-					if [ -f /sbin/gpg ] && [ ${crypt_filter_ret} -ne 0 ]
-					then
-						# 2nd try: gpg-encrypted keyfile
-						[ -e /dev/tty ] && mv /dev/tty /dev/tty.org
-						mknod /dev/tty c 5 1
-						gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${LUKS_KEY} |"
-						crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
-						crypt_filter_ret=$?
+				if [ -f /sbin/gpg ] && [ ${crypt_filter_ret} -ne 0 ]
+				then
+					# 2nd try: gpg-encrypted keyfile
+					[ -e /dev/tty ] && mv /dev/tty /dev/tty.org
+					mknod /dev/tty c 5 1
+					gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${LUKS_KEY} |"
+					crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
+					crypt_filter_ret=$?
 
-						[ -e /dev/tty.org ] \
-							&& rm -f /dev/tty \
-							&& mv /dev/tty.org /dev/tty
-					fi
+					[ -e /dev/tty.org ] \
+						&& rm -f /dev/tty \
+						&& mv /dev/tty.org /dev/tty
 				fi
 
 				if [ ${crypt_filter_ret} -eq 0 ]

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

[Robin H. Johnson]

commit:     eb223ce83f9dc6cefd6f41ef7fd753413b12521e
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Jan  5 01:27:28 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:58:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=eb223ce8

login-remote.sh: set vim modeline to use tabs

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/login-remote.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 630d484..47e6abf 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# vim: set noexpandtab:
 
 . /etc/login-remote.conf
 . /etc/initrd.defaults

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

[Robin H. Johnson]

commit:     592d547c4d04625317f0b7dded624934254d186f
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Jan  5 01:19:11 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:59:04 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=592d547c

login-remote.sh: add a 3rd try which relies on user-submit passphrase

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/login-remote.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index a7bba43..4d7aac6 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -93,6 +93,13 @@ openLUKSremote() {
 						&& mv /dev/tty.org /dev/tty
 				fi
 
+				if [ ${crypt_filter_ret} -ne 0 ]
+				then
+					# 3rd try: user-submitted passphrase
+					crypt_filter "cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
+					crypt_filter_ret=$?
+				fi
+
 				if [ ${crypt_filter_ret} -eq 0 ]
 				then
 					touch ${flag_opened}

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

[Robin H. Johnson]

commit:     49aec4c7ace3c77f3fb86a4f5ae68c1c6beda1fa
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Jan  5 01:21:55 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:59:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=49aec4c7

login-remote.sh: only try to decrypt key using GPG if binary exists

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/login-remote.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 7a1b21b..9b52037 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -78,7 +78,7 @@ openLUKSremote() {
 					crypt_filter "cryptsetup ${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
 					crypt_filter_ret=$?
 
-					if [ ${crypt_filter_ret} -ne 0 ]
+					if [ -f /sbin/gpg ] && [ ${crypt_filter_ret} -ne 0 ]
 					then
 						# 2nd try: gpg-encrypted keyfile
 						[ -e /dev/tty ] && mv /dev/tty /dev/tty.org

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

[Robin H. Johnson]

commit:     3b69162f8760e4f49631706723921c3c5dc6986e
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Jan  5 01:29:01 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:59:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3b69162f

Fix init/login-remote logic so that init keeps going once disks are decrypted

* Kill the cryptsetup process started by init, otherwise it will hang
  forever.
* Make init check for an already-opened device before prompting the
  user, otherwise we have to wait for the prompt_user calls to time out.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts  | 10 +++++-----
 defaults/login-remote.sh |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a88ed60..c57f016 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1295,8 +1295,12 @@ openLUKS() {
 	while [ 1 ]
 	do
 		local gpg_cmd=""
+		if [ -e ${flag_opened} ]
+		then
+			good_msg "The LUKS device ${LUKS_DEVICE} meanwhile was opened by someone else."
+			break
 		# if crypt_silent=1 and some error occurs, enter shell quietly
-		if [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( \( ${DEV_ERROR} -eq 1 \) -o \( ${KEY_ERROR} -eq 1 \) \) -o \( ${KEYDEV_ERROR} -eq 1 \) \) ]
+		elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( \( ${DEV_ERROR} -eq 1 \) -o \( ${KEY_ERROR} -eq 1 \) \) -o \( ${KEYDEV_ERROR} -eq 1 \) \) ]
 		then
 			run_shell
 		elif [ ${DEV_ERROR} -eq 1 ]
@@ -1311,10 +1315,6 @@ openLUKS() {
 		then
 			prompt_user "LUKS_KEYDEV" "${LUKS_NAME} key device"
 			KEYDEV_ERROR=0
-		elif [ -e ${flag_opened} ]
-		then
-			good_msg "The LUKS device ${LUKS_DEVICE} meanwhile was opened by someone else."
-			break
 		else
 			LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}")
 

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 4d7aac6..c667b5e 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -104,6 +104,9 @@ openLUKSremote() {
 				then
 					touch ${flag_opened}
 					good_msg "LUKS device ${LUKS_DEVICE} opened" ${CRYPT_SILENT}
+					# Kill the cryptsetup process started by init
+					# so that the boot process can continue
+					killall cryptsetup
 					break
 				else
 					bad_msg "Failed to open LUKS device ${LUKS_DEVICE}" ${CRYPT_SILENT}

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

[Ben Kohler]

commit:     dbb8d892712a632ca4de4e03c96c1c97ccd1f75d
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 22:37:32 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 22:37:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dbb8d892

defaults/kernel-config: add DRM_ADMGPU here too

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 defaults/kernel-config         | 1 +
 defaults/kernel-generic-config | 1 +
 2 files changed, 2 insertions(+)

diff --git a/defaults/kernel-config b/defaults/kernel-config
index 046a9f3..80909ea 100644
--- a/defaults/kernel-config
+++ b/defaults/kernel-config
@@ -2561,6 +2561,7 @@ CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
+CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 369c6d1..6bd2d32 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -2493,6 +2493,7 @@ CONFIG_DRM=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_AMDGPU=m
 # CONFIG_DRM_I810 is not set
 # CONFIG_DRM_I830 is not set
 CONFIG_DRM_MGA=m

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

[Ben Kohler]

commit:     724f5e04eb35f3ee23f0e14896afad6bb6219a9c
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 22:35:39 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 22:35:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=724f5e04

defaults/modules_load: add crc32c change here too

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 99949aa..45c84b9 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32_generic aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto virtio_net"

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

[Thomas Deutschmann]

commit:     a0c779fe73382aaad2988e4f8e686e4d3aafea7f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 19:46:23 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 19:46:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a0c779fe

New unionfs-fuse GitHub mirror uses tar.gz instead of tar.bz2

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index e304bee..1263c9f 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -46,7 +46,7 @@ FUSE_BINCACHE="${FUSE_BINCACHE:-%%CACHE%%/fuse-${FUSE_VER}-%%ARCH%%.tar.bz2}"
 
 UNIONFS_FUSE_VER="${UNIONFS_FUSE_VER:-VERSION_UNIONFS_FUSE}"
 UNIONFS_FUSE_DIR="${UNIONFS_FUSE_DIR:-unionfs-fuse-${UNIONFS_FUSE_VER}}"
-UNIONFS_FUSE_SRCTAR="${UNIONFS_FUSE_SRCTAR:-${DISTDIR}/unionfs-fuse-${UNIONFS_FUSE_VER}.tar.bz2}"
+UNIONFS_FUSE_SRCTAR="${UNIONFS_FUSE_SRCTAR:-${DISTDIR}/unionfs-fuse-${UNIONFS_FUSE_VER}.tar.gz}"
 UNIONFS_FUSE_BINCACHE="${UNIONFS_FUSE_BINCACHE:-%%CACHE%%/unionfs-fuse-${UNIONFS_FUSE_VER}-%%ARCH%%.bz2}"
 
 GPG_VER="${GPG_VER:-VERSION_GPG}"

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

[Robin H. Johnson]

commit:     7ea94b035c91e0edee183522cdeb51810e043b72
Author:     Laurence Perkins <lperkins <AT> zagmail <DOT> gonzaga <DOT> edu>
AuthorDate: Fri Mar 29 17:48:05 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 21:26:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7ea94b03

Intel RST/Matrix RAID support

Intel Matrix RAID uses a nested container structure requiring that the array first be assembled, and then the actual storage volumes be activated.

Signed-Off-By: Laurence Perkins <lperkins <AT> zagmail.gonzaga.edu>
(cherry picked from commit 952ecaffb742fef7422e313af5fa0a4426625e14)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c57f016..5d3a220 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1074,6 +1074,9 @@ startVolumes() {
 		if [ -x '/sbin/mdadm' ]
 		then
 			/sbin/mdadm --assemble --scan
+			#Intel Matrix RAID (and possibly others) have a container layer above the actual volumes,
+			#So we have to look for volumes that haven't been activated.
+			mdadm -IRs
 		else
 			bad_msg "mdadm not found: skipping mdadm raid assembly!"
 		fi

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

[Thomas Deutschmann]

commit:     83e20abc4088395ffe47faf428e324c33b42e894
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 01:16:15 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 01:27:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=83e20abc

init: fix "sh: can't access tty; job control turned off"

Link: https://busybox.net/FAQ.html#job_control
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 5d3a220..b9b958b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1567,7 +1567,8 @@ setup_md_device() {
 
 do_rundebugshell() {
 	good_msg 'Type "exit" to continue with normal bootup.'
-	[ -x /bin/sh ] && /bin/sh || /bin/ash
+	[ -x /bin/sh ] && SH=/bin/sh || SH=/bin/ash
+	setsid ${SH} -c "exec cttyhack ${SH} --login"
 }
 
 rundebugshell() {

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

[Thomas Deutschmann]

commit:     7d030cd546cacb36c3d4f5dd4827934395e0c278
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 01:20:24 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 01:27:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7d030cd5

debugshell: fix less/more

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/busy-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 3393cf8..0bd22ef 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -784,7 +784,7 @@ CONFIG_I2CDUMP=y
 CONFIG_I2CDETECT=y
 # CONFIG_INOTIFYD is not set
 CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=0
+CONFIG_FEATURE_LESS_MAXLINES=9999999
 # CONFIG_FEATURE_LESS_BRACKETS is not set
 # CONFIG_FEATURE_LESS_FLAGS is not set
 CONFIG_FEATURE_LESS_TRUNCATE=y

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

[Thomas Deutschmann]

commit:     57a7e77c48aef76e8f41ab9938dbed22eb140853
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 01:23:18 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 01:27:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=57a7e77c

busybox-config: turn on some features for "less"

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/busy-config | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 0bd22ef..b62b21f 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -785,15 +785,16 @@ CONFIG_I2CDETECT=y
 # CONFIG_INOTIFYD is not set
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
-# CONFIG_FEATURE_LESS_BRACKETS is not set
-# CONFIG_FEATURE_LESS_FLAGS is not set
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
 CONFIG_FEATURE_LESS_TRUNCATE=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
+CONFIG_FEATURE_LESS_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_FEATURE_LESS_WINCH=y
+CONFIG_FEATURE_LESS_ASK_TERMINAL=y
+CONFIG_FEATURE_LESS_DASHCMD=y
+CONFIG_FEATURE_LESS_LINENUMS=y
+CONFIG_FEATURE_LESS_RAW=y
 CONFIG_LSSCSI=y
 CONFIG_MAKEDEVS=y
 CONFIG_FEATURE_MAKEDEVS_LEAF=y

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

[Ben Kohler]

commit:     665e9e64893612c1c45e562387ec1702122aafcb
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 19:19:05 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May 22 19:19:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=665e9e64

kernel-generic-config: disable SND_PCSP

This driver is almost never wanted, and it interferes with normal alsa
usage.  See kconfig help for background.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 defaults/kernel-generic-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 6bd2d32..82df29c 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -2955,7 +2955,7 @@ CONFIG_SND_MIXART=m
 # CONFIG_SND_NM256 is not set
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_RME32=m
-CONFIG_SND_PCSP=m
+#CONFIG_SND_PCSP is not set
 CONFIG_SND_PCXHR=m
 # CONFIG_SND_RIPTIDE is not set
 CONFIG_SND_RME96=m

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

[Ben Kohler]

commit:     e2d7d2076ca4b49bd1532c8d8bf9a4670bf6598f
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 00:01:48 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 00:01:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e2d7d207

kernel-generic-config: add IP_NF_NAT & IP6_NF_NAT

The 'nat' table used to be enabled by default in genkernel, but
somewhere along the way in the kernel's reorganization of
netfilter/iptables/nftables stuff, we seem to have lost it.  This commit
adds it back.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 defaults/kernel-generic-config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 82df29c..bb9e043 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -1099,6 +1099,7 @@ CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -1151,6 +1152,7 @@ CONFIG_IP6_NF_TARGET_SYNPROXY=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_SECURITY=m
 CONFIG_NF_NAT_IPV6=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m

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

[Ben Kohler]

commit:     b98d516c078d04f3ffa786c38d3e5b5c39d5cd3b
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 16:56:13 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 16:57:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b98d516c

kernel-generic-config: add req'd options for iwd & luks2

Bug: https://bugs.gentoo.org/680340

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 defaults/kernel-generic-config | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index bb9e043..3a7992e 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -3831,7 +3831,12 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 
 CONFIG_EXPERT=y
 CONFIG_CHECKPOINT_RESTORE=y
+
+CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+
 CONFIG_DMIID=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_SIGNALFD=y

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

[Thomas Deutschmann]

commit:     6a3eedab7ad0e26ff13edee1881bd5498075c36a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 19:35:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 19:35:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6a3eedab

initrd.scripts: start_volumes(): Move bcache initialation below LVM but before BTRFS/ZFS

Bug: https://bugs.gentoo.org/605094
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 87a861d..7bc5a53 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1264,6 +1264,27 @@ start_volumes() {
 		fi
 	fi
 
+	if [ "${USE_BCACHE}" = '1' ]
+	then
+		if [ ! -e /sys/fs/bcache/register_quiet ]
+		then
+			warn_msg "'/sys/fs/bcache/register_quiet' does not exist. Missing kernel driver? Skipping dobcache ..."
+		else
+			local i=
+			for i in $(awk '$4 !~ /^(name$|$)/ { print $4 }' /proc/partitions)
+			do
+				if [ -e "/dev/${i}" ]
+				then
+					# Push all the block devices to register_quiet
+					# If its bcache, it will bring it up, if not, it will simply ignore it.
+					echo "/dev/${i}" >/sys/fs/bcache/register_quiet 2>/dev/null
+				else
+					warn_msg "'/dev/${i}' should exist but is missing; Ignoring ..."
+				fi
+			done
+		fi
+	fi
+
 	if [ "${USE_BTRFS}" = '1' ]
 	then
 		if [ -x '/sbin/btrfs' ]
@@ -1316,27 +1337,6 @@ start_volumes() {
 			fi
 		fi
 	fi
-
-	if [ "${USE_BCACHE}" = '1' ]
-	then
-		if [ ! -e /sys/fs/bcache/register_quiet ]
-		then
-			warn_msg "'/sys/fs/bcache/register_quiet' does not exist. Missing kernel driver? Skipping dobcache ..."
-		else
-			local i=
-			for i in $(awk '$4 !~ /^(name$|$)/ { print $4 }' /proc/partitions)
-			do
-				if [ -e "/dev/${i}" ]
-				then
-					# Push all the block devices to register_quiet
-					# If its bcache, it will bring it up, if not, it will simply ignore it.
-					echo "/dev/${i}" >/sys/fs/bcache/register_quiet 2>/dev/null
-				else
-					warn_msg "'/dev/${i}' should exist but is missing; Ignoring ..."
-				fi
-			done
-		fi
-	fi
 }
 
 start_iscsi() {

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

[Thomas Deutschmann]

commit:     405dc98a73e99b867f16eaf30501e32dedb3f2ee
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 12:40:15 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 12:40:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=405dc98a

initramfs: Add PARTUUID= support for devices

Will require genkernel initramfs built with --disklabel parameter.

Closes: https://bugs.gentoo.org/551708
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 7bc5a53..ff832a4 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -767,7 +767,7 @@ findnfsmount() {
 find_real_device() {
 	local DEVICE="${1}"
 	case "${DEVICE}" in
-		UUID\=*|LABEL\=*)
+		UUID\=*|LABEL\=*|PARTUUID\=*)
 			local REAL_DEVICE=""
 			local retval=1
 
@@ -785,7 +785,7 @@ find_real_device() {
 
 			if [ ${retval} -ne 0 ]
 			then
-				REAL_DEVICE=$(blkid -o device -l -t "${DEVICE}")
+				REAL_DEVICE=$(blkid -o device -l -t "${DEVICE}" 2>/dev/null)
 				retval=$?
 			fi
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 7be673b..2d87c41 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -504,7 +504,7 @@ then
 	if [ "${NORESUME}" != '1' ] && [ -n "${REAL_RESUME}" ]
 	then
 		case "${REAL_RESUME}" in
-			LABEL=*|UUID=*)
+			LABEL=*|UUID=*|PARTUUID=*)
 				RESUME_DEV=""
 				retval=1
 
@@ -522,7 +522,7 @@ then
 
 				if [ ${retval} -ne 0 ]
 				then
-					RESUME_DEV=$(blkid -o device -l -t "${REAL_RESUME}")
+					RESUME_DEV=$(blkid -o device -l -t "${REAL_RESUME}" 2>/dev/null)
 					retval=$?
 				fi
 
@@ -604,7 +604,7 @@ do
 		while [ ${ROOTDELAY_100MSEC} -ge 0 -a "${got_good_root}" != '1' ]
 		do
 			case "${REAL_ROOT}" in
-				LABEL=*|UUID=*)
+				LABEL=*|UUID=*|PARTUUID=*)
 					ROOT_DEV=""
 					retval=1
 
@@ -622,7 +622,7 @@ do
 
 					if [ ${retval} -ne 0 ]
 					then
-						ROOT_DEV=$(blkid -o device -l -t "${REAL_ROOT}")
+						ROOT_DEV=$(blkid -o device -l -t "${REAL_ROOT}" 2>/dev/null)
 						retval=$?
 					fi
 

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

[Thomas Deutschmann]

commit:     76a837bc21ffd8a7d350cd3c648947f45e6a07a7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 15:30:39 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 15:30:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=76a837bc

linuxrc: Relax NEWROOT validation

If the root device specified by the user is invalid then all
we are going to lose is the possibility to ask for a new root
device in a nice way. So no need to be smart here.

Closes: https://bugs.gentoo.org/479730
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 2d87c41..01f8328 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -790,7 +790,9 @@ do
 		# else not a good root and start over.
 		if [ "${mountret}" = '0' ]
 		then
-			if [ -d ${NEW_ROOT}/dev -a -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ]
+			if [ -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ] \
+				|| [ -L "${NEW_ROOT}${REAL_INIT:-/sbin/init}" -o -x "${NEW_ROOT}/bin/sh" ] \
+				|| [ "${REAL_ROOT}" = "/dev/nfs" ]
 			then
 				break
 			else

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

[Thomas Deutschmann]

commit:     a4f28d4f8d99fc9a06dec2eec8901c39120c88f7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 20:36:09 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 20:36:09 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a4f28d4f

linuxrc: Add catch all block to avoid unnecessary rootdelay for devices already present

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5a95ece..d84cc65 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -668,6 +668,14 @@ do
 						fi
 					fi
 				;;
+				*)
+					if [ -b "${REAL_ROOT}" ]
+					then
+						got_good_root=1
+						good_msg "Detected real_root=${REAL_ROOT}"
+						break
+					fi
+				;;
 			esac
 
 			if [ "${got_good_root}" != '1' ]

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

[Thomas Deutschmann]

commit:     a280829317f5e6f22e3e8486a5f62bb2b979656f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 22:30:27 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 22:30:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a2808293

initrd.script: prompt_user(): Remove read timeout

It really makes no sense to timeout while reading user input: We
only prompt when we are unable to continue. It's very unlikely
that we are able to continue after some time without any changes.
Instead, given that it can take some time to enter requested information,
a timeout will likely result in bad user experience when user run
into timeout while typing an UUID for example.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a47b1ed..4701857 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -944,12 +944,12 @@ prompt_user() {
 	bad_msg '- type "shell" for a shell'
 	bad_msg '- type "q" to skip ...'
 	printf "%s" "${2}(${oldvalue}) :: "
-	read -t 10 ${1}
-	if [ $? -gt 0 ]
-	then
-		# prompt timed out
-		printf "\n"
-	fi
+	read ${1}
+	#if [ $? -gt 0 ]
+	#then
+	#	# prompt timed out
+	#	printf "\n"
+	#fi
 
 	case $(eval echo '$'${1}) in
 		'q')

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

[Thomas Deutschmann]

commit:     f945065f1513facfbbf148874a55a6f104440a99
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 22:29:03 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 22:29:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f945065f

linuxrc: break out when REAL_ROOT is on ZFS but kernel was started without dozfs

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 518efc6..4706055 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -633,8 +633,8 @@ do
 				ZFS*)
 					if [ "${USE_ZFS}" = '0' ]
 					then
-						prompt_user "REAL_ROOT" "root block device"
-						continue
+						bad_msg "Cannot use ZFS when started without 'dozfs' kernel command-line parameter!"
+						break
 					fi
 
 					ROOT_DEV="${REAL_ROOT#*=}"

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

[Thomas Deutschmann]

commit:     9539ed41bb78bd6c3630b7747593090afbf14e6c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 22:19:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 22:19:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9539ed41

linuxrc: Add rootdelay timeout indicator

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts |  8 ++++++++
 defaults/linuxrc        | 12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c4a037b..a47b1ed 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -882,6 +882,14 @@ good_msg() {
 	[ "$2" != '1' ] && printf "%b\n" "${GOOD}>>${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
 }
 
+good_msg_n() {
+	[ -n "${QUIET}" ] && [ -z "${DEBUG}" ] && return 0
+
+	msg_string=${1}
+	msg_string="${msg_string:-...}"
+	[ "$2" != '1' ] && printf "%b" "${GOOD}>>${NORMAL}${BOLD} ${msg_string}"
+}
+
 bad_msg() {
 	msg_string=${1}
 	msg_string="${msg_string:-...}"

diff --git a/defaults/linuxrc b/defaults/linuxrc
index d84cc65..f1cbec1 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -593,11 +593,12 @@ then
 fi
 
 # Determine root device
-good_msg 'Determining root device ...'
 ROOTDELAY_100MSEC=1
 [ -n "${ROOTDELAY}" ] && ROOTDELAY_100MSEC=$((${ROOTDELAY} * 10))
 while true
 do
+	good_msg_n 'Determining root device ...'
+
 	while [ "${got_good_root}" != '1' ]
 	do
 		# Start of sleep loop waiting on root
@@ -624,6 +625,7 @@ do
 					then
 						got_good_root=1
 						REAL_ROOT="${ROOT_DEV}"
+						echo
 						good_msg "Detected real_root=${ROOT_DEV}"
 						break
 					fi
@@ -643,6 +645,7 @@ do
 							got_good_root=1
 							REAL_ROOT=${ROOT_DEV}
 							ROOTFSTYPE=zfs
+							echo
 							good_msg "Detected real_root=${ROOT_DEV}"
 							break
 						else
@@ -661,6 +664,7 @@ do
 									got_good_root=1
 									REAL_ROOT=${i}
 									ROOTFSTYPE=zfs
+									echo
 									good_msg "Detected real_root=${ROOT_DEV}"
 									break
 								fi
@@ -682,6 +686,12 @@ do
 			then
 				let ROOTDELAY_100MSEC=${ROOTDELAY_100MSEC}-1
 				sleep 0.1s
+
+				let ROOTDELAY_100MSEC_MODULO=${ROOTDELAY_100MSEC}%10
+				if [ ${ROOTDELAY_100MSEC_MODULO} = 0 ]
+				then
+					printf "."
+				fi
 			fi
 		done  # End of sleep loop waiting on root
 

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

[Thomas Deutschmann]

commit:     55a0c13d2bc83f1d23191c16a666f0feedf3f461
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 19:34:23 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 19:34:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=55a0c13d

linuxrc: Set got_good_root=1 when we got root via LABEL|UUID|PARTUUID

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 01f8328..83b7572 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -628,8 +628,10 @@ do
 
 					if [ ${retval} -eq 0 ] && [ -n "${ROOT_DEV}" ]
 					then
+						got_good_root=1
 						good_msg "Detected real_root=${ROOT_DEV}"
 						REAL_ROOT="${ROOT_DEV}"
+						break
 					else
 						prompt_user "REAL_ROOT" "root block device"
 						got_good_root=0

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

[Thomas Deutschmann]

commit:     ccf10d5bff7cf622888b45fed3eb79213f5743bd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 20:11:24 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 20:11:24 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ccf10d5b

linuxrc: Fix waiting on root

The idea of that loop is to respect ROOTDELAY and allow for slow
devices to come up. But if we will prompt already on first failure,
this doesn't work.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 63e2360..5a95ece 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -623,13 +623,9 @@ do
 					if [ ${retval} -eq 0 ] && [ -n "${ROOT_DEV}" ]
 					then
 						got_good_root=1
-						good_msg "Detected real_root=${ROOT_DEV}"
 						REAL_ROOT="${ROOT_DEV}"
+						good_msg "Detected real_root=${ROOT_DEV}"
 						break
-					else
-						prompt_user "REAL_ROOT" "root block device"
-						got_good_root=0
-						continue
 					fi
 				;;
 				ZFS*)
@@ -647,10 +643,10 @@ do
 							got_good_root=1
 							REAL_ROOT=${ROOT_DEV}
 							ROOTFSTYPE=zfs
+							good_msg "Detected real_root=${ROOT_DEV}"
+							break
 						else
 							bad_msg "${ROOT_DEV} is not a filesystem"
-							prompt_user "REAL_ROOT" "root block device"
-							got_good_root=0
 							continue
 						fi
 					else
@@ -660,28 +656,17 @@ do
 							for i in ${BOOTFS}
 							do
 								zfs get type ${i} > /dev/null 2>&1
-								retval=$?
-
-								if [ ${retval} -eq 0 ]
+								if [ $? -eq 0 ]
 								then
 									got_good_root=1
 									REAL_ROOT=${i}
 									ROOTFSTYPE=zfs
+									good_msg "Detected real_root=${ROOT_DEV}"
 									break
 								fi
 							done
-						else
-							got_good_root=0
 						fi
 					fi
-
-					if [ ${got_good_root} -ne 1 ]
-					then
-						prompt_user "REAL_ROOT" "root block device"
-						got_good_root=0
-					fi
-
-					continue
 				;;
 			esac
 
@@ -692,7 +677,7 @@ do
 			fi
 		done  # End of sleep loop waiting on root
 
-		if [ "${REAL_ROOT}" = '' ]
+		if [ -z "${REAL_ROOT}" ]
 		then
 			# No REAL_ROOT determined/specified. Prompt user for root block device.
 			prompt_user "REAL_ROOT" "root block device"

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

[Thomas Deutschmann]

commit:     7582b5cde9e0118bc5784d45ab49db8ae7c8a8d2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 19:51:14 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 19:51:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7582b5cd

linuxrc: No need to call 'busybox findfs'

Normal findfs is already 'busybox findfs'.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 6 ------
 defaults/linuxrc        | 8 +-------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index ff832a4..c4a037b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -777,12 +777,6 @@ find_real_device() {
 				retval=$?
 			fi
 
-			if [ ${retval} -ne 0 ]
-			then
-				REAL_DEVICE=$(busybox findfs "${DEVICE}" 2>/dev/null)
-				retval=$?
-			fi
-
 			if [ ${retval} -ne 0 ]
 			then
 				REAL_DEVICE=$(blkid -o device -l -t "${DEVICE}" 2>/dev/null)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 83b7572..63e2360 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -614,12 +614,6 @@ do
 						retval=$?
 					fi
 
-					if [ ${retval} -ne 0 ]
-					then
-						ROOT_DEV=$(busybox findfs "${REAL_ROOT}" 2>/dev/null)
-						retval=$?
-					fi
-
 					if [ ${retval} -ne 0 ]
 					then
 						ROOT_DEV=$(blkid -o device -l -t "${REAL_ROOT}" 2>/dev/null)
@@ -694,7 +688,7 @@ do
 			if [ "${got_good_root}" != '1' ]
 			then
 				let ROOTDELAY_100MSEC=${ROOTDELAY_100MSEC}-1
-				usleep 100
+				sleep 0.1s
 			fi
 		done  # End of sleep loop waiting on root
 

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

[Thomas Deutschmann]

commit:     f559150dd16fc42e5bf4be4d24101e947ee21d60
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 22:27:16 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 22:27:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f559150d

linuxrc: Really prompt for new root block device when got_good_root is 0

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index f1cbec1..518efc6 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -695,14 +695,13 @@ do
 			fi
 		done  # End of sleep loop waiting on root
 
-		if [ -z "${REAL_ROOT}" ]
+		if [ ${ROOTDELAY_100MSEC} -le 0 ]
 		then
-			# No REAL_ROOT determined/specified. Prompt user for root block device.
-			prompt_user "REAL_ROOT" "root block device"
-			got_good_root=0
+			echo
+		fi
 
 		# Check for a block device or /dev/nfs or zfs encryption
-		elif [ -b "${REAL_ROOT}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ] || [ "${ROOTFSTYPE}" = "zfs" ]
+		if [ -n "${REAL_ROOT}" ] && [ -b "${REAL_ROOT}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ] || [ "${ROOTFSTYPE}" = "zfs" ]
 		then
 			if [ "${ROOTFSTYPE}" = "zfs" ]
 			then
@@ -718,37 +717,33 @@ do
 						zfs load-key "${ZFS_ENCRYPTIONROOT}"
 						retval=$?
 						# if the key loaded fine, confirm got_good_root to exit second while loop
-						if [ ${retval} -eq 0 ]
+						if [ ${retval} -ne 0 ]
 						then
-							got_good_root=1
-						else
 							bad_msg "${ROOT_DEV} is encrypted and not mountable without key"
-							prompt_user "REAL_ROOT" "root block device"
 							got_good_root=0
+							break
 						fi
 					fi
 				fi
 			else
 				got_good_root=1
 			fi
-		else
-			bad_msg "Block device ${REAL_ROOT} is not a valid root device ..."
-			REAL_ROOT=""
-			got_good_root=0
 		fi
-	done
 
+		break
+	done
 
-	if [ "${CDROOT}" = 1 -a "${got_good_root}" = '1' -a "${REAL_ROOT}" != "/dev/nfs" ]
+	if [ "${got_good_root}" = '1' -a "${CDROOT}" = 1 -a "${REAL_ROOT}" != "/dev/nfs" ]
 	then
 		# CD already mounted; no further checks necessary
 		break
-	elif [ "${LOOPTYPE}" = 'sgimips' ]
+	elif [ "${got_good_root}" = '1' -a "${LOOPTYPE}" = 'sgimips' ]
 	then
 		# sgimips mounts the livecd root partition directly
 		# there is no isofs filesystem to worry about
 		break
-	else
+	elif [ "${got_good_root}" = '1' ]
+	then
 		good_msg "Mounting ${REAL_ROOT} as root ..."
 
 		if [ "${ROOTFSTYPE}" = 'zfs' ]
@@ -797,14 +792,18 @@ do
 			else
 				bad_msg "The filesystem mounted at ${REAL_ROOT} does not appear to be a valid /, try again"
 				got_good_root=0
-				REAL_ROOT=''
 			fi
 		else
 			bad_msg "Could not mount specified ROOT, try again"
 			got_good_root=0
-			REAL_ROOT=''
 		fi
 	fi
+
+	if [ "${got_good_root}" = '0' ]
+	then
+		bad_msg "Block device ${REAL_ROOT} is not a valid root device ..."
+		prompt_user "REAL_ROOT" "root block device"
+	fi
 done
 # End determine root device
 

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

[Thomas Deutschmann]

commit:     c4616417e5c827a1ddf4daa89de82922fecda904
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 16:06:43 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 16:28:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c4616417

linuxrc: Change ROOTDELAY handling

Before this change we converted $ROOTDELAY into microseconds and
decremented that value on each loop iteration. Once that value was
<=0 we threw a timeout.

Because we substracted a fixed value we didn't take into account that
a command from loop could already have taken some time. During testing,
in worst case, running with ROOTDELAY=10 and invalid root=UUID= parameter,
it was seen that it took up to ~35s instead of 10s before linuxrc
prompted for new root value.

With this change, we now set a timeout based on current time in seconds
+ ROOTDELAY. Loop will end if current time is >= timeout.

In addition, ROOTDELAY default value was changed from 1 to 5.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 7d941d5..fbbd214 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -60,7 +60,7 @@ REAL_ROOT=''
 CONSOLE='/dev/console'
 NEW_ROOT='/newroot'
 no_umounts='/newroot|/mnt/aufs-dev|/mnt/aufs-rw-branch|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino'
-ROOTDELAY=1
+ROOTDELAY=5
 CDROOT='0'
 CDROOT_DEV=''
 CDROOT_TYPE='auto'

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4706055..6b69a13 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -593,8 +593,9 @@ then
 fi
 
 # Determine root device
-ROOTDELAY_100MSEC=1
-[ -n "${ROOTDELAY}" ] && ROOTDELAY_100MSEC=$((${ROOTDELAY} * 10))
+let ROOTDELAY_TIMEOUT=$(date +%s)+1
+ROOTDELAY_TIME_WAITED=0
+[ -n "${ROOTDELAY}" -a ${ROOTDELAY} -gt 0 ] && let ROOTDELAY_TIMEOUT=${ROOTDELAY_TIMEOUT}+${ROOTDELAY}-1
 while true
 do
 	good_msg_n 'Determining root device ...'
@@ -602,7 +603,7 @@ do
 	while [ "${got_good_root}" != '1' ]
 	do
 		# Start of sleep loop waiting on root
-		while [ ${ROOTDELAY_100MSEC} -ge 0 -a "${got_good_root}" != '1' ]
+		while [ "${got_good_root}" != '1' -a $(date +%s) -le ${ROOTDELAY_TIMEOUT} ]
 		do
 			case "${REAL_ROOT}" in
 				LABEL=*|UUID=*|PARTUUID=*)
@@ -676,6 +677,7 @@ do
 					if [ -b "${REAL_ROOT}" ]
 					then
 						got_good_root=1
+						echo
 						good_msg "Detected real_root=${REAL_ROOT}"
 						break
 					fi
@@ -684,10 +686,10 @@ do
 
 			if [ "${got_good_root}" != '1' ]
 			then
-				let ROOTDELAY_100MSEC=${ROOTDELAY_100MSEC}-1
+				let ROOTDELAY_TIME_WAITED=${ROOTDELAY_TIME_WAITED}+1
 				sleep 0.1s
 
-				let ROOTDELAY_100MSEC_MODULO=${ROOTDELAY_100MSEC}%10
+				let ROOTDELAY_100MSEC_MODULO=${ROOTDELAY_TIME_WAITED}%10
 				if [ ${ROOTDELAY_100MSEC_MODULO} = 0 ]
 				then
 					printf "."
@@ -695,13 +697,13 @@ do
 			fi
 		done  # End of sleep loop waiting on root
 
-		if [ ${ROOTDELAY_100MSEC} -le 0 ]
+		if [ $(date +%s) -gt ${ROOTDELAY_TIMEOUT} ]
 		then
 			echo
 		fi
 
 		# Check for a block device or /dev/nfs or zfs encryption
-		if [ -n "${REAL_ROOT}" ] && [ -b "${REAL_ROOT}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ] || [ "${ROOTFSTYPE}" = "zfs" ]
+		if [ -n "${REAL_ROOT}" ] && [ "${REAL_ROOT}" = "/dev/nfs" ] || [ "${ROOTFSTYPE}" = "zfs" ] || [ -b "${REAL_ROOT}" ]
 		then
 			if [ "${ROOTFSTYPE}" = "zfs" ]
 			then
@@ -803,6 +805,8 @@ do
 	then
 		bad_msg "Block device ${REAL_ROOT} is not a valid root device ..."
 		prompt_user "REAL_ROOT" "root block device"
+		ROOTDELAY_TIME_WAITED=0
+		let ROOTDELAY_TIMEOUT=$(date +%s)+1
 	fi
 done
 # End determine root device

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

[Thomas Deutschmann]

commit:     9061be50c5e6650978138d1484ee6c988ea940a9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 20:27:45 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 20:30:04 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9061be50

linuxrc: Umount /newroot when it was rejected before prompting for a new root device

Bug: https://bugs.gentoo.org/520018
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 99874a6..41a53fc 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -827,6 +827,18 @@ do
 
 	if [ "${got_good_root}" = '0' ]
 	then
+		if mountpoint "${NEW_ROOT}" 1>/dev/null 2>&1
+		then
+			umount "${NEW_ROOT}" 1>/dev/null 2>&1
+			if [ $? -ne 0 ]
+			then
+				echo
+				bad_msg "Failed to umount ${REAL_ROOT} which was mounted as ${NEW_ROOT}!"
+				warn_msg "You probably need to open a shell and restore mountpoint before you are able to mount another device as ${NEW_ROOT}."
+				echo
+			fi
+		fi
+
 		bad_msg "Block device ${REAL_ROOT} is not a valid root device ..."
 		prompt_user "REAL_ROOT" "root block device"
 		ROOTDELAY_TIME_WAITED=0

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

[Thomas Deutschmann]

commit:     cb6dccf51bf2ae325c962febb48158f705f4c34c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 20:26:14 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 20:29:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cb6dccf5

linuxrc: Tell user why we consider a root device as invalid

Bug: https://bugs.gentoo.org/520018
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6b69a13..99874a6 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -786,17 +786,41 @@ do
 		# else not a good root and start over.
 		if [ "${mountret}" = '0' ]
 		then
-			if [ -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ] \
-				|| [ -L "${NEW_ROOT}${REAL_INIT:-/sbin/init}" -o -x "${NEW_ROOT}/bin/sh" ] \
-				|| [ "${REAL_ROOT}" = "/dev/nfs" ]
+			if [ -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ]
 			then
 				break
 			else
-				bad_msg "The filesystem mounted at ${REAL_ROOT} does not appear to be a valid /, try again"
-				got_good_root=0
+				warn_msg "${NEW_ROOT}${REAL_INIT:-/sbin/init} was not found or is not executable, maybe a symlink?" ${QUIET}
 			fi
+
+			if [ -L "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ]
+			then
+				good_msg "Symlink detected! Assuming split /usr ..." ${QUIET}
+				break
+			else
+				warn_msg "${NEW_ROOT}${REAL_INIT:-/sbin/init} is not a symlink, do we have at least /bin/sh?" ${QUIET}
+			fi
+
+			if [ -x "${NEW_ROOT}/bin/sh" ]
+			then
+				good_msg "Executable ${NEW_ROOT}/bin/sh detected!" ${QUIET}
+				break
+			else
+				warn_msg "${NEW_ROOT}/bin/sh was not found or is not executable, maybe we are working with NFS?" ${QUIET}
+			fi
+
+			if [ "${REAL_ROOT}" = "/dev/nfs" ]
+			then
+				good_msg "NFS detected!" ${QUIET}
+				break
+			else
+				warn_msg "No NFS detected!" ${QUIET}
+			fi
+
+			bad_msg "The filesystem mounted at ${REAL_ROOT} does not appear to be a valid /!"
+			got_good_root=0
 		else
-			bad_msg "Could not mount specified ROOT, try again"
+			bad_msg "Could not mount specified ROOT!"
 			got_good_root=0
 		fi
 	fi

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

[Thomas Deutschmann]

commit:     6561197731c3a46d849279e7530b831a401b652d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 22:45:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 22:45:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=65611977

initrd.scripts: sdelay(): Show waiting indicator

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4701857..e93a5ad 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1906,8 +1906,14 @@ sdelay() {
 	# Sleep a specific number of seconds if SDELAY is set
 	if [ -n "${SDELAY}" ]
 	then
-		good_msg "Waiting ${SDELAY} seconds ..."
-		sleep ${SDELAY}
+		good_msg_n "Waiting ${SDELAY} seconds ..."
+		while [ ${SDELAY} -gt 0 ]
+		do
+			let SDELAY=${SDELAY}-1
+			sleep 1
+			printf "."
+		done
+		echo
 	elif [ "${CDROOT}" = '1' ]
 	then
 		good_msg 'Hint: Use scandelay[=seconds] if your live medium is slow and boot fails'

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

[Thomas Deutschmann]

commit:     057ede0d95124961692e5b67cd30eef5d305724b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 17:23:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 17:23:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=057ede0d

initrd.scripts: start_network(): Don't try to start network when interface is missing

In addition, try to detect when udhcpc failed.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index e93a5ad..9e70c00 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1664,10 +1664,21 @@ start_network() {
 		esac
 	done
 
+	if [ ! -d "/sys/class/net/${GK_NET_IFACE}" ]
+	then
+		warn_msg "Interface ${GK_NET_IFACE} not found; Will not try to start network ..."
+		return
+	fi
+
 	if [ -z "${IP}" -o "${IP}" = 'dhcp' ]
 	then
 		good_msg "Bringing up interface ${GK_NET_IFACE} using dhcp ..." ${QUIET}
 		busybox udhcpc -i "${GK_NET_IFACE}" -n -t ${GK_NET_DHCP_RETRIES} -T ${GK_NET_TIMEOUT_DHCP} -R -p "${GK_NET_DHCP_PIDFILE}"
+		if [ $? -ne 0 ]
+		then
+			bad_msg "Failed to start udhcpc for interface ${GK_NET_IFACE}!"
+			return
+		fi
 	else
 		good_msg "Bringing up interface ${GK_NET_IFACE} ..." ${QUIET}
 		ip link set "${GK_NET_IFACE}" up

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

[Thomas Deutschmann]

commit:     2210b434bdf7bc04af91582c0e306b480f530560
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 17:25:18 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 17:25:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2210b434

initrd.scripts: kill_network(): Don't try to kill network when interfacec is missing

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 9e70c00..5e1029c 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1713,6 +1713,12 @@ kill_network() {
 		kill $(cat "${GK_NET_DHCP_PIDFILE}")
 	fi
 
+	if [ ! -d "/sys/class/net/${GK_NET_IFACE}" ]
+	then
+		warn_msg "Interface ${GK_NET_IFACE} not found. Already down?"
+		return
+	fi
+
 	# If we are too quick and interface is still configuring IPv6
 	# waiting for DAD to complete due to received IPv6 RA, we have to
 	# wait.
@@ -1752,7 +1758,7 @@ kill_network() {
 		ip addr flush dev "${GK_NET_IFACE}"
 		ip route flush dev "${GK_NET_IFACE}"
 		ip link set "${GK_NET_IFACE}" down
-		if grep -q "down" "/sys/class/net/${GK_NET_IFACE}/operstate"
+		if grep -q "down" "/sys/class/net/${GK_NET_IFACE}/operstate" 2>/dev/null
 		then
 			break
 		fi

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

[Thomas Deutschmann]

commit:     6c6b3d9b7294a171a7c01ac981fee95cb0e3a94c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 17:26:54 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 17:26:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6c6b3d9b

initrd.scripts: start_sshd(): Don't start sshd when network wasn't started

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index cdd5a2e..bc19fff 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1829,6 +1829,12 @@ start_sshd() {
 		return
 	fi
 
+	if [ ! -f "${GK_NET_LOCKFILE}" ]
+	then
+		warn_msg "Network not started; Not starting sshd ..."
+		return
+	fi
+
 	if [ ! -x "/usr/sbin/dropbear" ]
 	then
 		bad_msg "/usr/sbin/dropbear not found! Did you call genkernel with --ssh parameter?"

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

[Thomas Deutschmann]

commit:     fae92169597088759a3933fdf5a0766a80831f12
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 17:26:11 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 17:26:11 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fae92169

initrd.scripts: ipv6_tentative(): Hide errors

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 5e1029c..cdd5a2e 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1780,7 +1780,7 @@ kill_network() {
 }
 
 ipv6_tentative() {
-	if ip -family inet6 addr show dev "${GK_NET_IFACE}" | grep -q " tentative "
+	if ip -family inet6 addr show dev "${GK_NET_IFACE}" 2>/dev/null | grep -q " tentative "
 	then
 		return 0
 	else

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

[Thomas Deutschmann]

commit:     cba2892492a1e667b7f8855b9d0cfd60ce557c69
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 20:37:12 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:46 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cba28924

initrd.scripts: start_volumes(): Normalize error messages

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 61ae534..827f843 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1167,9 +1167,9 @@ start_volumes() {
 			/sbin/mdadm --assemble --scan
 			#Intel Matrix RAID (and possibly others) have a container layer above the actual volumes,
 			#So we have to look for volumes that haven't been activated.
-			mdadm -IRs
+			/sbin/mdadm -IRs
 		else
-			bad_msg "mdadm not found: skipping mdadm raid assembly!"
+			bad_msg "domdadm invoked but /sbin/mdadm not found; Skipping mdadm raid assembly ..."
 		fi
 	fi
 
@@ -1227,6 +1227,8 @@ start_volumes() {
 				/sbin/dmraid -ay ${DMRAID_OPTS}
 			fi
 			[ -x '/sbin/kpartx' ] && /sbin/dmsetup ls --exec '/sbin/kpartx -a -s'
+		else
+			bad_msg "dodmraid invoked but /sbin/dmraid not found; Skipping dmraid activation ..."
 		fi
 	fi
 
@@ -1239,7 +1241,7 @@ start_volumes() {
 
 		if [ "${lvm_path}" = "MISSING" ]
 		then
-			bad_msg "dolvm invoked, but LVM binary not available! skipping LVM volume group activation!"
+			bad_msg "dolvm invoked but LVM binary not available; Skipping LVM volume group activation ..."
 		else
 			for dev in ${RAID_DEVICES}
 			do
@@ -1270,7 +1272,7 @@ start_volumes() {
 	then
 		if [ ! -e /sys/fs/bcache/register_quiet ]
 		then
-			warn_msg "'/sys/fs/bcache/register_quiet' does not exist. Missing kernel driver? Skipping dobcache ..."
+			bad_msg "dobcache invoked but '/sys/fs/bcache/register_quiet' does not exist; Skipping bcache initialization ..."
 		else
 			local i=
 			for i in $(awk '$4 !~ /^(name$|$)/ { print $4 }' /proc/partitions)
@@ -1293,7 +1295,7 @@ start_volumes() {
 		then
 			/sbin/btrfs device scan
 		else
-			bad_msg "btrfs not found: skipping btrfs device scanning!"
+			bad_msg "dobtrfs invoked but /sbin/btrfs not found; Skipping btrfs device scanning ..."
 		fi
 	fi
 

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

[Thomas Deutschmann]

commit:     97c0c1761b977b0ddc1100111b608a2dba32e32a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 16:26:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:02:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=97c0c176

initrd.scripts: start_network(): Handle already running interface

When kernel was built with CONFIG_IP_PNP_DHCP=y option for example and
ip=dhcp was specified on kernel command-line, interface maybe already
up and running (configured). In this case it doesn't make any sense to
fire up udhcpc which would only get the same network configuration.

However, when interface is already up but manual IP configuration was
specified, we must restart interface to get back into a known state and
apply our own configuration like told by the user because we support
more complex configurations.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index ce38bd8..e01f461 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1727,10 +1727,23 @@ start_network() {
 
 		warn_msg "Will not try to start network ..."
 		return 1
+	elif [ "${interface_identifier}" = 'mac' ]
+	then
+		good_msg "Interface detected as ${GK_NET_IFACE}"
 	fi
 
 	if [ -z "${IP}" -o "${IP}" = 'dhcp' ]
 	then
+		if is_interface_up
+		then
+			# CONFIG_IP_PNP_DHCP and ip=dhcp probably caused kernel to bring up
+			# network for us. Really no need re-run dhcp...
+			warn_msg "Interface ${GK_NET_IFACE} is already up."
+			warn_msg "Skipping network setup; Will use existing network configuration ..."
+			touch "${GK_NET_LOCKFILE}"
+			return 0
+		fi
+
 		good_msg "Bringing up interface ${GK_NET_IFACE} using dhcp ..." ${QUIET}
 		busybox udhcpc -i "${GK_NET_IFACE}" -n -t ${GK_NET_DHCP_RETRIES} -T ${GK_NET_TIMEOUT_DHCP} -R -p "${GK_NET_DHCP_PIDFILE}"
 		if [ $? -ne 0 ]
@@ -1739,6 +1752,15 @@ start_network() {
 			return 1
 		fi
 	else
+		if is_interface_up
+		then
+			# At this point we don't know if kernel has brought up network the
+			# way we wanted. It's safer to restart interface and do it on our own...
+			warn_msg "Interface ${GK_NET_IFACE} is already up and therefore in an unknown state!"
+			warn_msg "Will now restart interface ${GK_NET_IFACE} to get into a known state ..."
+			kill_network
+		fi
+
 		good_msg "Bringing up interface ${GK_NET_IFACE} ..." ${QUIET}
 		ip link set "${GK_NET_IFACE}" up
 
@@ -1835,7 +1857,16 @@ kill_network() {
 		return
 	fi
 
-	rm "${GK_NET_LOCKFILE}"
+	[ -f "${GK_NET_LOCKFILE}" ] && rm "${GK_NET_LOCKFILE}"
+}
+
+is_interface_up() {
+	if ip link show dev "${GK_NET_IFACE}" 2>/dev/null | grep -q ',UP,'
+	then
+		return 0
+	else
+		return 1
+	fi
 }
 
 ipv6_tentative() {

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

[Thomas Deutschmann]

commit:     8a24f11205f7be79b22d81936c0c7e628b74986c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 18:20:42 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:02:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8a24f112

initrd.scripts: cleanup(): Don't bring down network interface when real_root=/dev/nfs

At this stage we already have mounted root over network so we
should not bring down the network interface.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index e01f461..4c8955d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2011,7 +2011,12 @@ cleanup() {
 
 	if [ -f "${GK_NET_LOCKFILE}" ]
 	then
-		kill_network
+		if [ "${REAL_ROOT}" = "/dev/nfs" ]
+		then
+			warn_msg "real_root=/dev/nfs; Will not bring down interface ${GK_NET_IFACE} ..."
+		else
+			kill_network
+		fi
 	fi
 }
 

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

[Thomas Deutschmann]

commit:     5124ba044c454c112e756c5e8024650a64008609
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 15:11:39 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 20:40:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5124ba04

linuxrc: Rework debug mode

This commit will introduce $GK_DEBUGMODE_STATEFILE and a new
function is_debug() to check if debug mode is enabled or not.

Using a state file instead of a variable will allow us to
enable/disable debug mode from outside:

I.e. when you have booted in debug mode and are working remotely,
you can now remove the state file, which will disable debug mode.
This will allow you to resume booting without dropping in
another local debug shell.

It works the other way, too: When you did NOT boot in debug
mode but experiencing a problem and want to drop in another
debug shell after next step, you can now enable debug mode by
creating the state file.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults |  1 +
 defaults/initrd.scripts  | 34 ++++++++++++++++++++++++----------
 defaults/linuxrc         |  2 +-
 defaults/unlock-luks.sh  |  2 +-
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 704a5a2..89d13ac 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -70,6 +70,7 @@ CDROOT_MARKER='/livecd'
 VERIFY=0
 
 IP='dhcp'
+GK_DEBUGMODE_STATEFILE="/tmp/debug.enabled"
 GK_NET_DHCP_PIDFILE='/var/run/udhcpc.pid'
 GK_NET_DHCP_RETRIES=3
 GK_NET_GW=

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 1f7dc94..994f0f0 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -49,7 +49,7 @@ modules_scan() {
 				break
 			fi
 
-			if [ -n "${DEBUG}" ]
+			if is_debug
 			then
 				printf "%b" "${BOLD}   ::${NORMAL} "
 				printf "%b" "Scanning for ${x} ..."
@@ -58,12 +58,12 @@ modules_scan() {
 			modprobe ${x} >/dev/null 2>&1
 			loaded=${?}
 
-			[ -n "${DEBUG}" -a "${loaded}" = "0" ] && \
+			is_debug && [ "${loaded}" = "0" ] && \
 				echo "loaded"
-			[ -n "${DEBUG}" -a "${loaded}" != "0" ] && \
+			is_debug && [ "${loaded}" != "0" ] && \
 				echo "not loaded"
 
-			[ -z "${DEBUG}" -a "${loaded}" = "0" ] && \
+			! is_debug && [ "${loaded}" = "0" ] && \
 				[ -z "${QUIET}" ] && \
 				printf "%b" "${x} "
 		else
@@ -462,6 +462,17 @@ conf_rc_no_umounts() {
 	fi
 }
 
+is_debug() {
+	is_debug=1
+
+	if [ -f "${GK_DEBUGMODE_STATEFILE}" ]
+	then
+		is_debug=0
+	fi
+
+	return ${is_debug}
+}
+
 # is_int "${A}" ["${B}"..]
 # NOTE we consider a leading 0 false as it would be interpreted as octal
 is_int() {
@@ -880,7 +891,7 @@ test_success() {
 # $2 hide flag
 
 good_msg() {
-	[ -n "${QUIET}" ] && [ -z "${DEBUG}" ] && return 0
+	[ -n "${QUIET}" ] && ! is_debug && return 0
 
 	msg_string=${1}
 	msg_string="${msg_string:-...}"
@@ -888,7 +899,7 @@ good_msg() {
 }
 
 good_msg_n() {
-	[ -n "${QUIET}" ] && [ -z "${DEBUG}" ] && return 0
+	[ -n "${QUIET}" ] && ! is_debug && return 0
 
 	msg_string=${1}
 	msg_string="${msg_string:-...}"
@@ -1943,7 +1954,7 @@ start_sshd() {
 	# setup environment variables for the ssh login shell
 	local varname= varvalue=
 	touch "${CRYPT_ENV_FILE}"
-	for varname in CRYPT_ROOT CRYPT_ROOT_TRIM CRYPT_SILENT CRYPT_SWAP DEBUG
+	for varname in CRYPT_ROOT CRYPT_ROOT_TRIM CRYPT_SILENT CRYPT_SWAP
 	do
 		eval varvalue=\$${varname}
 		echo "${varname}=${varvalue}" >> "${CRYPT_ENV_FILE}"
@@ -2106,12 +2117,15 @@ setup_md_device() {
 }
 
 rundebugshell() {
-	if [ -n "${DEBUG}" ]
+	if is_debug
 	then
 		good_msg 'Starting debug shell as requested by "debug" option.'
-		good_msg "Stopping by: ${1}"
-		run_shell
+	else
+		return 0
 	fi
+
+	good_msg "Stopping by: ${1}"
+	run_shell
 }
 
 do_resume() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index d729806..dcae3cc 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -153,7 +153,7 @@ do
 		;;
 		# Debug Options
 		debug)
-			DEBUG='yes'
+			touch "${GK_DEBUGMODE_STATEFILE}"
 		;;
 		# Scan delay options
 		scandelay=*)

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index cae5269..e8f28f6 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -106,7 +106,7 @@ main() {
 
 	if [ -s "${LUKS_KEY}" ]
 	then
-		if  [ "${DEBUG}" != 'yes' ]
+		if  ! is_debug
 		then
 			rm -f "${LUKS_KEY}"
 		else

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

[Thomas Deutschmann]

commit:     b54d7057a3ea2d192275d3376e891a6ead8872c3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  5 13:51:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 20:40:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b54d7057

initrd.scripts: Move splash() function to initrd.scripts

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts  | 4 ++++
 defaults/linuxrc         | 4 ----
 defaults/login-remote.sh | 4 ----
 defaults/unlock-luks.sh  | 4 ----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f27c02f..1f7dc94 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1152,6 +1152,10 @@ waitForZFS() {
 	exit 1
 }
 
+splash() {
+	return 0
+}
+
 start_volumes() {
 	# Here, we check for /dev/device-mapper, and if it exists, we setup a
 	# a symlink, which should hopefully fix bug #142775 and bug #147015

diff --git a/defaults/linuxrc b/defaults/linuxrc
index e21e555..d729806 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -3,10 +3,6 @@
 . /etc/initrd.defaults
 . /etc/initrd.scripts
 
-splash() {
-	return 0
-}
-
 [ -e /etc/initrd.splash ] && . /etc/initrd.splash
 
 # Basic /dev content, we need it as fast as possible.

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index f8c4d08..ca85b06 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -5,10 +5,6 @@
 . /etc/initrd.scripts
 . "${CRYPT_ENV_FILE}"
 
-splash() {
-	return 0
-}
-
 [ -e /etc/initrd.splash ] && . /etc/initrd.splash
 
 receivefile() {

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index ef6b816..cae5269 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -4,10 +4,6 @@ print_usage() {
 	echo "Usage: $0 root|swap" >&2
 }
 
-splash() {
-	return 0
-}
-
 if [ -z "${1}" ]
 then
 	print_usage

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

[Thomas Deutschmann]

commit:     aaaa40350b36f2b22241fdf28789336e98ae7757
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 16:08:58 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 16:08:58 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=aaaa4035

busyy-config: Update

- Enable FEATURE_FAST_TOP by default

- Unset SVOK by default

- Enable WALL by default

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/busy-config | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 1184633..7830c83 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -111,7 +111,7 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
 CONFIG_SHA3_SMALL=1
-# CONFIG_FEATURE_FAST_TOP is not set
+CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
@@ -353,7 +353,7 @@ CONFIG_BASE64=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
 CONFIG_WHOAMI=y
-# CONFIG_WHO is not set
+CONFIG_WHO=y
 # CONFIG_W is not set
 # CONFIG_USERS is not set
 CONFIG_YES=y
@@ -1054,6 +1054,7 @@ CONFIG_FEATURE_SHOW_THREADS=y
 # CONFIG_FEATURE_RUNSVDIR_LOG is not set
 # CONFIG_SV is not set
 CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVOK is not set
 # CONFIG_SVC is not set
 # CONFIG_SVLOGD is not set
 # CONFIG_CHCON is not set

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

[Thomas Deutschmann]

commit:     6b129aca406333e440079a3861883a44b8a200b0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 14:59:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 20:40:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6b129aca

initrd.defaults: Remove duplicated definition of $NORMAL

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index c617064..704a5a2 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -6,7 +6,6 @@ PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 # ctrl-V then esc will print ^[
 # ctrl-V then ctrl-shift-m will print ^M
 BACK_UP="\033[1K\033[0G"
-NORMAL="\033[0m"
 WARN="\033[33;1m"
 BAD="\033[31;1m"
 BOLD="\033[1m"

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

[Thomas Deutschmann]

commit:     2906b025dbc60ef1f53427950a8d2cbd14dcc5b9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 16:06:12 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 16:06:12 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2906b025

linuxrc: Create /dev/tty{0,1}

/dev/tty1 is used by local debug shell for example.

Fixes: cf85138 ("initramfs: Don't call mknod when --busybox is used")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4113b63..e21e555 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -13,6 +13,8 @@ splash() {
 [ ! -e /dev/console ]  && mknod /dev/console c 5 1
 [ ! -e /dev/null ]     && mknod /dev/null c 1 3
 [ ! -e /dev/tty ]      && mknod /dev/tty c 5 0
+[ ! -e /dev/tty0 ]     && mknod /dev/tty0 c 4 0
+[ ! -e /dev/tty1 ]     && mknod /dev/tty1 c 4 1
 [ ! -e /dev/urandom ]  && mknod /dev/urandom c 1 9
 [ ! -e /dev/random ]   && mknod /dev/random c 1 8
 [ ! -e /dev/zero ]     && mknod /dev/zero c 1 5

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

[Thomas Deutschmann]

commit:     4dae613a3907917393f52e016b0377f5d1e1b926
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 15:25:10 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 20:40:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4dae613a

unlock-lucks.sh: Kill running cryptsetup prompt with SIGINT

When using SIGTERM, running terminal would require a "reset"
because cryptsetup cannot restore fds.

Using SIGINT will end cryptsetup prompt gracefully allowing
cryptsetup to restore fds and keep terminal working.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/unlock-luks.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index e8f28f6..16e654c 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -116,8 +116,9 @@ main() {
 
 	if [ "${crypt_filter_ret}" = '0' ]
 	then
-		# Kill any running cryptsetup prompt for this device
-		pkill -9 -f "luksOpen.*${LUKS_NAME}\$" >/dev/null 2>&1
+		# Kill any running cryptsetup prompt for this device.
+		# But SIGINT only to keep shell functional.
+		pkill -2 -f "luksOpen.*${LUKS_NAME}\$" >/dev/null 2>&1
 	fi
 }
 

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

[Thomas Deutschmann]

commit:     6a9db059ae26b4d38f12fc76ce33e41ca1d1e4bf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 16:10:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 20:40:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6a9db059

linuxrc: Make shell startup output more beautiful and useful

- Hide busybox version

- Show genkernel version

- Show running kernel version

- Use emphasis (bold format) in text

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/busy-config     |  2 +-
 defaults/initrd.scripts  |  5 +++++
 defaults/login-remote.sh | 22 ++++++++++++++++------
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 7830c83..39c3010 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -1136,7 +1136,7 @@ CONFIG_CTTYHACK=y
 #
 CONFIG_FEATURE_SH_MATH=y
 CONFIG_FEATURE_SH_MATH_64=y
-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
 CONFIG_FEATURE_SH_HISTFILESIZE=y

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4c8955d..f27c02f 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -809,6 +809,11 @@ run_shell() {
 
 	export PS1='rescueshell \w \# '
 
+	echo
+	GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}${gk_ver}${NORMAL} (${gk_build_date}) ${BOLD}rescue shell${NORMAL}!"
+	GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel ${BOLD}${kernel_ver}${NORMAL}"
+	echo
+
 	if [ -n "${CONSOLE}" ] && [ -c "/dev/${CONSOLE}" ]
 	then
 		setsid ${SH} -c "exec sh --login </dev/${CONSOLE} >/dev/${CONSOLE} 2>&1"

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 7f711da..f8c4d08 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -66,23 +66,33 @@ then
 			exit 1
 	esac
 else
+	gk_ver="$(cat /etc/build_id)"
+	gk_build_date="$(cat /etc/build_date)"
+	kernel_ver="$(uname -r)"
+
 	export PS1='remote rescueshell \w \# '
 	touch "${GK_SSHD_LOCKFILE}"
-	good_msg "The lockfile '${GK_SSHD_LOCKFILE}' was created."
-	good_msg "In order to resume boot process, run 'resume-boot'."
-	good_msg "Be aware that it will kill your connection which means"
-	good_msg "you will no longer be able work in this shell."
+
+	GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}${gk_ver}${NORMAL} (${gk_build_date}) ${BOLD}remote rescue shell${NORMAL}!"
+	GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel ${BOLD}${kernel_ver}${NORMAL}"
+	echo
+	good_msg "${NORMAL}The lockfile '${BOLD}${GK_SSHD_LOCKFILE}${NORMAL}' was created."
+	good_msg "${NORMAL}In order to resume boot process, run '${BOLD}resume-boot${NORMAL}'."
+	good_msg "${NORMAL}Be aware that it will kill your connection which means"
+	good_msg "${NORMAL}you will no longer be able to work in this shell."
 
 	if [ -n "${CRYPT_ROOT}" -a ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
 	then
-		good_msg "To remote unlock LUKS-encrypted root device, run 'unlock-luks root'."
+		good_msg "${NORMAL}To remote unlock LUKS-encrypted root device, run '${BOLD}unlock-luks root${NORMAL}'."
 	fi
 
 	if [ -n "${CRYPT_SWAP}" -a ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
 	then
-		good_msg "To remote unlock LUKS-encrypted swap device, run 'unlock-luks swap'."
+		good_msg "${NORMAL}To remote unlock LUKS-encrypted swap device, run '${BOLD}unlock-luks swap${NORMAL}'."
 	fi
 
+	echo
+
 	[ -x /bin/sh ] && SH=/bin/sh || SH=/bin/ash
 	exec ${SH} --login
 fi

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

[Thomas Deutschmann]

commit:     f49a899ce13f9e41bdf592187e0d157b071bf82d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 15:43:40 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 20:40:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f49a899c

linuxrc: Fix console support

- Make sure we set console after processing CMDLINE so that we will
  use last set console which matches kernel documentation.

- Strip any set option from console= value.

- Regain control after spawning a shell.

Bug: https://bugs.gentoo.org/473128
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2452f5f..6f7530f 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -827,9 +827,14 @@ run_shell() {
 	GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel ${BOLD}${kernel_ver}${NORMAL}"
 	echo
 
-	if [ -n "${CONSOLE}" ] && [ -c "/dev/${CONSOLE}" ]
-	then
-		setsid ${SH} -c "exec sh --login </dev/${CONSOLE} >/dev/${CONSOLE} 2>&1"
+	# Avoid /dev/{console,tty0} due to "can't access tty; job control turned off" problem;
+	# cttyhack will handle this for us...
+	if [ -n "${CONSOLE}" ] \
+		&& [ "${CONSOLE}" != "/dev/console" ] \
+		&& [ "${CONSOLE}" != "/dev/tty0" ] \
+		&& [ -c "${CONSOLE}" ]
+	then
+		setsid ${SH} -c "exec sh --login <${CONSOLE} >${CONSOLE} 2>&1"
 	elif command -v cttyhack 1>/dev/null 2>&1
 	then
 		setsid cttyhack ${SH} --login
@@ -843,6 +848,10 @@ run_shell() {
 	rm "${GK_SHELL_LOCKFILE}"
 
 	echo
+
+	# We maybe have called exec and dettached from main script; We
+	# must restore control...
+	exec >${CONSOLE} <${CONSOLE} 2>&1
 }
 
 fs_type_in_use() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index dcae3cc..e3d5a2b 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -11,11 +11,13 @@
 [ ! -e /dev/tty ]      && mknod /dev/tty c 5 0
 [ ! -e /dev/tty0 ]     && mknod /dev/tty0 c 4 0
 [ ! -e /dev/tty1 ]     && mknod /dev/tty1 c 4 1
+[ ! -e /dev/ttyS0 ]    && mknod /dev/ttyS0 c 4 64
+[ ! -e /dev/ttyS1 ]    && mknod /dev/ttyS1 c 4 65
 [ ! -e /dev/urandom ]  && mknod /dev/urandom c 1 9
 [ ! -e /dev/random ]   && mknod /dev/random c 1 8
 [ ! -e /dev/zero ]     && mknod /dev/zero c 1 5
 
-# Clean input/output
+# Take control
 exec >${CONSOLE} <${CONSOLE} 2>&1
 
 if [ "$$" != '1' ]
@@ -184,9 +186,9 @@ do
 		;;
 		# Redirect output to a specific tty
 		CONSOLE=*|console=*)
-			CONSOLE=${x#*=}
-			CONSOLE=$(basename ${CONSOLE})
-#			exec >${CONSOLE} <${CONSOLE} 2>&1
+			NEW_CONSOLE=${x#*=}
+			NEW_CONSOLE=$(basename ${NEW_CONSOLE})
+			NEW_CONSOLE=${NEW_CONSOLE%%,*}
 		;;
 		# /dev/md
 		lvmraid=*)
@@ -362,6 +364,21 @@ do
 	esac
 done
 
+if [ -n "${NEW_CONSOLE}" ]
+then
+	# We cannot update console while processing CMDLINE because we
+	# are only interested in last console= value.
+	[ ! -c "${NEW_CONSOLE}" ] && NEW_CONSOLE="/dev/${NEW_CONSOLE}"
+	if [ -c "${NEW_CONSOLE}" ]
+	then
+		exec >${NEW_CONSOLE} <${NEW_CONSOLE} 2>&1
+		good_msg "Console switched from '${CONSOLE}' to '${NEW_CONSOLE}'!"
+		CONSOLE="${NEW_CONSOLE}"
+	else
+		bad_msg "Unable to switch console: '${NEW_CONSOLE}' not found or not a character device!"
+	fi
+fi
+
 quiet_kmsg
 
 if [ "${CDROOT}" = '0' ]

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

[Thomas Deutschmann]

commit:     91d64dbf8aa34a27653baebba77a10979a4a2f30
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 20:09:05 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 15:03:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=91d64dbf

initrd.scripts: wait_sshd(): Make use of good_msg_n()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index febdadf..1d2fa20 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2198,7 +2198,7 @@ wait_sshd() {
 		return
 	fi
 
-	printf "%b" "${GOOD}>>${NORMAL}${BOLD} gk.sshd.wait set; Waiting ${GK_SSHD_WAIT} seconds for SSH connection ${NORMAL}..."
+	good_msg_n "gk.sshd.wait set; Waiting ${GK_SSHD_WAIT} seconds for SSH connection ..."
 
 	local last_cmd="run last -W 2>/dev/null | head -n 3"
 	is_log_enabled && last_cmd="${last_cmd} | tee -a '${GK_INIT_LOG}'"

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

[Thomas Deutschmann]

commit:     e0cf0e07688cd3991f6af20f2f27c0d278ebf069
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 20:08:07 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 15:03:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e0cf0e07

initrd.scripts: kill_network(): Make use of good_msg_n()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 88046b4..febdadf 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2047,8 +2047,7 @@ kill_network() {
 	# interface.
 	if ipv6_tentative
 	then
-		[ -z "${QUIET}" ] && \
-		printf "%b" "${WARN}**${NORMAL}${BOLD} Waiting for tentative IPv6 addresses to complete DAD ${NORMAL}..."
+		[ -z "${QUIET}" ] && good_msg_n "Waiting for tentative IPv6 addresses to complete DAD ..."
 
 		local dad_timeout=10
 		while [ ${dad_timeout} -gt 0 ]
@@ -2056,11 +2055,10 @@ kill_network() {
 			ipv6_tentative || break
 			sleep 1
 			: $(( dad_timeout -= 1 ))
-			[ -z "${QUIET}" ] && \
-			printf "."
+			[ -z "${QUIET}" ] && printf "."
 		done
 
-		echo ""
+		[ -z "${QUIET}" ] && echo ''
 
 		if [ ${dad_timeout} -le 0 ]
 		then
@@ -2068,8 +2066,7 @@ kill_network() {
 		fi
 	fi
 
-	[ -z "${QUIET}" ] && \
-	printf "%b" "${GOOD}>>${NORMAL}${BOLD} Bringing down interface ${GK_NET_IFACE} ${NORMAL}..."
+	[ -z "${QUIET}" ] && good_msg_n "Bringing down interface ${GK_NET_IFACE} ..."
 
 	local deconfiguration_timeout=${GK_NET_TIMEOUT_DECONFIGURATION}
 	while [ ${deconfiguration_timeout} -gt 0 ]
@@ -2083,11 +2080,10 @@ kill_network() {
 		fi
 		sleep 1
 		: $(( deconfiguration_timeout -= 1 ))
-		[ -z "${QUIET}" ] && \
-		printf "."
+		[ -z "${QUIET}" ] && printf "."
 	done
 
-	echo ""
+	[ -z "${QUIET}" ] && echo ''
 
 	if [ ${deconfiguration_timeout} -le 0 ]
 	then

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

[Thomas Deutschmann]

commit:     3022031a3824aedb923aac17e6817e158f6775ed
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 17:19:50 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 20:40:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3022031a

unlock-luks.sh: Make shellcheck happy

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/unlock-luks.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 16e654c..ebcd2ca 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -39,11 +39,11 @@ main() {
 
 	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="${NAME}" LUKS_KEY='"${CRYPT_KEYFILE_'${TYPE}'}"'
 	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
-	local cryptsetup_options=
+	local cryptsetup_options
 
 	while true
 	do
-		local gpg_cmd= crypt_filter_ret=
+		local gpg_cmd crypt_filter_ret
 
 		if [ -e "${OPENED_LOCKFILE}" ]
 		then
@@ -53,15 +53,14 @@ main() {
 			LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}")
 			if [ -z "${LUKS_DEVICE}" ]
 			then
-				bad_msg "Looks like CRYPT_${TYPE} kernel cmdline argument is not set." ${CRYPT_SILENT}
+				bad_msg "Looks like CRYPT_${TYPE} kernel cmdline argument is not set." "${CRYPT_SILENT}"
 				exit 1
 			fi
 
-			setup_md_device ${LUKS_DEVICE}
-			cryptsetup isLuks ${LUKS_DEVICE}
-			if [ $? -ne 0 ]
+			setup_md_device "${LUKS_DEVICE}"
+			if ! cryptsetup isLuks "${LUKS_DEVICE}"
 			then
-				bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" ${CRYPT_SILENT}
+				bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" "${CRYPT_SILENT}"
 
 				# User has SSH access and is able to call script again or
 				# able to investigate the problem on its own.
@@ -69,7 +68,7 @@ main() {
 			else
 				if [ "x${LUKS_TRIM}" = "xyes" ]
 				then
-					good_msg "Enabling TRIM support for ${LUKS_NAME} ..." ${CRYPT_SILENT}
+					good_msg "Enabling TRIM support for ${LUKS_NAME} ..." "${CRYPT_SILENT}"
 					cryptsetup_options="${cryptsetup_options} --allow-discards"
 				fi
 
@@ -91,10 +90,10 @@ main() {
 				if [ ${crypt_filter_ret} -eq 0 ]
 				then
 					touch "${OPENED_LOCKFILE}"
-					good_msg "LUKS device ${LUKS_DEVICE} opened" ${CRYPT_SILENT}
+					good_msg "LUKS device ${LUKS_DEVICE} opened" "${CRYPT_SILENT}"
 					break
 				else
-					bad_msg "Failed to open LUKS device ${LUKS_DEVICE}" ${CRYPT_SILENT}
+					bad_msg "Failed to open LUKS device ${LUKS_DEVICE}" "${CRYPT_SILENT}"
 
 					# We need to stop here with a non-zero exit code to prevent
 					# a loop when invalid keyfile was sent.

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

[Thomas Deutschmann]

commit:     a1f719112f02feb8e7c854a5095c7cebb6d0bf4a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 17:17:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 20:40:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a1f71911

login-remote.sh: Make shellcheck happy

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/login-remote.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index ca85b06..12596b9 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -15,31 +15,31 @@ receivefile() {
 		swap)
 			file=${CRYPT_KEYFILE_SWAP}
 			;;
+		'')
+			bad_msg "No keyfile specified." "${CRYPT_SILENT}"
+			exit 1
+			;;
 		*)
-			bad_msg "Unknown '${1}' keyfile received." ${CRYPT_SILENT}
+			bad_msg "Unknown '${1}' keyfile received." "${CRYPT_SILENT}"
 			exit 1
 			;;
 	esac
 
 	# limit maximum stored bytes to 1M to avoid killing the server
-	dd of=${file} count=1k bs=1k 2>/dev/null
+	run dd of="${file}" count=1k bs=1k 2>/dev/null
 	return $?
 }
 
-
-
 if [ "x${1}" = "x-c" ]
 then
-	command=$(echo ${2} | awk -F" " '{print $1}')
-	type=$(echo ${2} | awk -F" " '{print $2}')
+	command=$(echo "${2}" | awk '{ print $1 }')
+	type=$(echo "${2}" | awk '{ print $2 }')
 
 	case ${command} in 
 		post)
-			receivefile ${type}
-			if [ $? -eq 0 ]
+			if receivefile "${type}"
 			then
-				unlock-luks ${type}
-				if [ $? -eq 0 ]
+				if unlock-luks "${type}"
 				then
 					if [ "${type}" = 'root' ]
 					then
@@ -53,12 +53,12 @@ then
 					exit 1
 				fi
 			else
-				bad_msg "Keyfile was not properly received!" ${CRYPT_SILENT}
+				bad_msg "Keyfile was not properly received!" "${CRYPT_SILENT}"
 				exit 1
 			fi
 			;;
 		*)
-			bad_msg "Command '${command}' is not supported!" ${CRYPT_SILENT}
+			bad_msg "Command '${command}' is not supported!" "${CRYPT_SILENT}"
 			exit 1
 	esac
 else
@@ -77,12 +77,12 @@ else
 	good_msg "${NORMAL}Be aware that it will kill your connection which means"
 	good_msg "${NORMAL}you will no longer be able to work in this shell."
 
-	if [ -n "${CRYPT_ROOT}" -a ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
+	if [ -n "${CRYPT_ROOT}" ] && [ ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
 	then
 		good_msg "${NORMAL}To remote unlock LUKS-encrypted root device, run '${BOLD}unlock-luks root${NORMAL}'."
 	fi
 
-	if [ -n "${CRYPT_SWAP}" -a ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
+	if [ -n "${CRYPT_SWAP}" ] && [ ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
 	then
 		good_msg "${NORMAL}To remote unlock LUKS-encrypted swap device, run '${BOLD}unlock-luks swap${NORMAL}'."
 	fi

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

[Thomas Deutschmann]

commit:     bc7df5ee2b27d04889cacba49bb3339a58ce9de3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 18:21:45 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 15:03:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bc7df5ee

Rework resume-boot.sh

- We no longer use $GK_SHELL_LOCKFILE which was removed in
  in previous commit ("initrd.scripts: run_shell(): Use LOCK file").

- We now try to kill all $SH processes allowing to use resume-boot
  in remote and local rescue shell.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/resume-boot.sh | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/defaults/resume-boot.sh b/defaults/resume-boot.sh
index cb29831..f4dd4b2 100644
--- a/defaults/resume-boot.sh
+++ b/defaults/resume-boot.sh
@@ -1,15 +1,28 @@
 #!/bin/sh
 
 . /etc/initrd.defaults
+. /etc/initrd.scripts
 
-if [ -s "${GK_SHELL_LOCKFILE}" ]
+GK_INIT_LOG_PREFIX=${0}
+if [ -n "${SSH_CLIENT_IP}" ] && [ -n "${SSH_CLIENT_PORT}" ]
 then
-	kill -9 "$(cat "${GK_SHELL_LOCKFILE}")"
+	GK_INIT_LOG_PREFIX="${0}[${SSH_CLIENT_IP}:${SSH_CLIENT_PORT}]"
 fi
 
-if [ -f "${GK_SSHD_LOCKFILE}" ]
-then
-	rm "${GK_SSHD_LOCKFILE}"
-fi
+# We don't want to kill init script (PID 1),
+# ourselves and parent process yet...
+pids_to_keep="1 ${$} ${PPID}"
+
+for pid in $(pgrep sh)
+do
+	if ! echo " ${pids_to_keep} " | grep -q " ${pid} "
+	then
+		kill -9 ${pid}
+	fi
+done
+
+good_msg "Resuming boot process ..."
+[ -f "${GK_SSHD_LOCKFILE}" ] && run rm "${GK_SSHD_LOCKFILE}"
+[ "${PPID}" != '1' ] && kill -9 ${PPID}
 
 exit 0

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

[Thomas Deutschmann]

commit:     865109b62c15e77dee1ff4b449f970faa25813d0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 20:23:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 15:03:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=865109b6

linuxrc: Remove dead code

Call to verbose_kmsg() was moved in commit 5842219. No need to keep this
any longer.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index a57de1c..1bd6dc9 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -922,8 +922,6 @@ do
 done
 # End determine root device
 
-#verbose_kmsg
-
 # If CD root is set determine the looptype to boot
 if [ "${CDROOT}" = '1' ]
 then

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

[Thomas Deutschmann]

commit:     d218502dd92b79e7920152d17843620d56d00756
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 15:34:53 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 20:40:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d218502d

initrd.scripts: run_shell(): Use LOCK file

We cannot write PID because we use exec and don't return
before the shell we just spawned was closed.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 89d13ac..fdf948e 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -81,7 +81,7 @@ GK_NET_TIMEOUT_DAD=10
 GK_NET_TIMEOUT_DECONFIGURATION=10
 GK_NET_TIMEOUT_DHCP=10
 GK_NET_TIMEOUT_INTERFACE=10
-GK_SHELL_LOCKFILE='/var/run/rescueshell.pid'
+GK_SHELL_LOCKFILE='/tmp/rescueshell.lock'
 GK_SSHD_LOCKFILE='/tmp/remote-rescueshell.lock'
 GK_SSHD_PIDFILE='/var/run/dropbear.pid'
 GK_SSHD_PORT=22

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 994f0f0..2452f5f 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -818,6 +818,8 @@ check_loop() {
 run_shell() {
 	[ -x /bin/sh ] && SH=/bin/sh || SH=/bin/ash
 
+	touch "${GK_SHELL_LOCKFILE}"
+
 	export PS1='rescueshell \w \# '
 
 	echo
@@ -838,9 +840,9 @@ run_shell() {
 		${SH} --login
 	fi
 
-	echo
+	rm "${GK_SHELL_LOCKFILE}"
 
-	:> "${GK_SHELL_LOCKFILE}"
+	echo
 }
 
 fs_type_in_use() {

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

[Thomas Deutschmann]

commit:     7c8515a1c53a988bfdc73b47c599d3df3e0354c8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 20:13:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 15:03:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7c8515a1

linuxrc: Remove dead code

This code shouldn't work (anymore) because $CHROOT is read-only at
this stage.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6e01209..b2ac54e 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1255,11 +1255,6 @@ fi
 
 cleanup
 
-good_msg "Booting (initramfs)"
-
-cd "${CHROOT}"
-mkdir "${CHROOT}/proc" "${CHROOT}/sys" "${CHROOT}/run" 2>/dev/null
-
 # 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

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

[Thomas Deutschmann]

commit:     271c330b15d16c318cfed654d029be4b026eb770
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 19:12:04 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 19:12:04 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=271c330b

initrd.scripts: preserve_log(): Add support for additional mountpoints

This commit will add support for copying init.log to $NEWROOT/var/log/genkernel-boot.log
for example even when $NEWROOT/var/log is an own partition.

To make this work, you must tell genkernel via /etc/initramfs.mounts
to mount the additional mount point.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults |  1 +
 defaults/initrd.scripts  | 68 ++++++++++++++++++++++++++++++++++--------------
 defaults/linuxrc         |  8 +++---
 3 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 06057d7..8fa2822 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -73,6 +73,7 @@ IP='dhcp'
 GK_DEBUGMODE_STATEFILE="/tmp/debug.enabled"
 GK_INIT_LOG='/tmp/init.log'
 GK_INIT_LOG_COPYTO=
+GK_INIT_LOG_COPYTO_DEFAULT='/genkernel-boot.log'
 GK_INIT_LOG_DISABLED='/tmp/no-init.log'
 GK_INIT_LOG_PREFIX=
 GK_NET_DHCP_PIDFILE='/var/run/udhcpc.pid'

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 1d2fa20..2c57ff4 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1052,37 +1052,67 @@ preserve_log() {
 	[ -z "${GK_INIT_LOG_COPYTO}" ] && return
 
 	local have_errors=0
+
 	local logfile_target="${CHROOT}/${GK_INIT_LOG_COPYTO#/}"
-	local logfile_target_dir="$(dirname "${logfile_target}")"
+	if ! echo "${logfile_target}" | grep -qE '^.*/[A-Za-z0-9._-]+$'
+	then
+		# The test above will make sure that a filename was given
+		# so we can be sure that dirname() will always return a
+		# path.
+		warn_msg "gk.log.keep value '${GK_INIT_LOG_COPYTO}' is invalid; Will copy log to '${GK_INIT_LOG_COPYTO_DEFAULT}' instead ..."
+		logfile_target="${CHROOT}/${GK_INIT_LOG_COPYTO_DEFAULT#/}"
+	fi
+
 	local fail_msg="Failed to copy '${GK_INIT_LOG}' to '${logfile_target}'"
+	local logfile_target_dir="$(dirname "${logfile_target}")"
 
-	if run mount -o remount,rw ${CHROOT}
+	if [ -z "${logfile_target_dir}" ]
 	then
-		if [ -z "${logfile_target_dir}" ]
-		then
-			have_errors=1
-			bad_msg "${fail_msg}: Failed to determine dirname of '${logfile_target}'!"
-		elif [ ! -d "${logfile_target_dir}" ]
+		bad_msg "${fail_msg}: Failed to determine dirname of '${logfile_target}'!"
+		return 1
+	fi
+
+	local logfile_mountpoint="${logfile_target_dir}"
+	while [ true ]
+	do
+		if run mountpoint "${logfile_mountpoint}" 1>/dev/null 2>&1
 		then
-			if ! run mkdir -p "${logfile_target_dir}" 2>/dev/null
+			if run mount -o remount,rw "${logfile_mountpoint}" 1>/dev/null 2>&1
 			then
-				have_errors=1
-				bad_msg "${fail_msg}: Failed to create '${logfile_target_dir}'!"
+				break
+			else
+				bad_msg "${fail_msg}: 'mount -o remount,rw \"${logfile_mountpoint}\"' failed!"
+				return 1
 			fi
 		fi
 
-		if [ ${have_errors} = 0 ]
+		logfile_mountpoint="$(dirname "${logfile_mountpoint}")"
+		if [ "${logfile_mountpoint}" = "${CHROOT}" ]
 		then
-			good_msg "gk.log.keep set; Copying '${GK_INIT_LOG}' to '${logfile_target}' ..."
-			if ! cp "${GK_INIT_LOG}" "${logfile_target}" 2>/dev/null
-			then
-				bad_msg "${fail_msg}!"
-			fi
+			# Stop here
+			bad_msg "${fail_msg}: Failed to determine mountpoint for '${logfile_target}'!"
+			return 1
 		fi
+	done
 
-		mount -o remount,ro ${CHROOT}
-	else
-		bad_msg "${fail_msg}: 'mount -o remount,rw ${CHROOT}' failed!"
+	if [ ! -d "${logfile_target_dir}" ]
+	then
+		if ! run mkdir -p "${logfile_target_dir}" 2>/dev/null
+		then
+			bad_msg "${fail_msg}: Failed to create '${logfile_target_dir}'!"
+			return 1
+		fi
+	fi
+
+	good_msg "gk.log.keep set; Copying '${GK_INIT_LOG}' to '${logfile_target}' ..."
+	if ! run cp -f "${GK_INIT_LOG}" "${logfile_target}" 2>/dev/null
+	then
+		bad_msg "${fail_msg}!"
+	fi
+
+	if ! run mount -o remount,ro "${logfile_mountpoint}" 1>/dev/null 2>&1
+	then
+		bad_msg "Failed to re-mount ${logfile_mountpoint} read-only!"
 	fi
 }
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 1bd6dc9..cd3a6d7 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -288,16 +288,16 @@ do
 		gk.log.keep=*)
 			case "${x#*=}" in
 				[Tt][Rr][Uu][Ee])
-					GK_INIT_LOG_COPYTO=/genkernel-boot.log
+					GK_INIT_LOG_COPYTO="${GK_INIT_LOG_COPYTO_DEFAULT}"
 				;;
 				[Yy][Ee][Ss])
-					GK_INIT_LOG_COPYTO=/genkernel-boot.log
+					GK_INIT_LOG_COPYTO="${GK_INIT_LOG_COPYTO_DEFAULT}"
 				;;
 				[Yy])
-					GK_INIT_LOG_COPYTO=/genkernel-boot.log
+					GK_INIT_LOG_COPYTO="${GK_INIT_LOG_COPYTO_DEFAULT}"
 				;;
 				1)
-					GK_INIT_LOG_COPYTO=/genkernel-boot.log
+					GK_INIT_LOG_COPYTO="${GK_INIT_LOG_COPYTO_DEFAULT}"
 				;;
 				[Ff][Aa][Ll][Ss][Ee])
 					GK_INIT_LOG_COPYTO=

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

[Thomas Deutschmann]

commit:     2eb1d04cfbfa397b58a0b388f8ed28688fd114d8
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 19:54:58 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 19:55:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2eb1d04c

linuxrc: Set ZPOOL_IMPORT_UDEV_TIMEOUT_MS=0

It'll eliminate need of doing dozfs=cache.

Link: https://github.com/zfsonlinux/zfs/pull/9109
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index cd3a6d7..c0d4c0d 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -126,6 +126,7 @@ do
 		;;
 		dozfs*)
 			USE_ZFS=1
+			export ZPOOL_IMPORT_UDEV_TIMEOUT_MS=0
 
 			case "${x#*=}" in
 				*force*)

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

[Thomas Deutschmann]

commit:     32c8ee223bbd86311611e65f4ff9487c40771b5d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 14:30:11 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 14:30:11 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=32c8ee22

initrd.scripts: preserve_log(): Stop determining mountpoint when reached "/"

In commit 271c330 we stopped determining mountpoint already when we were
testing for $CHROOT value. However, $CHROOT is the mountpoint we are looking
for when no additional volumes were mounted.

This sanity check should only get triggered when we reached "/" while looping
through path for logfile.

Fixes 271c330 ("initrd.scripts: preserve_log(): Add support for additional mountpoints")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2c57ff4..48a2d3d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1087,7 +1087,7 @@ preserve_log() {
 		fi
 
 		logfile_mountpoint="$(dirname "${logfile_mountpoint}")"
-		if [ "${logfile_mountpoint}" = "${CHROOT}" ]
+		if [ "${logfile_mountpoint}" = "/" ]
 		then
 			# Stop here
 			bad_msg "${fail_msg}: Failed to determine mountpoint for '${logfile_target}'!"

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

[Thomas Deutschmann]

commit:     1f0028b52e110602975aa6bc25ca52d58bc9ea91
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 20:46:33 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 20:46:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1f0028b5

initrd.scripts: openLUKS(): gpg was moved to /usr/bin

Bug: https://bugs.gentoo.org/693006
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b33fad7..2969f44 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1792,7 +1792,7 @@ openLUKS() {
 
 					if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ]
 					then
-						if [ ! -x '/sbin/gpg' ]
+						if [ ! -x '/usr/bin/gpg' ]
 						then
 							bad_msg "GPG-encrypted key file provided but gpg program is missing. Was initramfs built without --gpg parameter?"
 							bad_msg "Falling back to passphrase usage!"
@@ -1800,7 +1800,7 @@ openLUKS() {
 							[ -e /dev/tty ] && run mv /dev/tty /dev/tty.org
 							run mknod /dev/tty c 5 1
 							cryptsetup_options="${cryptsetup_options} -d -"
-							gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
+							gpg_cmd="/usr/bin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
 						fi
 					else
 						cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}"

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

[Thomas Deutschmann]

commit:     7f6627c96cbb22eb758e060c64c066fc85b7e50f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 20:45:04 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 20:45:04 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7f6627c9

initrd.scripts: start_volumes(): dmsetup was moved to /usr/sbin

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 48a2d3d..b33fad7 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1396,7 +1396,7 @@ start_volumes() {
 			[ -x "${multipath_path}" ] && break
 		done
 
-		for dmsetup_path in /sbin/dmsetup /bin/dmsetup MISSING
+		for dmsetup_path in /usr/sbin/dmsetup /sbin/dmsetup /bin/dmsetup MISSING
 		do
 			[ -x "${dmsetup_path}" ] && break
 		done

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

[Thomas Deutschmann]

commit:     1f071dfc89fc19f9e66d2e73c4f42f9e500e5d79
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 13:54:05 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 14:43:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1f071dfc

initrd.scripts: start_sshd(): Tell user why gk.prompt.timeout value was changed

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 071ba32..7184cfd 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2208,7 +2208,7 @@ start_sshd() {
 
 	if [ "${GK_PROMPT_TIMEOUT}" = '0' ]
 	then
-		warn_msg "Changing gk.prompt.timeout=0 to 30 ..."
+		warn_msg "Changing gk.prompt.timeout=0 to 30 to allow remote user to answer prompts ..."
 		GK_PROMPT_TIMEOUT=30
 	fi
 

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

[Thomas Deutschmann]

commit:     5773ba3aa4b5c5b9d96ab144292c0fc39b456038
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 13:30:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 14:43:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5773ba3a

initrd.scripts: start_network(): Don't try to configure network when "ip" argument contains comma or colon

We are sharing "ip" kernel command-line argument with kernel's IP PNP feature.
Because we don't support the same syntax/features it's safe to assume that user
wants to use kernel's IP PNP feature when argument contains a comma or colon.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2969f44..071ba32 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2019,6 +2019,23 @@ start_network() {
 			bad_msg "Failed to start udhcpc for interface ${GK_NET_IFACE}!"
 			return 1
 		fi
+	elif echo "${IP}" | grep -qE ':|,'
+	then
+		if is_interface_up
+		then
+			# CONFIG_IP_PNP probably caused kernel to bring up
+			# network for us. Due to presence of ":" or ","
+			# we can assume an advanced network configuration
+			# which we cannot reproduce...
+			warn_msg "Interface ${GK_NET_IFACE} is already up."
+			warn_msg "Skipping network setup; Will use existing network configuration ..."
+			run touch "${GK_NET_LOCKFILE}"
+			return 0
+		fi
+
+		warn_msg "Found advanced network configuration (check ip= kernel command-line argument)!"
+		warn_msg "Assuming user want to use kernel's IP PNP; Will not try to start network ..."
+		return 1
 	else
 		if is_interface_up
 		then

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

[Thomas Deutschmann]

commit:     f60871ba99fac8e48b03d533a341a6e26ec398e3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 21:02:47 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 21:50:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f60871ba

linuxrc: Update REAL_INIT variable when using fallback

When we detected that mounted root device doesn't contain a valid
init program (i.e. set init value isn't an executable file), we
didn't update REAL_INIT value with fallback value with the result
that we called switch_root with an invalid init parameter.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 852992d..83ef89f 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -882,6 +882,7 @@ do
 
 			if [ -f "${init_binary_fallback_file}" -a -x "${init_binary_fallback_file}" ]
 			then
+				REAL_INIT="${init_binary_fallback_file/${NEW_ROOT}}"
 				good_msg "Executable fallback file '${init_binary_fallback_file}' detected!" ${QUIET}
 				break
 			else

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

[Thomas Deutschmann]

commit:     3b27d1cd00f549724f5a2da0d97099e37aef6043
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 21:01:56 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 21:44:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3b27d1cd

linuxrc: Check that init value is actually a file

Just checking that init value is exectuable won't catch errors
where user provided a directory instead of a file.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index c0d4c0d..852992d 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -862,27 +862,30 @@ do
 		# else not a good root and start over.
 		if [ "${mountret}" = '0' ]
 		then
-			if [ -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ]
+			init_binary_file="${NEW_ROOT}${REAL_INIT:-/sbin/init}"
+			init_binary_fallback_file="${NEW_ROOT}/bin/sh"
+
+			if [ -f "${init_binary_file}" -a -x "${init_binary_file}" ]
 			then
 				break
 			else
-				warn_msg "${NEW_ROOT}${REAL_INIT:-/sbin/init} was not found or is not executable, maybe a symlink?" ${QUIET}
+				warn_msg "'${init_binary_file}' was not found, is not a file or is not executable, maybe a symlink?" ${QUIET}
 			fi
 
-			if [ -L "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ]
+			if [ -L "${init_binary_file}" ]
 			then
 				good_msg "Symlink detected! Assuming split /usr ..." ${QUIET}
 				break
 			else
-				warn_msg "${NEW_ROOT}${REAL_INIT:-/sbin/init} is not a symlink, do we have at least /bin/sh?" ${QUIET}
+				warn_msg "'${init_binary_file}' is not a symlink, do we have at least /bin/sh?" ${QUIET}
 			fi
 
-			if [ -x "${NEW_ROOT}/bin/sh" ]
+			if [ -f "${init_binary_fallback_file}" -a -x "${init_binary_fallback_file}" ]
 			then
-				good_msg "Executable ${NEW_ROOT}/bin/sh detected!" ${QUIET}
+				good_msg "Executable fallback file '${init_binary_fallback_file}' detected!" ${QUIET}
 				break
 			else
-				warn_msg "${NEW_ROOT}/bin/sh was not found or is not executable, maybe we are working with NFS?" ${QUIET}
+				warn_msg "'${init_binary_fallback_file}' was not found, is not a file or is not executable, maybe we are working with NFS?" ${QUIET}
 			fi
 
 			if [ "${REAL_ROOT}" = "/dev/nfs" ]
@@ -893,7 +896,9 @@ do
 				warn_msg "No NFS detected!" ${QUIET}
 			fi
 
-			bad_msg "The filesystem mounted at ${REAL_ROOT} does not appear to be a valid /!"
+			bad_msg "The filesystem mounted at ${REAL_ROOT} does not appear to be a valid /:"
+			bad_msg "Neither executable file '${init_binary_file}' nor '${init_binary_fallback_file}' was found."
+			bad_msg "If correct root device was specified, check 'root' or 'init' kernel command-line parameter!"
 			got_good_root=0
 		else
 			bad_msg "Could not mount specified ROOT!"
@@ -1297,7 +1302,7 @@ init=${REAL_INIT:-/sbin/init}
 if ! mountpoint "${CHROOT}" 1>/dev/null 2>&1
 then
 	bad_msg "${CHROOT} was not a mountpoint"
-elif chroot "${CHROOT}" /usr/bin/test ! -x /${init}
+elif chroot "${CHROOT}" /usr/bin/test ! -x /${init#/}
 then
 	bad_msg "init=${init} does not exist in the rootfs!"
 elif [ $$ != 1 ]

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

[Thomas Deutschmann]

commit:     05503510ec91eaf840b886a56e1c5b0907a6c2fc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 14:46:29 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 15:28:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=05503510

linuxrc: Don't advertise multipath usage

Since we don't do this for any other stuff, let's
remove it for multipath, too.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 83ef89f..fedb66a 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -121,7 +121,6 @@ do
 			USE_DMRAID_NORMAL=1
 		;;
 		domultipath)
-			good_msg "Booting with multipath activated."
 			USE_MULTIPATH_NORMAL=1
 		;;
 		dozfs*)

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

[Thomas Deutschmann]

commit:     b0b13eb38269ac502ace11b6a99414a1b6122d44
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 03:50:59 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 14:13:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b0b13eb3

initrd.scripts: openLUKS(): fix $mntkey cleanup

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 7184cfd..c016662 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1835,7 +1835,7 @@ openLUKS() {
 		run umount "${mntkey}" >/dev/null 2>&1
 	fi
 
-	[ -d "${mntkey}" ] run rmdir -p "${mntkey}" >/dev/null 2>&1
+	[ -d "${mntkey}" ] && run rmdir -p "${mntkey}" >/dev/null 2>&1
 }
 
 iface_name() {

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

[Thomas Deutschmann]

commit:     7586670d136162f90a2140ac4af83f1b19fbe09f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 03:51:32 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 14:13:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7586670d

initrd.scripts: iface_name(): handle /sys/class/net/*/address errors

Fixes 11eff5eb ("Rework --ssh support")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c016662..1004ff5 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1848,7 +1848,9 @@ iface_name() {
 
 		for interface in /sys/class/net/*
 		do
-			if [ $(cat ${interface}/address) = "${mac}" ]
+			[ -e ${interface}/address ] || continue
+
+			if [ "$(cat ${interface}/address 2>/dev/null)" = "${mac}" ]
 			then
 				echo ${interface##*/}
 				return

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

[Thomas Deutschmann]

commit:     370dde2816bd28f75dbf6111fac571ed9d34791f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 01:54:58 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=370dde28

kernel-generic-config: Enable support for bzip2, gzip and xz compressed initramfs

Bug: https://bugs.gentoo.org/698828
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 3a7992e..c76b175 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -35,6 +35,9 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_XZ=y
 CONFIG_SYSCTL=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_IKCONFIG=y

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

[Thomas Deutschmann]

commit:     caacc574629e8d464cb9468a696908b21e08af36
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 01:22:31 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=caacc574

defaults/kernel-config: Delete unused file

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-config | 3645 ------------------------------------------------
 1 file changed, 3645 deletions(-)

diff --git a/defaults/kernel-config b/defaults/kernel-config
deleted file mode 100644
index 80909ea..0000000
--- a/defaults/kernel-config
+++ /dev/null
@@ -1,3645 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-gentoo-r4
-# Thu Apr 17 08:21:12 2008
-#
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
-CONFIG_X86=y
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_SEMAPHORE_SLEEPERS=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_QUICKLIST=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_DMI=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-# CONFIG_ZONE_DMA32 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_AUDIT=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_X86_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_KTIME_SCALAR=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_FHANDLE=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_TREE=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
-CONFIG_CPUSETS=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_FAIR_USER_SCHED=y
-# CONFIG_FAIR_CGROUP_SCHED is not set
-CONFIG_CGROUP_CPUACCT=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL=y
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_LBD=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_LSF=y
-CONFIG_BLK_DEV_BSG=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_PREEMPT_NOTIFIERS=y
-
-#
-# Processor type and features
-#
-CONFIG_TICK_ONESHOT=y
-# CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_SMP=y
-CONFIG_X86_PC=y
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_GENERICARCH is not set
-# CONFIG_X86_ES7000 is not set
-# CONFIG_X86_VSMP is not set
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_XEN=y
-CONFIG_VMI=y
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_GENERIC_CPU is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_XADD=y
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_GOOD_APIC=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=4
-CONFIG_HPET_TIMER=y
-CONFIG_NR_CPUS=64
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_BKL is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_NONFATAL=y
-CONFIG_X86_MCE_P4THERMAL=y
-CONFIG_VM86=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_STATIC=y
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_RESOURCES_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_NR_QUICK=1
-CONFIG_VIRT_TO_BUS=y
-CONFIG_HIGHPTE=y
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-CONFIG_EFI=y
-CONFIG_IRQBALANCE=y
-CONFIG_BOOT_IOREMAP=y
-CONFIG_SECCOMP=y
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-CONFIG_KEXEC=y
-CONFIG_CRASH_DUMP=y
-CONFIG_PHYSICAL_START=0x100000
-CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_HOTPLUG_CPU=y
-CONFIG_COMPAT_VDSO=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-
-#
-# Power management options
-#
-CONFIG_PM=y
-CONFIG_PM_LEGACY=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_SMP_POSSIBLE=y
-CONFIG_SUSPEND=y
-CONFIG_HIBERNATION_SMP_POSSIBLE=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=m
-# CONFIG_ACPI_BAY is not set
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-# CONFIG_ACPI_SBS is not set
-CONFIG_APM=y
-CONFIG_APM_IGNORE_USER_SUSPEND=y
-# CONFIG_APM_DO_ENABLE is not set
-CONFIG_APM_CPU_IDLE=y
-# CONFIG_APM_DISPLAY_BLANK is not set
-CONFIG_APM_ALLOW_INTS=y
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_POWERNOW_K8_ACPI=y
-CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_E_POWERSAVER=m
-
-#
-# shared options
-#
-# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
-CONFIG_X86_SPEEDSTEP_LIB=m
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-# CONFIG_HOTPLUG_PCI_PCIE is not set
-CONFIG_PCIEAER=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_HT_IRQ=y
-CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-CONFIG_SCx200=m
-CONFIG_SCx200HR_TIMER=m
-CONFIG_K8_NB=y
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=m
-CONFIG_HOTPLUG_PCI=m
-# CONFIG_HOTPLUG_PCI_FAKE is not set
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=m
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_VERBOSE is not set
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=m
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-# CONFIG_DEFAULT_BIC is not set
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-# CONFIG_IPV6_MIP6 is not set
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_TUNNEL=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_NETLABEL is not set
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CT_ACCT=y
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_IP_NF_QUEUE is not set
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
-#
-CONFIG_NF_CONNTRACK_IPV6=m
-# CONFIG_IP6_NF_QUEUE is not set
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_RAW=m
-
-#
-# Bridge: Netfilter Configuration
-#
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-CONFIG_IP_DCCP_ACKVEC=y
-
-#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
-#
-CONFIG_IP_DCCP_CCID2=m
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=m
-CONFIG_IP_DCCP_TFRC_LIB=m
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_CCID3_RTO=100
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# CONFIG_NET_DCCPPROBE is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
-CONFIG_TIPC=m
-# CONFIG_TIPC_ADVANCED is not set
-# CONFIG_TIPC_DEBUG is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RR=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-# CONFIG_NET_SCH_NETEM is not set
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-# CONFIG_NET_ACT_NAT is not set
-CONFIG_NET_ACT_PEDIT=m
-# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_CLS_POLICE is not set
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NET_TCPPROBE is not set
-# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# Old SIR device drivers
-#
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_TOSHIBA_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-
-#
-# Wireless
-#
-CONFIG_CFG80211=m
-CONFIG_NL80211=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RCSIMPLE=y
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_RFKILL=m
-CONFIG_RFKILL_INPUT=m
-CONFIG_RFKILL_LEDS=y
-# CONFIG_NET_9P is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_CONNECTOR=m
-# CONFIG_MTD is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
-CONFIG_PARIDE=m
-
-#
-# Parallel IDE high-level drivers
-#
-CONFIG_PARIDE_PD=m
-CONFIG_PARIDE_PCD=m
-CONFIG_PARIDE_PF=m
-CONFIG_PARIDE_PT=m
-CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
-CONFIG_PARIDE_ATEN=m
-CONFIG_PARIDE_BPCK=m
-CONFIG_PARIDE_BPCK6=m
-CONFIG_PARIDE_COMM=m
-CONFIG_PARIDE_DSTR=m
-CONFIG_PARIDE_FIT2=m
-CONFIG_PARIDE_FIT3=m
-CONFIG_PARIDE_EPAT=m
-CONFIG_PARIDE_EPATC8=y
-CONFIG_PARIDE_EPIA=m
-CONFIG_PARIDE_FRIQ=m
-CONFIG_PARIDE_FRPW=m
-CONFIG_PARIDE_KBIC=m
-CONFIG_PARIDE_KTTI=m
-CONFIG_PARIDE_ON20=m
-CONFIG_PARIDE_ON26=m
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_MISC_DEVICES=y
-CONFIG_IBM_ASM=m
-# CONFIG_PHANTOM is not set
-CONFIG_EEPROM_93CX6=m
-# CONFIG_SGI_IOC4 is not set
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-# CONFIG_ASUS_LAPTOP is not set
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_THINKPAD_ACPI=m
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_BAY=y
-# CONFIG_IDE is not set
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEFLOPPY=m
-CONFIG_BLK_DEV_IDESCSI=m
-CONFIG_BLK_DEV_IDEACPI=y
-CONFIG_IDE_TASK_IOCTL=y
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_PLATFORM=y
-CONFIG_BLK_DEV_CMD640=y
-CONFIG_BLK_DEV_CMD640_ENHANCED=y
-CONFIG_BLK_DEV_IDEPNP=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-CONFIG_IDEPCI_PCIBUS_ORDER=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_BLK_DEV_OPTI621=y
-CONFIG_BLK_DEV_RZ1000=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-CONFIG_BLK_DEV_ATIIXP=y
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_TRIFLEX=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5520=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_CS5535=y
-CONFIG_BLK_DEV_HPT34X=y
-# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=y
-CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_IT8213 is not set
-CONFIG_BLK_DEV_IT821X=y
-CONFIG_BLK_DEV_NS87415=y
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-# CONFIG_PDC202XX_BURST is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
-CONFIG_BLK_DEV_TC86C001=y
-# CONFIG_IDE_ARM is not set
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=y
-CONFIG_BLK_DEV_ALI14XX=y
-CONFIG_BLK_DEV_DTC2278=y
-CONFIG_BLK_DEV_HT6560B=y
-CONFIG_BLK_DEV_QD65XX=y
-CONFIG_BLK_DEV_UMC8672=y
-CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_FC_TGT_ATTRS=y
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_7000FASST=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_ARCMSR=m
-# CONFIG_SCSI_ARCMSR_AER is not set
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DTC3280=m
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_GENERIC_NCR5380=m
-CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
-CONFIG_SCSI_GENERIC_NCR53C400=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_NCR53C406A=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_PAS16=m
-CONFIG_SCSI_PSI240I=m
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-# CONFIG_SCSI_QLA_ISCSI is not set
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_SEAGATE=m
-CONFIG_SCSI_SYM53C416=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_T128=m
-CONFIG_SCSI_U14_34F=m
-CONFIG_SCSI_U14_34F_TAGGED_QUEUE=y
-CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y
-CONFIG_SCSI_U14_34F_MAX_TAGS=8
-CONFIG_SCSI_ULTRASTOR=m
-CONFIG_SCSI_NSP32=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_ACPI=y
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_SVW=m
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_INIC162X=m
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=y
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ARTOP=y
-CONFIG_PATA_ATIIXP=y
-CONFIG_PATA_CMD640_PCI=y
-CONFIG_PATA_CMD64X=y
-CONFIG_PATA_CS5520=y
-CONFIG_PATA_CS5530=y
-CONFIG_PATA_CS5535=y
-CONFIG_PATA_CS5536=y
-# CONFIG_PATA_CYPRESS is not set
-CONFIG_PATA_EFAR=y
-CONFIG_ATA_GENERIC=y
-CONFIG_PATA_HPT366=y
-CONFIG_PATA_HPT37X=y
-CONFIG_PATA_HPT3X2N=y
-CONFIG_PATA_HPT3X3=y
-CONFIG_PATA_HPT3X3_DMA=m
-CONFIG_PATA_ISAPNP=y
-CONFIG_PATA_IT821X=y
-CONFIG_PATA_IT8213=y
-CONFIG_PATA_JMICRON=y
-CONFIG_PATA_LEGACY=y
-CONFIG_PATA_TRIFLEX=y
-CONFIG_PATA_MARVELL=y
-CONFIG_PATA_MPIIX=y
-# CONFIG_PATA_OLDPIIX is not set
-CONFIG_PATA_NETCELL=y
-CONFIG_PATA_NS87410=y
-CONFIG_PATA_NS87415=y
-CONFIG_PATA_OPTI=y
-CONFIG_PATA_OPTIDMA=y
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC_OLD=y
-CONFIG_PATA_QDI=y
-CONFIG_PATA_RADISYS=y
-CONFIG_PATA_RZ1000=y
-CONFIG_PATA_SC1200=y
-CONFIG_PATA_SERVERWORKS=y
-CONFIG_PATA_PDC2027X=y
-CONFIG_PATA_SIL680=y
-CONFIG_PATA_SIS=y
-CONFIG_PATA_VIA=y
-CONFIG_PATA_WINBOND=y
-CONFIG_PATA_WINBOND_VLB=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=y
-CONFIG_MD_RAID5_RESHAPE=y
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-# CONFIG_DM_MULTIPATH is not set
-# CONFIG_DM_MULTIPATH_EMC is not set
-# CONFIG_DM_MULTIPATH_RDAC is not set
-# CONFIG_DM_MULTIPATH_HP is not set
-# CONFIG_DM_DELAY is not set
-CONFIG_DM_UEVENT=y
-CONFIG_BLK_DEV_DM_BBR=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-CONFIG_FUSION_LOGGING=y
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-CONFIG_IEEE1394=m
-
-#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-
-#
-# Controllers
-#
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocols
-#
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
-# CONFIG_IFB is not set
-# CONFIG_DUMMY is not set
-CONFIG_BONDING=m
-# CONFIG_MACVLAN is not set
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-# CONFIG_VETH is not set
-CONFIG_NET_SB1000=m
-# CONFIG_ARCNET is not set
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_FIXED_PHY=m
-CONFIG_FIXED_MII_10_FDX=y
-CONFIG_FIXED_MII_100_FDX=y
-CONFIG_FIXED_MII_1000_FDX=y
-CONFIG_FIXED_MII_AMNT=1
-CONFIG_MDIO_BITBANG=m
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=m
-CONFIG_NI65=m
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_MMIO=y
-CONFIG_TULIP_NAPI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_AT1700=m
-CONFIG_DEPCA=m
-CONFIG_HP100=m
-CONFIG_NET_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
-CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
-CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_PCNET32_NAPI=y
-CONFIG_AMD8111_ETH=m
-CONFIG_AMD8111E_NAPI=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
-CONFIG_AC3200=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_FORCEDETH_NAPI=y
-CONFIG_CS89x0=m
-CONFIG_EEPRO100=m
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_TLAN=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_RHINE_NAPI=y
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
-CONFIG_R8169_VLAN=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SK98LIN is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_NETDEV_10000=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1_NAPI=y
-CONFIG_CHELSIO_T3=m
-CONFIG_IXGBE=m
-CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
-CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
-CONFIG_MYRI10GE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-# CONFIG_TR is not set
-
-#
-# Wireless LAN
-#
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN_80211=y
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_RTL8187=m
-CONFIG_ADM8211=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_IWLWIFI=y
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_SENSITIVITY=y
-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
-CONFIG_IWLWIFI_QOS=y
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_BCM43XX=m
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA=y
-CONFIG_BCM43XX_PIO=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_RFKILL=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43_DMA=y
-CONFIG_B43_PIO=y
-CONFIG_B43_DMA_AND_PIO_MODE=y
-# CONFIG_B43_DMA_MODE is not set
-# CONFIG_B43_PIO_MODE is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_RT2X00=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_RFKILL=y
-CONFIG_RT2400PCI=m
-CONFIG_RT2400PCI_RFKILL=y
-CONFIG_RT2500PCI=m
-CONFIG_RT2500PCI_RFKILL=y
-CONFIG_RT61PCI=m
-CONFIG_RT61PCI_RFKILL=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-# CONFIG_RT2X00_DEBUG is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_WAN=y
-CONFIG_HOSTESS_SV11=m
-CONFIG_COSA=m
-CONFIG_LANMEDIA=m
-CONFIG_SEALEVEL_4021=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-
-#
-# X.25/LAPB support is disabled
-#
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-CONFIG_PC300=m
-CONFIG_PC300_MLPPP=y
-
-#
-# Cyclades-PC300 MLPPP support is disabled.
-#
-
-#
-# Refer to the file README.mlppp, provided by PC300 package.
-#
-CONFIG_PC300TOO=m
-CONFIG_N2=m
-CONFIG_C101=m
-CONFIG_FARSYNC=m
-CONFIG_DSCC4=m
-CONFIG_DSCC4_PCISYNC=y
-CONFIG_DSCC4_PCI_RST=y
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_SDLA=m
-CONFIG_SBNI=m
-CONFIG_SBNI_MULTILINE=y
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATM_TCP is not set
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E_MAYBE=m
-CONFIG_ATM_FORE200E_PCA=y
-CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
-CONFIG_ATM_FORE200E_USE_TASKLET=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_HE=m
-CONFIG_ATM_HE_USE_SUNI=y
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-CONFIG_DEFXX_MMIO=y
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLHC=m
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-CONFIG_NET_FC=y
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-CONFIG_ISDN=m
-# CONFIG_ISDN_I4L is not set
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_SUNKBD=m
-CONFIG_KEYBOARD_LKKBD=m
-CONFIG_KEYBOARD_XTKBD=m
-CONFIG_KEYBOARD_NEWTON=m
-CONFIG_KEYBOARD_STOWAWAY=m
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_SERIAL=m
-# CONFIG_MOUSE_APPLETOUCH is not set
-CONFIG_MOUSE_INPORT=m
-CONFIG_MOUSE_ATIXL=y
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-# CONFIG_JOYSTICK_XPAD_LEDS is not set
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_WISTRON_BTNS=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_UINPUT=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_FOURPORT=m
-CONFIG_SERIAL_8250_ACCENT=m
-CONFIG_SERIAL_8250_BOCA=m
-CONFIG_SERIAL_8250_EXAR_ST16C554=m
-CONFIG_SERIAL_8250_HUB6=m
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_XEN=y
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_PANIC_EVENT=y
-CONFIG_IPMI_PANIC_STRING=y
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_INTEL=y
-CONFIG_HW_RANDOM_AMD=y
-CONFIG_HW_RANDOM_GEODE=y
-CONFIG_HW_RANDOM_VIA=y
-CONFIG_NVRAM=m
-CONFIG_RTC=m
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
-CONFIG_DTLK=m
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-CONFIG_SONYPI=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_MWAVE=m
-# CONFIG_SCx200_GPIO is not set
-# CONFIG_PC8736x_GPIO is not set
-# CONFIG_NSC_GPIO is not set
-CONFIG_CS5535_GPIO=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HPET=y
-CONFIG_HPET_RTC_IRQ=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-# CONFIG_TELCLOCK is not set
-CONFIG_DEVPORT=y
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT=m
-# CONFIG_I2C_PARPORT_LIGHT is not set
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_SCx200_ACB=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TINY_USB is not set
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-CONFIG_I2C_PCA_ISA=m
-
-#
-# Miscellaneous I2C Chip support
-#
-CONFIG_SENSORS_DS1337=m
-CONFIG_SENSORS_DS1374=m
-CONFIG_DS1682=m
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCA9539=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_MAX6875=m
-CONFIG_SENSORS_TSL2550=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# SPI support
-#
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_BITBANG=m
-# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_LM70_LLP is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_AT25=m
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
-# CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_BATTERY_DS2760 is not set
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_APPLESMC=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_SC1200_WDT=m
-CONFIG_SCx200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC7240_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-CONFIG_MIXCOMWD=m
-CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-# CONFIG_WDT_501_PCI is not set
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_SM501=m
-
-#
-# Multimedia devices
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA7111=m
-CONFIG_VIDEO_SAA7114=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-# CONFIG_VIDEO_VIVI is not set
-CONFIG_VIDEO_BT848=m
-# CONFIG_VIDEO_BT848_DVB is not set
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_TUNER_3036=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-# CONFIG_VIDEO_SAA7134_DVB is not set
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DPC=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-# CONFIG_VIDEO_CX88_DVB is not set
-# CONFIG_VIDEO_CX23885 is not set
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_29XXX=y
-CONFIG_VIDEO_PVRUSB2_24XXX=y
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_QUICKCAM_MESSENGER=m
-CONFIG_USB_ET61X251=m
-CONFIG_VIDEO_OVCAMCHIP=m
-CONFIG_USB_W9968CF=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_STV680=m
-CONFIG_USB_ZC0301=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-# CONFIG_RADIO_TYPHOON_PROC_FS is not set
-CONFIG_RADIO_ZOLTRIX=m
-CONFIG_USB_DSBR=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CORE_ATTACH=y
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_DVB_CINERGYT2=m
-# CONFIG_DVB_CINERGYT2_TUNING is not set
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported DVB Frontends
-#
-
-#
-# Customise DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_TDA10086=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_S5H1409=m
-
-#
-# Tuners/PLL support
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TDA827X=m
-CONFIG_DVB_TUNER_QT1010=m
-CONFIG_DVB_TUNER_MT2060=m
-CONFIG_DVB_TUNER_MT2266=m
-CONFIG_DVB_TUNER_MT2131=m
-CONFIG_DVB_TUNER_DIB0070=m
-
-#
-# Miscellaneous devices
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_TUA6100=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_TUNER_CUSTOMIZE=y
-CONFIG_TUNER_MT20XX=m
-CONFIG_TUNER_TDA8290=m
-CONFIG_TUNER_TEA5761=m
-CONFIG_TUNER_TEA5767=m
-CONFIG_TUNER_SIMPLE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR_I2C=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
-CONFIG_DRM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_I915=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-# CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB_DDC is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_UVESA is not set
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-CONFIG_FB_IMAC=y
-# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I810 is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_INTEL is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_CYBLA is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=y
-CONFIG_FB_GEODE_GX=y
-# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set
-CONFIG_FB_GEODE_GX1=y
-# CONFIG_FB_SM501 is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_LTV350QV=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_PROGEAR=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VIDEO_SELECT=y
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FB_CON_DECOR=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-
-#
-# Sound
-#
-CONFIG_SOUND=y
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_RTCTIMER=m
-CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_VIRMIDI is not set
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AD1848_LIB=m
-CONFIG_SND_CS4231_LIB=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB16_DSP=m
-
-#
-# ISA devices
-#
-CONFIG_SND_ADLIB=m
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4232=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_ES968=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_SC6000=m
-CONFIG_SND_GUS_SYNTH=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL=y
-CONFIG_SND_SGALAXY=m
-CONFIG_SND_SSCAPE=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL=y
-
-#
-# PCI devices
-#
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-# CONFIG_SND_HDA_HWDEP is not set
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_ATIHDMI=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-
-#
-# SPI devices
-#
-
-#
-# USB devices
-#
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-
-#
-# PCMCIA devices
-#
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-
-#
-# System on Chip audio support
-#
-CONFIG_SND_SOC=m
-
-#
-# SoC Audio support for SuperH
-#
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT_POWERBOOK=y
-CONFIG_HID_FF=y
-CONFIG_HID_PID=y
-CONFIG_LOGITECH_FF=y
-CONFIG_PANTHERLORD_FF=y
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_ZEROPLUS_FF=y
-CONFIG_USB_HIDDEV=y
-
-#
-# Special HID drivers
-#
-CONFIG_HID_COMPAT=y
-CONFIG_HID_A4TECH=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BRIGHT=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DELL=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_LOGITECH=m
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_PANTHERLORD=m
-# CONFIG_PANTHERLORD_FF is not set
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SUNPLUS=m
-# CONFIG_THRUSTMASTER_FF is not set
-# CONFIG_ZEROPLUS_FF is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DEVICE_CLASS=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_PERSIST is not set
-# CONFIG_USB_OTG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_SPLIT_ISO=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_SSB=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# may also be needed; see USB_STORAGE Help for more information
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USB_MON=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_AIRPRIME=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP2101=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-CONFIG_USB_EZUSB=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_AUERSWALD=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_BERRY_CHARGE=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGET=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETMOTORCONTROL=m
-CONFIG_USB_PHIDGETSERVO=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-# CONFIG_USB_TEST is not set
-
-#
-# USB DSL modem support
-#
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-# CONFIG_USB_ZERO is not set
-# CONFIG_USB_ETH is not set
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-
-#
-# MMC/SD Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_RICOH_MMC=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-CONFIG_INFINIBAND_CXGB3=m
-# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-# CONFIG_EDAC is not set
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_MAX6902=m
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_V3020=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_DMADEVICES=y
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_IOATDMA=y
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_DCA=y
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-
-#
-# Userspace I/O
-#
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-
-#
-# Firmware Drivers
-#
-# CONFIG_EDD is not set
-CONFIG_EFI_VARS=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=y
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_NOLOCK=m
-CONFIG_GFS2_FS_LOCKING_DLM=m
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_ROMFS_FS=m
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_DNOTIFY=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_GENERIC_ACL=y
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_VMCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=y
-
-#
-# Miscellaneous filesystems
-#
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_VXFS_FS=m
-CONFIG_HPFS_FS=m
-CONFIG_QNX4FS_FS=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SUNRPC_BIND34=y
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_RPCSEC_GSS_SPKM3=m
-# CONFIG_SMB_FS is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-CONFIG_CIFS_STATS2=y
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_CODA_FS=m
-# CONFIG_CODA_FS_OLD_API is not set
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-CONFIG_NLS_ISO8859_15=y
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=y
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_INSTRUMENTATION=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_KPROBES=y
-CONFIG_MARKERS=y
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_PI_LIST=y
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_FORCED_INLINING=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_LKDTM is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_EARLY_PRINTK=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-
-#
-# Page alloc debug is incompatible with Software Suspend on i386
-#
-# CONFIG_DEBUG_RODATA is not set
-CONFIG_4KSTACKS=y
-CONFIG_X86_FIND_SMP_CONFIG=y
-CONFIG_X86_MPPARSE=y
-CONFIG_DOUBLEFAULT=y
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_CAPABILITIES=y
-CONFIG_SECURITY_FILE_CAPABILITIES=y
-# CONFIG_SECURITY_SELINUX is not set
-CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=y
-CONFIG_ASYNC_MEMCPY=y
-CONFIG_ASYNC_XOR=y
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ABLKCIPHER=m
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_XTS=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_586=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=y
-CONFIG_AUDIT_GENERIC=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y

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

[Thomas Deutschmann]

commit:     503aeddb91ea1c5d3afd81287c49c0db238f6743
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 00:29:08 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=503aeddb

linuxrc: Make sure that we always load bcache module when dobcache is set

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc      | 7 +++++++
 defaults/modules_load | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index f01203b..63df802 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -503,6 +503,13 @@ then
 	FIRSTMODS="${FIRSTMODS} crc32_generic"
 fi
 
+if [ "${USE_BCACHE}" = '1' ]
+then
+	# Force loading of bcache module in case module loading would
+	# be skipped because $REAL_ROOT is already present
+	FIRSTMODS="${FIRSTMODS} bcache"
+fi
+
 splash 'init'
 
 cmdline_hwopts

diff --git a/defaults/modules_load b/defaults/modules_load
index f55fab3..b4caf50 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -27,7 +27,7 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
 
 # Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
 MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic aes_generic xts"

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

[Thomas Deutschmann]

commit:     9b6b48d37605630d2cc01f6104dcb97aebfc9d03
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 00:21:31 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9b6b48d3

linuxrc: Fix code style

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4a5c39b..ee46293 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -489,9 +489,9 @@ then
 	[ "${USE_ZFS}" = '1' ] && MY_HWOPTS="${MY_HWOPTS} zfs"
 fi
 
-# Hack for f2fs, which uses crc32 but does not depend on it (in many kernels at least):
 if [ "${ROOTFSTYPE}" = "f2fs" ]
 then
+	# Hack for f2fs, which uses crc32 but does not depend on it (in many kernels at least):
 	FIRSTMODS="${FIRSTMODS} crc32_generic"
 fi
 

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

[Thomas Deutschmann]

commit:     7e8c41c2ff79d0463ccf02064e4976dc8929c13e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 01:59:08 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7e8c41c2

kernel-generic-config: Disable bcache by default, use --bcache

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 3e5d589..b7611cb 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -3408,7 +3408,6 @@ CONFIG_AUTOFS4_FS=m
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_NILFS2_FS=m
 
-CONFIG_BCACHE=m
 CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
 # CONFIG_FSCACHE_HISTOGRAM is not set

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

[Thomas Deutschmann]

commit:     5d5fe800adea70e7477cb53a4d48fc3612bf8598
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 15:05:23 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5d5fe800

kernel-generic-config: Add Amazon Elastic Network Adapter (ENA) support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 1 +
 defaults/modules_load          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 36c1484..fa95ae1 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -1490,6 +1490,7 @@ CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_E1000E=m
+CONFIG_ENA_ETHERNET=m
 CONFIG_GVE=m
 CONFIG_IGB=m
 # CONFIG_IGB_LRO is not set

diff --git a/defaults/modules_load b/defaults/modules_load
index 07978d9..9ba7dab 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -16,7 +16,7 @@ MODULES_WAITSCAN="scsi_wait_scan"
 MODULES_BLOCK="sdhci_acpi sdhci_pci"
 
 # Hardware (Network)
-MODULES_NET="8139cp 8139too atl1c atlantic bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e hv_netvsc igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve"
+MODULES_NET="8139cp 8139too atl1c atlantic bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e ena hv_netvsc igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve"
 
 # iSCSI support
 MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"

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

[Thomas Deutschmann]

commit:     5a5169856848df0381a6277ac514b63f563c02b1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 15:03:53 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5a516985

kernel-generic-config: Add aQuantia AQtion(tm) support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 1 +
 defaults/modules_load          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 696eb88..36c1484 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -1512,6 +1512,7 @@ CONFIG_JME=m
 #
 # Ethernet (10000 Mbit)
 #
+CONFIG_AQTION=m
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y

diff --git a/defaults/modules_load b/defaults/modules_load
index c897de0..07978d9 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -16,7 +16,7 @@ MODULES_WAITSCAN="scsi_wait_scan"
 MODULES_BLOCK="sdhci_acpi sdhci_pci"
 
 # Hardware (Network)
-MODULES_NET="8139cp 8139too atl1c bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e hv_netvsc igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve"
+MODULES_NET="8139cp 8139too atl1c atlantic bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e hv_netvsc igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve"
 
 # iSCSI support
 MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"

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

[Thomas Deutschmann]

commit:     0e65cc0f1b68b958cf38df6bd7d7900ed442151f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 13:45:58 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0e65cc0f

modules_load: Don't load efivarfs and qemu_fw_cfg

These filesystems aren't required to boot a system.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 644cf21..5a0b1d8 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -27,7 +27,7 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci usb-ohci hid usb-storage uas uhci-hcd ohci-hcd usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
 
 # Filesystems
-MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop squashfs aufs overlay cramfs configfs fscrypto msdos"
 
 # Crypto
 MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic aes_generic xts"

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

[Thomas Deutschmann]

commit:     de2468a92abdf61b53e1611953259409ba7f7361
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 15:01:22 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=de2468a9

kernel-generic-config: Add Google Virtual NIC (gVNIC) support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 2 ++
 defaults/modules_load          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index b7611cb..696eb88 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -1490,6 +1490,7 @@ CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_E1000E=m
+CONFIG_GVE=m
 CONFIG_IGB=m
 # CONFIG_IGB_LRO is not set
 CONFIG_IGB_DCA=y
@@ -4789,6 +4790,7 @@ CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_FARADAY=y
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_NET_VENDOR_HP=y
 CONFIG_NET_VENDOR_I825XX=y

diff --git a/defaults/modules_load b/defaults/modules_load
index 0ee0540..c897de0 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -16,7 +16,7 @@ MODULES_WAITSCAN="scsi_wait_scan"
 MODULES_BLOCK="sdhci_acpi sdhci_pci"
 
 # Hardware (Network)
-MODULES_NET="8139cp 8139too atl1c bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e hv_netvsc igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan"
+MODULES_NET="8139cp 8139too atl1c bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e hv_netvsc igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve"
 
 # iSCSI support
 MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"

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

[Thomas Deutschmann]

commit:     8e321f68744786b41786d2f650301f99294bccf9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 13:49:52 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8e321f68

modules_load: Load modules required for LUKS2

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 5a0b1d8..0ee0540 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci us
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop squashfs aufs overlay cramfs configfs fscrypto msdos"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic aes_generic xts af_alg algif_skcipher algif_hash algif_aead algif_rng"
 
 # Hyper-V
 MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hid_hyperv hv_utils hyperv_fb hv_storvsc"

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

[Thomas Deutschmann]

commit:     b640eba801a4e70cf790efb4b0fdbaf39739986b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 18:04:29 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b640eba8

initrd.defaults: Update HWOPTS_BLK loading order

Updating order to load modern modules first.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 32f99ec..9892631 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -127,7 +127,7 @@ DEFAULT_NFSOPTIONS="ro,nolock"
 # - keymap
 # - cache
 # - modules
-HWOPTS_BLK='nvme pata sata scsi usb firewire waitscan'
+HWOPTS_BLK='nvme sata scsi pata usb firewire waitscan'
 HWOPTS_OBSOLETE='pcmcia ataraid' # Obsolete stuff that might be useful on old hardware, do$X only.
 HWOPTS="keymap cache modules virtio hyperv ${HWOPTS_BLK} bcache lvm dmraid multipath mdadm zfs fs iscsi crypto"
 

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

[Thomas Deutschmann]

commit:     0b8bec3f106b5d49ac6aeefc426b16b1dda31d91
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 13:38:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 13:38:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0b8bec3f

linuxrc: Set USE_CRYPTSETUP=1 when crypt_{root,swap} is used

This will allow us to check only one variable later.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 63df802..5d79a7c 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -244,9 +244,11 @@ do
 		# Crypto
 		crypt_root=*)
 			CRYPT_ROOT=${x#*=}
+			USE_CRYPTSETUP=1
 		;;
 		crypt_swap=*)
 			CRYPT_SWAP=${x#*=}
+			USE_CRYPTSETUP=1
 		;;
 		root_key=*)
 			CRYPT_ROOT_KEY=${x#*=}

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

[Thomas Deutschmann]

commit:     af2dcc0455d6601a7490b13cb6876fb5f6d62c62
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 13:40:02 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 13:40:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=af2dcc04

initrd.scripts: modules_scan(): Always load Virtio/HyperV modules

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 053ac68..561788d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -36,6 +36,11 @@ modules_scan() {
 	if [ "${GK_HW_LOAD_ALL_MODULES}" = '1' ]
 	then
 		smart_loading=
+	elif [ "${1}" = "virtio" ] || [ "${1}" = "hyperv" ]
+	then
+		# Virtio/HyperV modules group is special -- it's about
+		# hypervisor support in general, not root block device
+		smart_loading=
 	elif [ "${1}" = "net" ]
 	then
 		# We already load network modules only when we need

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

[Thomas Deutschmann]

commit:     5dbad2e10c32043f90e6507438d93c9a9d480e07
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 13:40:42 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 13:40:42 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5dbad2e1

initrd.scripts: modules_scan(): Disable smart module loading when root needs an external program

When using dolvm or domdadm for example, root won't be available until lvm
program scanned for volumes and made them available or mdadm program was
called to assemble RAID.
So checking for root block device after each module was loaded won't save
us any time instead will just waste time.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 561788d..c19701c 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -53,17 +53,17 @@ modules_scan() {
 		# We don't know if kernel supports root filesystem so
 		# better load all filesystems ...
 		smart_loading=
-	elif [ -n "${CRYPT_ROOT}" ] || [ -n "${CRYPT_SWAP}" ]
-	then
-		if [ "${1}" = "crypto" ]
-		then
-			smart_loading=
-		elif [ "${1}" = "usb" ]
-		then
-			# We don't know if user is using an USB keyboard to
-			# enter passphrase so better load USB ...
-			smart_loading=
-		fi
+	elif [ "${USE_MDADM}" = '1' ] \
+		|| [ "${USE_LVM_NORMAL}" = '1' ] \
+		|| [ "${USE_CRYPTSETUP}" = '1' ] \
+		|| [ "${USE_BTRFS}" = '1' ] \
+		|| [ "${USE_ZFS}" = '1' ] \
+		|| [ "${USE_DMRAID_NORMAL}" = '1' ]
+	then
+		# All of this will require the call of another program before
+		# root becomes available so checking for root after each module
+		# was loaded will only waste time.
+		smart_loading=
 	fi
 
 	MODS=$(cat /etc/modules/${1} 2>/dev/null)

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

[Thomas Deutschmann]

commit:     17233983a6be283b1fe2308f5a88293fa9abfd6d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 13:10:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 13:47:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=17233983

kernel-generic-config: Add Pensando Ethernet IONIC support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 1 +
 defaults/modules_load          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index fa95ae1..a7ce965 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -4812,6 +4812,7 @@ CONFIG_NET_VENDOR_NUVOTON=y
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_NET_VENDOR_OKI=y
 CONFIG_NET_VENDOR_PASEMI=y
+CONFIG_NET_VENDOR_PENSANDO=y
 CONFIG_NET_VENDOR_QLOGIC=y
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_NET_VENDOR_RDC=y

diff --git a/defaults/modules_load b/defaults/modules_load
index 9ba7dab..ed5e197 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -16,7 +16,7 @@ MODULES_WAITSCAN="scsi_wait_scan"
 MODULES_BLOCK="sdhci_acpi sdhci_pci"
 
 # Hardware (Network)
-MODULES_NET="8139cp 8139too atl1c atlantic bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e ena hv_netvsc igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve"
+MODULES_NET="8139cp 8139too atl1c atlantic bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e ena hv_netvsc ionic igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve"
 
 # iSCSI support
 MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"

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

[Thomas Deutschmann]

commit:     333b9fe9e3e5aed9e64186bf505a72b43dd8e2f5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 13:52:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 16:05:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=333b9fe9

initrd.scripts: start_sshd(): Update binary not found message

Use same message like we use in similar cases.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 33b5199..96ca339 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2258,7 +2258,7 @@ start_sshd() {
 
 	if [ ! -x "/usr/sbin/dropbear" ]
 	then
-		bad_msg "/usr/sbin/dropbear not found! Did you call genkernel with --ssh parameter?"
+		bad_msg "/usr/sbin/dropbear not found! Was initramfs built without --ssh parameter?"
 		return
 	fi
 

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

[Thomas Deutschmann]

commit:     dc006e62ffc0861cc6f2c7979d977bf49d2da994
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 10:39:55 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 10:39:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dc006e62

initrd.scripts: start_sshd(): Don't drop to shell when starting dropbear failed

Assuming that user using dosshd don't has physical access, dropping to shell
in case when starting dropbear failed is not a good idea.

User with physical access can always reboot and enable debug mode if
interested in debug shell in this case.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c19701c..33b5199 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2275,7 +2275,6 @@ start_sshd() {
 
 	good_msg "Starting dropbear sshd ..." ${QUIET}
 	run /usr/sbin/dropbear -p ${GK_SSHD_PORT} -R -P "${GK_SSHD_PIDFILE}" 2>/var/log/dropbear.log
-	test_success "Failed to start dropbear"
 }
 
 wait_sshd() {

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

[Thomas Deutschmann]

commit:     80b8bc853f44dbd8e4042b4ac3c64a1f5d8f63af
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 10:43:41 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 16:05:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=80b8bc85

initrd.scripts: start_sshd(): Only set gk.prompt.timeout when dropbear was actually started

If we failed to start dropbear for some reason, user has no chance to
answer prompt without physical access so setting gk.prompt.timeout
would only cause an unnecessary delay.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 96ca339..dd5be3b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2250,12 +2250,6 @@ start_sshd() {
 		return
 	fi
 
-	if [ "${GK_PROMPT_TIMEOUT}" = '0' ]
-	then
-		warn_msg "Changing gk.prompt.timeout=0 to 30 to allow remote user to answer prompts ..."
-		GK_PROMPT_TIMEOUT=30
-	fi
-
 	if [ ! -x "/usr/sbin/dropbear" ]
 	then
 		bad_msg "/usr/sbin/dropbear not found! Was initramfs built without --ssh parameter?"
@@ -2275,6 +2269,14 @@ start_sshd() {
 
 	good_msg "Starting dropbear sshd ..." ${QUIET}
 	run /usr/sbin/dropbear -p ${GK_SSHD_PORT} -R -P "${GK_SSHD_PIDFILE}" 2>/var/log/dropbear.log
+	if [ $? -eq 0 ]
+	then
+		if [ "${GK_PROMPT_TIMEOUT}" = '0' ]
+		then
+			warn_msg "Changing gk.prompt.timeout=0 to 30 to allow remote user to answer prompts ..."
+			GK_PROMPT_TIMEOUT=30
+		fi
+	fi
 }
 
 wait_sshd() {

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

[Thomas Deutschmann]

commit:     42037cd53c8097904aac02603b98793b758f1847
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 15:16:52 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 16:18:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=42037cd5

initrd.scripts: start_volumes(): Show what we do

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 59e39fc..973a38a 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1547,6 +1547,8 @@ start_volumes() {
 		then
 			bad_msg "dobcache invoked but '/sys/fs/bcache/register_quiet' does not exist; Skipping bcache initialization ..."
 		else
+			good_msg "Registering all block devices in bcache ..."
+
 			local i=
 			for i in $(awk '$4 !~ /^(name$|$)/ { print $4 }' /proc/partitions)
 			do
@@ -1567,6 +1569,8 @@ start_volumes() {
 	then
 		if [ -x '/sbin/btrfs' ]
 		then
+			good_msg "Scanning for BTRFS devices ..."
+
 			local btrfs_cmd="run /sbin/btrfs device scan 2>&1"
 			is_log_enabled && btrfs_cmd="${btrfs_cmd} | tee -a '${GK_INIT_LOG}'"
 

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

[Thomas Deutschmann]

commit:     e74be22505742ea98910cd7231c76e384913f2ca
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 12:04:44 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 16:05:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e74be225

initrd.scripts: preserve_log(): Log what we do

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index dd5be3b..a81632c 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1114,6 +1114,8 @@ preserve_log() {
 		return 1
 	fi
 
+	log_msg "Determining mountpoint of '${logfile_target}' ..."
+
 	local logfile_mountpoint="${logfile_target_dir}"
 	while [ true ]
 	do

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

[Thomas Deutschmann]

commit:     c7c2fbb02642dc3f9179df2cd5eec3629100dc29
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 16:16:59 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 16:16:59 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c7c2fbb0

initrd.scripts: load_modules(): Remove unused load_modules() function

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 11b529b..597fb09 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1267,22 +1267,6 @@ cmdline_hwopts() {
 	MY_HWOPTS=${TMP_HWOPTS}
 }
 
-load_modules() {
-	# Load modules listed in MY_HWOPTS if /lib/modules exists for the running
-	# kernel version
-	if [ -d "/lib/modules/${KV}" ]
-	then
-		good_msg 'Loading modules ...'
-		# Load appropriate kernel modules
-		for modules in ${MY_HWOPTS}
-		do
-			modules_scan ${modules}
-		done
-	else
-		good_msg 'Skipping module load; no modules in the ramdisk!'
-	fi
-}
-
 setup_keymap() {
 	if [ "${DO_keymap}" ]
 	then

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

[Thomas Deutschmann]

commit:     341ee3801aaf1051ea97865c7907bbe0423f3c2b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 13:41:49 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 16:18:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=341ee380

initrd.defaults: Drop bcache from MY_HWOPTS

There's no /etc/modules/bcache. Bcache module gets loaded via
dobcache kernel-commandline argument.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 9892631..268a7be 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -133,4 +133,4 @@ HWOPTS="keymap cache modules virtio hyperv ${HWOPTS_BLK} bcache lvm dmraid multi
 
 # This is the set of default HWOPTS, in the order that they are loaded.
 # This is whitespace aligned with HWOPTS above.
-MY_HWOPTS="          modules virtio hyperv ${HWOPTS_BLK} bcache lvm dmraid           mdadm     fs       crypto"
+MY_HWOPTS="          modules virtio hyperv ${HWOPTS_BLK}        lvm dmraid           mdadm     fs       crypto"

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

[Thomas Deutschmann]

commit:     96b11d121cab23d105928fd9bb1987defd741704
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 16:11:50 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 16:11:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=96b11d12

initrd.scripts: start_network(): Use modules_scan()

Using modules_scan() instead of load_modules() will prevent output
of multiple "Loading modules ..." lines.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a81632c..11b529b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1906,9 +1906,11 @@ iface_name() {
 }
 
 start_network() {
+	good_msg "Starting network ..."
+
 	# Load network modules only when we need them to avoid possible
 	# firmware problems for people not using network that early
-	MY_HWOPTS=net load_modules
+	modules_scan net
 
 	# At least gk.net.iface can only be processed after sysfs was
 	# mounted.

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

[Thomas Deutschmann]

commit:     008d2cf12926c2fe91139c4fed802c053676d74c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 12:08:07 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 16:18:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=008d2cf1

initrd.scripts: modules_load(): Log what we do

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 48 ++++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 597fb09..59e39fc 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -29,30 +29,49 @@ modules_load() {
 modules_scan() {
 	local MODS
 	local loaded
+	local x
 	local smart_loading=yes
 	local _root_dev
 	local root_dev_found="Root block device found, skipping loading of module group \"${1}\" ..."
 
+	MODS=$(cat /etc/modules/${1} 2>/dev/null)
+	if [ -z "${MODS}" ]
+	then
+		log_msg "/etc/modules/${1} is empty; Nothing to load for '${1}' ..."
+		return
+	fi
+
+	if [ -z "${MODULES_SCAN_WARNING_SHOWN}" ]
+	then
+		local note_msg="NOTE: Due to how genkernel auto-detects your"
+		note_msg="${note_msg} hardware you will now see a lot of failed modprobe" \
+		note_msg="${note_msg} attempts which you can ignore:"
+
+		log_msg "${note_msg}"
+
+		MODULES_SCAN_WARNING_SHOWN=yes
+	fi
+
 	if [ "${GK_HW_LOAD_ALL_MODULES}" = '1' ]
 	then
-		smart_loading=
+		smart_loading=no
 	elif [ "${1}" = "virtio" ] || [ "${1}" = "hyperv" ]
 	then
 		# Virtio/HyperV modules group is special -- it's about
 		# hypervisor support in general, not root block device
-		smart_loading=
+		smart_loading=no
 	elif [ "${1}" = "net" ]
 	then
 		# We already load network modules only when we need
 		# network so don't stop loading network modules when
 		# $REAL_ROOT is already present or we will probably
 		# end up without network we wanted ...
-		smart_loading=
+		smart_loading=no
 	elif [ "${1}" = "fs" ]
 	then
 		# We don't know if kernel supports root filesystem so
 		# better load all filesystems ...
-		smart_loading=
+		smart_loading=no
 	elif [ "${USE_MDADM}" = '1' ] \
 		|| [ "${USE_LVM_NORMAL}" = '1' ] \
 		|| [ "${USE_CRYPTSETUP}" = '1' ] \
@@ -63,24 +82,13 @@ modules_scan() {
 		# All of this will require the call of another program before
 		# root becomes available so checking for root after each module
 		# was loaded will only waste time.
-		smart_loading=
+		smart_loading=no
 	fi
 
-	MODS=$(cat /etc/modules/${1} 2>/dev/null)
-	[ -n "${MODS}" ] && [ -z "${QUIET}" ] && \
+	log_msg "Loading modules of module group '${1}' (smart loading: ${smart_loading}) ..."
+	[ -z "${QUIET}" ] && \
 		printf "%b" "${BOLD}   ::${NORMAL} Loading from ${1}: "
 
-	if [ -z "${MODULES_SCAN_WARNING_SHOWN}" ]
-	then
-		local note_msg="NOTE: Due to how genkernel auto-detects your"
-		note_msg="${note_msg} hardware you will now see a lot of failed modprobe" \
-		note_msg="${note_msg} attempts which you can ignore:"
-
-		log_msg "${note_msg}"
-
-		MODULES_SCAN_WARNING_SHOWN=yes
-	fi
-
 	for x in ${MODS}
 	do
 		MLOAD=$(echo ${MLIST} | sed -e "s/.*${x}.*/${x}/")
@@ -90,7 +98,7 @@ modules_scan() {
 				printf "%b\n" "${BOLD}   ::${NORMAL} Skipping ${x} ..."
 		elif [ "${MLOAD}" = "${MLIST}" ]
 		then
-			if [ -n "${smart_loading}" ]
+			if [ "${smart_loading}" = "yes" ]
 			then
 				_root_dev=$(findfs "${REAL_ROOT}" 2>/dev/null)
 
@@ -124,7 +132,7 @@ modules_scan() {
 				printf "%b\n" "${BOLD}   ::${NORMAL} Skipping ${x} ..."
 		fi
 	done
-	[ -n "${MODS}" ] && [ -z "${QUIET}" ] && echo
+	[ -z "${QUIET}" ] && echo
 }
 
 uppercase() {

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

[Thomas Deutschmann]

commit:     8edead988fb30067eaf3a23c55abd7f66b00b550
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  2 19:12:12 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec  2 19:12:12 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8edead98

kernel-generic-config: Add Atheros 802.11ac wireless cards support

Closes: https://bugs.gentoo.org/701794
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index a7ce965..0b7e94b 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -4673,6 +4673,9 @@ CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
 # CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
 CONFIG_AVERAGE=y
 CONFIG_CORDIC=m
 # CONFIG_B43_HWRNG is not set

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

[Thomas Deutschmann]

commit:     f1a966975156030a4167d1f96a54a5d07a061596
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 21:33:24 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 21:45:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f1a96697

kernel-generic-config: Enable CONFIG_SCHED_MC

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 5fe434a..c20a84c 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -3815,6 +3815,7 @@ CONFIG_LCD_PLATFORM=m
 
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_MC=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_GROUP_SCHED=y

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

[Thomas Deutschmann]

commit:     5c251fb662d2efc0c3c650564063b5543cbec610
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  2 20:28:13 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec  2 20:32:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5c251fb6

kernel-generic-config: Add Broadcom FullMAC WLAN driver support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 0b7e94b..f9fa0dc 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -4745,7 +4745,13 @@ CONFIG_HERMES_PRISM=y
 # CONFIG_ORINOCO_USB is not set
 CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
 # CONFIG_BRCMDBG is not set
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+# CONFIG_BRCMFMAC_USB is not set
+CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_LPC_SCH is not set
 # CONFIG_LPC_ICH is not set
 # CONFIG_IE6XX_WDT is not set

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

[Thomas Deutschmann]

commit:     c8f7a864edab44c33a6a1bbe057abb2b2b6a0f83
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 21:33:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 21:45:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c8f7a864

kernel-generic-config: Enable CONFIG_CGROUP_PIDS

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index c20a84c..053a21a 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -3820,6 +3820,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y

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

[Thomas Deutschmann]

commit:     1bd58d5b38c46ab18af691e5994616161657f9e6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 12:26:56 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 12:26:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1bd58d5b

kernel-generic-config: Add Realtek 802.11ac wireless chips support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index f9fa0dc..5fe434a 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -1704,6 +1704,11 @@ CONFIG_RT73USB=m
 CONFIG_RT73USB_LEDS=y
 CONFIG_RTL8180=m
 CONFIG_RTL8187=m
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
 CONFIG_TMD_HERMES=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m

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

[Thomas Deutschmann]

commit:     e0ee3888e7f008636c60f9536bddaf22bffb8b70
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 00:47:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 00:47:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e0ee3888

initrd.scripts: openLUKS(): Reset cryptsetup_options on each iteration

Bug: https://bugs.gentoo.org/702580
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 4 +++-
 defaults/unlock-luks.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 973a38a..6acbbf6 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1717,10 +1717,12 @@ openLUKS() {
 	eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
 	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
 	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
-	local mntkey="/mnt/key/" crypt_filter_ret= cryptsetup_options=''
+	local mntkey="/mnt/key/" crypt_filter_ret=
 
 	while true
 	do
+		local cryptsetup_options=''
+
 		local gpg_cmd=""
 		if [ -e "${OPENED_LOCKFILE}" ]
 		then

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 457aa54..0f54504 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -45,10 +45,10 @@ main() {
 
 	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="${NAME}" LUKS_KEY='"${CRYPT_KEYFILE_'${TYPE}'}"'
 	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
-	local cryptsetup_options
 
 	while true
 	do
+		local cryptsetup_options=""
 		local gpg_cmd crypt_filter_ret
 
 		if [ -e "${OPENED_LOCKFILE}" ]

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

[Thomas Deutschmann]

commit:     63f7d255e2dc2956f293f1e7f5f7b4c503951fb0
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 08:41:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 18:44:41 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=63f7d255

modules_load: include realtek for r8169

Since linux-5.3-rc1, the r8169 driver triggers a kernel oops unless the
realtek module is also included in the initramfs.

See: https://bugzilla.kernel.org/show_bug.cgi?id=204343
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
Closes: https://github.com/gentoo/genkernel/pull/11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 1b85842..9caa3c7 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -16,7 +16,7 @@ MODULES_WAITSCAN="scsi_wait_scan"
 MODULES_BLOCK="sdhci_acpi sdhci_pci"
 
 # Hardware (Network)
-MODULES_NET="8139cp 8139too atl1c atlantic bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e ena hv_netvsc ionic igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve"
+MODULES_NET="8139cp 8139too atl1c atlantic bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e ena hv_netvsc ionic igb ixgb ixgbe macvlan pcnet32 r8169 realtek samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve"
 
 # iSCSI support
 MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"

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

[Ben Kohler]

commit:     06f6a268ef0c62f4f0e8dc8b699643bc55b357d7
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 13:36:57 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 13:37:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=06f6a268

linuxrc, initrd.scripts: allow PARTLABEL for root & resume

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 6acbbf6..4b43d33 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -873,7 +873,7 @@ findnfsmount() {
 find_real_device() {
 	local DEVICE="${1}"
 	case "${DEVICE}" in
-		UUID\=*|LABEL\=*|PARTUUID\=*)
+		UUID\=*|LABEL\=*|PARTLABEL=*|PARTUUID\=*)
 			local REAL_DEVICE=""
 			local retval=1
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5d79a7c..50b99de 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -609,7 +609,7 @@ then
 	if [ "${NORESUME}" != '1' ] && [ -n "${REAL_RESUME}" ]
 	then
 		case "${REAL_RESUME}" in
-			LABEL=*|UUID=*|PARTUUID=*)
+			LABEL=*|UUID=*|PARTLABEL=*|PARTUUID=*)
 				RESUME_DEV=""
 				retval=1
 
@@ -711,7 +711,7 @@ do
 		while [ "${got_good_root}" != '1' -a $(date +%s) -le ${ROOTDELAY_TIMEOUT} ]
 		do
 			case "${REAL_ROOT}" in
-				LABEL=*|UUID=*|PARTUUID=*)
+				LABEL=*|UUID=*|PARTLABEL=*|PARTUUID=*)
 					ROOT_DEV=""
 					retval=1
 

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

[Thomas Deutschmann]

commit:     a6efe051a610e0ce6aa7eb36a40dfceba7065940
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 20:53:09 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 20:57:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a6efe051

linuxrc: Don't call findfs multiple times

"findfs" and "busybox findfs" is the same command.

For $REAL_ROOT, this was already fixed via
commit 9daa9b77165339495dd4cb35bd57237bd9ca9206.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 50b99de..f585017 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -619,12 +619,6 @@ then
 					retval=$?
 				fi
 
-				if [ ${retval} -ne 0 ]
-				then
-					RESUME_DEV=$(busybox findfs "${REAL_RESUME}" 2>/dev/null)
-					retval=$?
-				fi
-
 				if [ ${retval} -ne 0 ]
 				then
 					RESUME_DEV=$(blkid -o device -l -t "${REAL_RESUME}" 2>/dev/null)

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

[Thomas Deutschmann]

commit:     ea892515ef3a46171d288d9c119defedf8dbee28
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 20:45:51 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 20:57:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ea892515

initrd.scripts: modules_scan(): Cache found rootfs

Calling findfs() isn't a cheap operation especially when slow
media like optical drives are involved.

WIth this change, a statefile (GK_ROOTFS_DETECTED_STATEFILE) will
be created when rootfs was found which will allow us to skip
further findfs() calls when present.

Link: https://forums.gentoo.org/viewtopic-t-1105908.html
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 268a7be..198800b 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -90,6 +90,7 @@ GK_NET_TIMEOUT_DHCP=10
 GK_NET_TIMEOUT_INTERFACE=10
 GK_PROMPT_FILE='/tmp/current_prompt'
 GK_PROMPT_TIMEOUT=0
+GK_ROOTFS_DETECTED_STATEFILE="/tmp/rootfs.detected"
 GK_SHELL_LOCKFILE='/tmp/rescueshell.lock'
 GK_SSHD_LOCKFILE='/tmp/remote-rescueshell.lock'
 GK_SSHD_PIDFILE='/var/run/dropbear.pid'

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4b43d33..73cd94c 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -100,9 +100,16 @@ modules_scan() {
 		then
 			if [ "${smart_loading}" = "yes" ]
 			then
-				_root_dev=$(findfs "${REAL_ROOT}" 2>/dev/null)
+				if [ ! -f "${GK_ROOTFS_DETECTED_STATEFILE}" ]
+				then
+					_root_dev=$(findfs "${REAL_ROOT}" 2>/dev/null)
+					if [ $? -eq 0 ] && [ -n "${_root_dev}" ] && [ -b "${_root_dev}" ]
+					then
+						echo "${_root_dev}" > "${GK_ROOTFS_DETECTED_STATEFILE}"
+					fi
+				fi
 
-				if [ $? -eq 0 ] && [ -n "${_root_dev}" ] && [ -b "${_root_dev}" ]
+				if [ -f "${GK_ROOTFS_DETECTED_STATEFILE}" ]
 				then
 					log_msg "${root_dev_found}"
 					printf "%b" "${root_dev_found}"

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

[Rick Farina]

commit:     5c55dd467a563623f16be27f670b5a3ddc79fb02
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 16:23:21 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Feb 14 16:23:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5c55dd46

verify support for blake2

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 defaults/initrd.scripts | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 6c7d72b..3ea80ee 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -318,20 +318,33 @@ bootstrapCD() {
 	if [ "${VERIFY}" = '1' ]
 	then
 		cd "${CDROOT_PATH}"
-		if [ -f isoroot_checksums ]
+		if [ -r "isoroot_b2sums" ] && [ -x "$(command -v b2sum 2>&1)" ]
 		then
-			good_msg "Verifying checksums, this may take some time ..."
+			good_msg "Verifying BLAKE2 checksums, this may take some time ..."
+			if ! run b2sum -c isoroot_b2sums
+			then
+				bad_msg "Some checksums failed, press any key to poweroff ..."
+				read -n1 -s
+				poweroff -f
+			else
+				good_msg "BLAKE2 checksums all valid, continuing boot ..."
+			fi
+			cd "${OLDPWD}"
+		elif [ -r "isoroot_checksums" ]
+		then
+			good_msg "Verifying SHA512 checksums, this may take some time ..."
 			if ! run sha512sum -c isoroot_checksums
 			then
 				bad_msg "Some checksums failed, press any key to poweroff ..."
 				read -n1 -s
 				poweroff -f
 			else
-				good_msg "Checksums all valid, continuing boot ..."
+				good_msg "SHA512 checksums all valid, continuing boot ..."
 			fi
 			cd "${OLDPWD}"
 		else
-			bad_msg "Verify enabled but no checksums file exists, skipping"
+			bad_msg "Verify requested but no checksums file exists, press any key to skip ..."
+			read -n1 -s
 		fi
 	fi
 }

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

[Rick Farina]

commit:     ee2d1bfe83add4441909e999fff06694c6f3c433
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 16:34:59 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Feb 14 16:34:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ee2d1bfe

dedupe verify the best we can

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 defaults/initrd.scripts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 3ea80ee..7c115cb 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -318,28 +318,28 @@ bootstrapCD() {
 	if [ "${VERIFY}" = '1' ]
 	then
 		cd "${CDROOT_PATH}"
+		checkfile=""
+		checker=""
 		if [ -r "isoroot_b2sums" ] && [ -x "$(command -v b2sum 2>&1)" ]
 		then
-			good_msg "Verifying BLAKE2 checksums, this may take some time ..."
-			if ! run b2sum -c isoroot_b2sums
-			then
-				bad_msg "Some checksums failed, press any key to poweroff ..."
-				read -n1 -s
-				poweroff -f
-			else
-				good_msg "BLAKE2 checksums all valid, continuing boot ..."
-			fi
-			cd "${OLDPWD}"
+			checkfile="isoroot_b2sums"
+			checker="b2sum"
 		elif [ -r "isoroot_checksums" ]
 		then
-			good_msg "Verifying SHA512 checksums, this may take some time ..."
-			if ! run sha512sum -c isoroot_checksums
+			checkfile="isoroot_checksums"
+			checker="sha512sum"
+		fi
+
+		if [ -n "${checkfile}" ]
+		then
+			good_msg "Verifying ${checkfile}, this may take some time ..."
+			if ! run "${checker}" -c "${checkfile}"
 			then
 				bad_msg "Some checksums failed, press any key to poweroff ..."
 				read -n1 -s
 				poweroff -f
 			else
-				good_msg "SHA512 checksums all valid, continuing boot ..."
+				good_msg "${checkfile} all valid, continuing boot ..."
 			fi
 			cd "${OLDPWD}"
 		else

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

[Thomas Deutschmann]

commit:     17d706a4a3da500cc13d29bc0316a8f908cb3b56
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 15 21:13:19 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 21:13:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=17d706a4

defaults/software.sh: Add coreutils

Fixes 3d23af3 ("Add b2sum")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/software.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/defaults/software.sh b/defaults/software.sh
index 4be9c92..60f6a31 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -37,6 +37,13 @@ GKPKG_BUSYBOX_SRCTAR="${GKPKG_BUSYBOX_SRCTAR:-${DISTDIR}/busybox-${GKPKG_BUSYBOX
 GKPKG_BUSYBOX_SRCDIR="${GKPKG_BUSYBOX_SRCDIR:-busybox-${GKPKG_BUSYBOX_PV}}"
 GKPKG_BUSYBOX_BINPKG="${GKPKG_BUSYBOX_BINPKG:-%%CACHE%%/busybox-${GKPKG_BUSYBOX_PV}-%%ARCH%%.tar.xz}"
 
+GKPKG_COREUTILS_PN="coreutils"
+GKPKG_COREUTILS_PV="${GKPKG_COREUTILS_PV:-VERSION_COREUTILS}"
+GKPKG_COREUTILS_DEPS=""
+GKPKG_COREUTILS_SRCTAR="${GKPKG_COREUTILS_SRCTAR:-${DISTDIR}/coreutils-${GKPKG_COREUTILS_PV}.tar.xz}"
+GKPKG_COREUTILS_SRCDIR="${GKPKG_COREUTILS_SRCDIR:-coreutils-${GKPKG_COREUTILS_PV}}"
+GKPKG_COREUTILS_BINPKG="${GKPKG_COREUTILS_BINPKG:-%%CACHE%%/cryptsetup-${GKPKG_COREUTILS_PV}-%%ARCH%%.tar.xz}"
+
 GKPKG_CRYPTSETUP_PN="cryptsetup"
 GKPKG_CRYPTSETUP_PV="${GKPKG_CRYPTSETUP_PV:-VERSION_CRYPTSETUP}"
 GKPKG_CRYPTSETUP_DEPS="util-linux json-c popt libgpg-error libgcrypt lvm"

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

[Rick Farina]

commit:     236ce6b9cbc7870e8d7baf094d68720bb5cc5678
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  4 15:36:52 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Mar  4 15:38:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=236ce6b9

update MAKEOPTS default fallback

we normally take 'portageq envvar MAKEOPTS' as the default MAKEOPTS, and
if that isn't available we set a static -j2.  Let's use all the cpus by
  default instead, and let the user override if they wish.

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 defaults/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/config.sh b/defaults/config.sh
index 8c7cf7e..bab7b7e 100644
--- a/defaults/config.sh
+++ b/defaults/config.sh
@@ -33,7 +33,7 @@ DEFAULT_COMPRESS_INITRD=yes
 DEFAULT_COMPRESS_INITRD_TYPE=best
 
 PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j$(nproc)}"
 
 DEFAULT_MODULEREBUILD_CMD="emerge --ignore-default-opts --buildpkg=n --usepkg=n --quiet-build=y @module-rebuild"
 

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

[Thomas Deutschmann]

commit:     2b2ada1ab9a30e214b69d596636d7abbbc51d249
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  5 15:03:31 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 15:03:31 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2b2ada1a

defaults/software.sh: Fix coreutils binpkg name

Fixes 17d706a ("defaults/software.sh: Add coreutils")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index 60f6a31..fbdca42 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -42,7 +42,7 @@ GKPKG_COREUTILS_PV="${GKPKG_COREUTILS_PV:-VERSION_COREUTILS}"
 GKPKG_COREUTILS_DEPS=""
 GKPKG_COREUTILS_SRCTAR="${GKPKG_COREUTILS_SRCTAR:-${DISTDIR}/coreutils-${GKPKG_COREUTILS_PV}.tar.xz}"
 GKPKG_COREUTILS_SRCDIR="${GKPKG_COREUTILS_SRCDIR:-coreutils-${GKPKG_COREUTILS_PV}}"
-GKPKG_COREUTILS_BINPKG="${GKPKG_COREUTILS_BINPKG:-%%CACHE%%/cryptsetup-${GKPKG_COREUTILS_PV}-%%ARCH%%.tar.xz}"
+GKPKG_COREUTILS_BINPKG="${GKPKG_COREUTILS_BINPKG:-%%CACHE%%/coreutils-${GKPKG_COREUTILS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_CRYPTSETUP_PN="cryptsetup"
 GKPKG_CRYPTSETUP_PV="${GKPKG_CRYPTSETUP_PV:-VERSION_CRYPTSETUP}"

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

[Rick Farina]

commit:     621a5e4659939f0d4d447e16667004fc41384f7d
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 17:35:46 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 17:36:55 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=621a5e46

defaults/initrd.scripts: proper b2sum missing error

sanify checks a little

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 defaults/initrd.scripts | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 7c115cb..b5da21a 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -320,15 +320,28 @@ bootstrapCD() {
 		cd "${CDROOT_PATH}"
 		checkfile=""
 		checker=""
-		if [ -r "isoroot_b2sums" ] && [ -x "$(command -v b2sum 2>&1)" ]
-		then
-			checkfile="isoroot_b2sums"
-			checker="b2sum"
-		elif [ -r "isoroot_checksums" ]
+		if [ -r "isoroot_checksums" ] && [ -z "${checkfile}" ]
 		then
 			checkfile="isoroot_checksums"
 			checker="sha512sum"
 		fi
+		if [ -r "isoroot_b2sums" ]
+		then
+			if [ -x "$(command -v b2sum 2>&1)" ]
+			then
+				checkfile="isoroot_b2sums"
+				checker="b2sum"
+			else
+				bad_msg "Unable to verify isoroot_b2sums due to missing b2sums"
+				bad_msg "Please use 'genkernel --b2sums' to generate initramfs"
+				if [ -z "${checkfile" ]
+				then
+					bad_msg "Press any key to skip ..."
+					read -n1 -s
+					return
+				fi
+			fi
+		fi
 
 		if [ -n "${checkfile}" ]
 		then

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

[Thomas Deutschmann]

commit:     46bb41537a96103f1674225cfaf3a8b0f7e4a4a8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 19:38:19 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 19:43:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=46bb4153

defaults/linuxrc: help shellcheck sourcing scripts

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 7fbd0ad..b3e1740 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1,8 +1,11 @@
 #!/bin/sh
 
+# shellcheck source=initrd.defaults
 . /etc/initrd.defaults
+# shellche2ck source=initrd.scripts
 . /etc/initrd.scripts
 
+# shellcheck source=/dev/null
 [ -e /etc/initrd.splash ] && . /etc/initrd.splash
 
 # Basic /dev content, we need it as fast as possible.

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

[Thomas Deutschmann]

commit:     262764a5ff8dd64a7b5b2b810783b31eae4bfa8b
Author:     Mihai Donțu <mihai.dontu <AT> gmail <DOT> com>
AuthorDate: Sat Apr 11 15:16:55 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 19:40:32 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=262764a5

defaults/initrd.scripts: minor syntax fix in bootstrapCD()

Fixes 621a5e46599 ("defaults/initrd.scripts: proper b2sum missing error")
Signed-off-by: Mihai Donțu <mihai.dontu <AT> gmail.com>
Closes: https://bugs.gentoo.org/717102
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b5da21a..d4b159a 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -334,7 +334,7 @@ bootstrapCD() {
 			else
 				bad_msg "Unable to verify isoroot_b2sums due to missing b2sums"
 				bad_msg "Please use 'genkernel --b2sums' to generate initramfs"
-				if [ -z "${checkfile" ]
+				if [ -z "${checkfile}" ]
 				then
 					bad_msg "Press any key to skip ..."
 					read -n1 -s

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

[Thomas Deutschmann]

commit:     039494e11540c963e7b804e7b4eecbef87d5eaa0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 19:38:53 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 19:43:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=039494e1

defaults/initrd.scripts: ignore SC2045

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d4b159a..514a8bc 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -186,6 +186,7 @@ findmediamount() {
 				# don't skip device mapper devices. Even the craziest scenario
 				# deserves a fair chance.
 				#
+				# shellcheck disable=SC2045
 				for part in $(ls /sys/block/${bsn}/${bsn}*[0-9]* 2>/dev/null)
 				do
 					skip=1

diff --git a/defaults/linuxrc b/defaults/linuxrc
index b3e1740..964a932 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1133,6 +1133,7 @@ FSTAB
 	then
 		if [ -e "${CDROOT_PATH}/add" ]
 		then
+				# shellcheck disable=SC2045
 				for targz in $(ls ${CDROOT_PATH}/add/*.tar.gz)
 				do
 					tarname=$(basename ${targz})
@@ -1188,6 +1189,7 @@ FSTAB
 					if [ -e "/${NEW_ROOT}/${directory}" ]
 					then
 						# It does exist, link all the individual files
+						# shellcheck disable=SC2045
 						for file in $(ls /${NEW_ROOT}/${FS_LOCATION}/${directory})
 						do
 							if [ ! -d "/${NEW_ROOT}/${FS_LOCATION}/${directory}/${file}" ] && [ ! -e "${NEW_ROOT}/${directory}/${file}" ]

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

[Thomas Deutschmann]

commit:     94edd477e491da2b900e6d1b1d71884081cf09ab
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  4 02:22:28 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 14:55:32 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=94edd477

defaults/linuxrc: Disable unnecessary udev timeout in zpool import

This is a regression that was introduced in sys-fs/zfs-kmod-0.7.0.
It was originally fixed by 2eb1d04cfbfa397b58a0b388f8ed28688fd114d8, but
this neglected to handle the case where booting is done via arguments
such as "root=ZFS" or "root=ZFS=rpool/ROOT/gentoo" on the kernel
commandline. This handles it.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
Closes: https://github.com/gentoo/genkernel/pull/16
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 514a8bc..2e3632b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1630,6 +1630,7 @@ start_volumes() {
 
 	if [ "${USE_ZFS}" = '1' ]
 	then
+		export ZPOOL_IMPORT_UDEV_TIMEOUT_MS=0
 		# Avoid race involving asynchronous module loading
 		if call_func_timeout waitForZFS 5
 		then
@@ -1679,6 +1680,7 @@ start_volumes() {
 				fi
 			fi
 		fi
+		unset ZPOOL_IMPORT_UDEV_TIMEOUT_MS
 	fi
 }
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 964a932..e90bd34 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -128,7 +128,6 @@ do
 		;;
 		dozfs*)
 			USE_ZFS=1
-			export ZPOOL_IMPORT_UDEV_TIMEOUT_MS=0
 
 			case "${x#*=}" in
 				*force*)

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

[Thomas Deutschmann]

commit:     dc3923c6f8d61ac28f9b1edb73b643aa6e7e67c2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 22:14:07 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 22:14:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dc3923c6

defaults/initrd.scripts: Log what is happening in *_resume functions

Bug: https://bugs.gentoo.org/728118
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2e3632b..c03629d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2525,7 +2525,13 @@ do_resume() {
 swsusp_resume() {
 	# determine swap resume partition
 	local device=$(ls -lL "${REAL_RESUME}" | sed 's/\  */ /g' | cut -d \  -f 5-6 | sed 's/,\ */:/')
-	[ -f /sys/power/resume ] && echo "${device}" > /sys/power/resume
+	if [ -f /sys/power/resume ]
+	then
+		log_msg "Trying to resume using swsusp ..."
+		log_msg "COMMAND: 'echo \"${device}\" > /sys/power/resume'"
+		echo "${device}" > /sys/power/resume
+		log_msg "System is not resuming, probably because it wasn't suspended; Continue normal booting ..."
+	fi
 }
 
 tuxonice_resume() {
@@ -2585,8 +2591,13 @@ tuxonice_resume() {
 		fi
 
 	fi
+
+	log_msg "Trying to resume using TuxOnIce ..."
+	log_msg "COMMAND: 'echo \"${REAL_RESUME}\" > ${tuxonice_resumedev}'"
 	echo "${REAL_RESUME}" > "${tuxonice_resumedev}"
+	log_msg "COMMAND: 'echo > ${tuxonice_do_resume}'"
 	echo > "${tuxonice_do_resume}"
+	log_msg "System is not resuming, probably because it wasn't suspended; Continue normal booting ..."
 }
 
 find_loop() {

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

[Thomas Deutschmann]

commit:     24d3f6b4b3afe1125fa9296b50b55f75870c645e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 19:08:17 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 19:08:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=24d3f6b4

defaults/initrd.scripts: test_success(): Fix quoting

Bug: https://bugs.gentoo.org/494710
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c03629d..d5378b7 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1037,8 +1037,8 @@ test_success() {
 	if [ "${retcode}" != '0' ]
 	then
 		error_string=${1}
-		error_string="${error_string:-run command}"
-		bad_msg 'Failed to ${1}; failing back to the shell ...'
+		error_string="${error_string:-Failed to run command}"
+		bad_msg "${error_string}; Failing back to the shell ..."
 		run_shell
 	fi
 }

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

[Thomas Deutschmann]

commit:     0e13d3f704220379a40e1a8e750dd58961f9e78e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 01:04:02 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0e13d3f7

defaults/linuxrc: Fix mounting of /proc

Cannot use `run` before root was mounted writable.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index e90bd34..682f647 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -31,7 +31,7 @@ then
 	exit 1
 fi
 
-run mount -t proc -o noexec,nosuid,nodev 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
 
 # Prevent superfluous printks from being printed to the console

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

[Thomas Deutschmann]

commit:     1ff8e13eae1052c56989bd313da860ef73c7bedd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 20:30:52 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 22:56:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1ff8e13e

defaults/initrd.scripts: mount_devfs(): Make sure that /dev/shm is available

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d95da4d..1bf778d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1043,6 +1043,10 @@ mount_devfs() {
 		run mkdir -m 0755 /dev/pts
 		run mount -t devpts -o gid=5,mode=0620 devpts /dev/pts || bad_msg "Failed to mount /dev/pts"
 	fi
+
+	run mkdir -m 1777 /dev/shm
+	run mount -t tmpfs -o mode=1777,nosuid,nodev,strictatime tmpfs /dev/shm \
+		|| bad_msg "Failed to mount /dev/shm"
 }
 
 test_success() {

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

[Thomas Deutschmann]

commit:     81b8f5d615cec53aaf93e6bc11540d45a92d038d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 20:56:28 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 22:56:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=81b8f5d6

defaults/linuxrc: Make use of PATH

Don't use absolute paths. Use 'hash' to test if command is available.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 28 ++++++++++++++++------------
 defaults/linuxrc        | 16 ++++++++--------
 defaults/unlock-luks.sh |  2 +-
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 426a64e..d95da4d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -718,7 +718,7 @@ setup_aufs() {
 
 					if ! hash e2fsck >/dev/null 2>&1
 					then
-						bad_msg "/sbin/e2fsck not found! aborting filesystem check"
+						bad_msg "e2fsck not found! aborting filesystem check"
 						bad_msg "Moving ${aufs_union_file#*/} to ${aufs_union_file#*/}.bad"
 
 						run mv "${aufs_dev_mnt}${aufs_union_file}" "${aufs_dev_mnt}${aufs_union_file}.bad"
@@ -1675,16 +1675,20 @@ start_volumes() {
 
 	if [ "${USE_BTRFS}" = '1' ]
 	then
-		if [ -x '/sbin/btrfs' ]
+		if ! hash btrfs >/dev/null 2>&1
 		then
+			bad_msg "dobtrfs invoked but 'btrfs' not found; Skipping btrfs device scanning ..."
+		else
 			good_msg "Scanning for BTRFS devices ..."
 
-			local btrfs_cmd="run /sbin/btrfs device scan 2>&1"
+			local btrfs_cmd="run btrfs device scan 2>&1"
 			is_log_enabled && btrfs_cmd="${btrfs_cmd} | tee -a '${GK_INIT_LOG}'"
 
 			eval "${btrfs_cmd}"
-		else
-			bad_msg "dobtrfs invoked but /sbin/btrfs not found; Skipping btrfs device scanning ..."
+			if [ $? -ne 0 ]
+			then
+				bad_msg "Scanning for BTRFS devices failed!"
+			fi
 		fi
 	fi
 
@@ -1808,7 +1812,7 @@ start_iscsi() {
 # It is either the root or a swap, other devices are supported in the scripts provided with sys-fs/cryptsetup
 # $1 - root/swap
 openLUKS() {
-	if [ ! -x /sbin/cryptsetup ]
+	if ! hash cryptsetup >/dev/null 2>&1
 	then
 		bad_msg "cryptsetup program is missing. Was initramfs built without --luks parameter?"
 		exit 1
@@ -1945,7 +1949,7 @@ openLUKS() {
 
 					if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ]
 					then
-						if [ ! -x '/usr/bin/gpg' ]
+						if ! hash gpg >/dev/null 2>&1
 						then
 							bad_msg "GPG-encrypted key file provided but gpg program is missing. Was initramfs built without --gpg parameter?"
 							bad_msg "Falling back to passphrase usage!"
@@ -1953,7 +1957,7 @@ openLUKS() {
 							[ -e /dev/tty ] && run mv /dev/tty /dev/tty.org
 							run mknod /dev/tty c 5 1
 							cryptsetup_options="${cryptsetup_options} -d -"
-							gpg_cmd="/usr/bin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
+							gpg_cmd="gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
 						fi
 					else
 						cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}"
@@ -2363,7 +2367,7 @@ start_sshd() {
 		return
 	fi
 
-	if [ ! -x "/usr/sbin/dropbear" ]
+	if ! hash dropbear >/dev/null 2>&1
 	then
 		bad_msg "/usr/sbin/dropbear not found! Was initramfs built without --ssh parameter?"
 		return
@@ -2382,7 +2386,7 @@ start_sshd() {
 	run touch /var/log/lastlog
 
 	good_msg "Starting dropbear sshd ..." ${QUIET}
-	run /usr/sbin/dropbear -p ${GK_SSHD_PORT} -R -P "${GK_SSHD_PIDFILE}" 2>/var/log/dropbear.log
+	run dropbear -p ${GK_SSHD_PORT} -R -P "${GK_SSHD_PIDFILE}" 2>/var/log/dropbear.log
 	if [ $? -eq 0 ]
 	then
 		if [ "${GK_PROMPT_TIMEOUT}" = '0' ]
@@ -2534,9 +2538,9 @@ cdupdate() {
 
 setup_btrfsctl() {
 	# start BTRFS volume detection, if available
-	if [ -x /sbin/btrfsctl ]
+	if hash btrfsctl >/dev/null 2>&1
 	then
-		local btrfs_cmd="run /sbin/btrfsctl -a 2>&1"
+		local btrfs_cmd="run btrfsctl -a 2>&1"
 		is_log_enabled && btrfs_cmd="${btrfs_cmd} | tee -a '${GK_INIT_LOG}'"
 
 		eval "${btrfs_cmd}"

diff --git a/defaults/linuxrc b/defaults/linuxrc
index f1357f6..7e3b388 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -40,11 +40,11 @@ echo 1 > /proc/sys/kernel/printk
 if [ ! -s /etc/ld.so.cache ]
 then
 	# Looks like we were unable to run ldconfig during initramfs generation
-	[ -x /sbin/ldconfig ] && run /sbin/ldconfig
+	hash ldconfig >/dev/null 2>&1 && run ldconfig
 fi
 
 # Set up symlinks
-run /bin/busybox --install -s
+run busybox --install -s
 
 gk_ver="$(cat /etc/build_id)"
 gk_build_date="$(cat /etc/build_date)"
@@ -460,7 +460,7 @@ fi
 
 if [ "${GK_BOOTFONT_DISABLED}" = '0' -a -e /lib/console/font ]
 then
-	[ -x /usr/sbin/setfont ] && run /usr/sbin/setfont /lib/console/font -C ${CONSOLE} 2>&1
+	hash setfont >/dev/null 2>&1 && run setfont /lib/console/font -C ${CONSOLE} 2>&1
 fi
 
 quiet_kmsg
@@ -578,7 +578,7 @@ run mdev -s || bad_msg "mdev -s failed"
 cd /
 
 # Start iSCSI
-if [ -e /bin/iscsistart ]
+if hash iscsistart >/dev/null 2>&1
 then
 	start_iscsi
 fi
@@ -1148,7 +1148,7 @@ FSTAB
 				do
 					tarname=$(basename ${targz})
 					good_msg "Adding additional package ${tarname}"
-					(cd ${NEW_ROOT} ; /bin/tar -xf ${targz})
+					(cd ${NEW_ROOT} ; tar -xf ${targz})
 				done
 		fi
 	fi
@@ -1359,15 +1359,15 @@ init=${REAL_INIT:-/sbin/init}
 if ! mountpoint "${CHROOT}" 1>/dev/null 2>&1
 then
 	bad_msg "${CHROOT} was not a mountpoint"
-elif chroot "${CHROOT}" /usr/bin/test ! -x /${init#/}
+elif chroot "${CHROOT}" test ! -x /${init#/}
 then
 	bad_msg "init=${init} does not exist in the rootfs!"
 elif [ $$ != 1 ]
 then
 	bad_msg "PID was not 1! switch_root would fail"
 else
-	good_msg "Switching to real root: /sbin/switch_root -c /dev/console ${CHROOT} ${init} ${init_opts}"
-	exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${init}" ${init_opts}
+	good_msg "Switching to real root: switch_root -c /dev/console ${CHROOT} ${init} ${init_opts}"
+	exec switch_root -c "/dev/console" "${CHROOT}" "${init}" ${init_opts}
 fi
 
 # If we get here, something bad has happened

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 0f54504..6ca60e0 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -37,7 +37,7 @@ then
 fi
 
 main() {
-	if [ ! -x /sbin/cryptsetup ]
+	if ! hash cryptsetup >/dev/null 2>&1
 	then
 		bad_msg "cryptsetup program is missing. Was initramfs built without --luks parameter?"
 		exit 1

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

[Thomas Deutschmann]

commit:     32dd11ac4e681ea9fadb0e8286468b518c0c252d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 20:04:17 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 22:56:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=32dd11ac

defaults/initrd.scripts: do_resume(): Use find_real_device() to determine REAL_RESUME device

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 3bede8a..b307fe1 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2574,6 +2574,15 @@ rundebugshell() {
 }
 
 do_resume() {
+	local device=$(find_real_device "${REAL_RESUME}")
+	if [ -z "${device}" ]
+	then
+		warn_msg "REAL_RESUME (${REAL_RESUME}) device not found; Skipping resume ..."
+		return 0
+	else
+		REAL_RESUME="${device}"
+	fi
+
 	if [ -d /proc/suspend2 -o -d /sys/power/suspend2 -o -d /sys/power/tuxonice ]
 	then
 		tuxonice_resume

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

[Thomas Deutschmann]

commit:     be199c08fada12dc7ccfbf75c8dddba99e185263
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 22:15:59 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 22:56:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=be199c08

defaults/initrd.scripts: Improve logging in *_resume functions

Add device which was tried to resume from to log message.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 1bf778d..d5a3612 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2608,7 +2608,7 @@ swsusp_resume() {
 		log_msg "Trying to resume using swsusp ..."
 		log_msg "COMMAND: 'echo \"${device}\" > /sys/power/resume'"
 		echo "${device}" > /sys/power/resume
-		log_msg "System is not resuming, probably because it wasn't suspended; Continue normal booting ..."
+		log_msg "System is not resuming from ${REAL_RESUME}, probably because it wasn't suspended; Continue normal booting ..."
 	fi
 }
 
@@ -2675,7 +2675,7 @@ tuxonice_resume() {
 	echo "${REAL_RESUME}" > "${tuxonice_resumedev}"
 	log_msg "COMMAND: 'echo > ${tuxonice_do_resume}'"
 	echo > "${tuxonice_do_resume}"
-	log_msg "System is not resuming, probably because it wasn't suspended; Continue normal booting ..."
+	log_msg "System is not resuming from ${REAL_RESUME}, probably because it wasn't suspended; Continue normal booting ..."
 }
 
 find_loop() {

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

[Thomas Deutschmann]

commit:     ea22a5f24f5e179c1ec8448657c753375f8567be
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 21:58:58 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 22:56:46 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ea22a5f2

defaults/software.sh: Fix style

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/software.sh | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index fbdca42..a9f9cf0 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -26,8 +26,8 @@ GKPKG_BOOST_BUILD_BINPKG="${GKPKG_BOOST_BUILD_BINPKG:-%%CACHE%%/boost-build-${GK
 GKPKG_BTRFS_PROGS_PN="btrfs-progs"
 GKPKG_BTRFS_PROGS_PV="${GKPKG_BTRFS_PROGS_PV:-VERSION_BTRFS_PROGS}"
 GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo"
-GKPKG_BTRFS_PROGS_SRCDIR="${GKPKG_BTRFS_PROGS_SRCDIR:-btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}}"
 GKPKG_BTRFS_PROGS_SRCTAR="${GKPKG_BTRFS_PROGS_SRCTAR:-${DISTDIR}/btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}.tar.xz}"
+GKPKG_BTRFS_PROGS_SRCDIR="${GKPKG_BTRFS_PROGS_SRCDIR:-btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}}"
 GKPKG_BTRFS_PROGS_BINPKG="${GKPKG_BTRFS_PROGS_BINPKG:-%%CACHE%%/btrfs-progs-${GKPKG_BTRFS_PROGS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_BUSYBOX_PN="busybox"
@@ -54,8 +54,8 @@ GKPKG_CRYPTSETUP_BINPKG="${GKPKG_CRYPTSETUP_BINPKG:-%%CACHE%%/cryptsetup-${GKPKG
 GKPKG_DMRAID_PN="dmraid"
 GKPKG_DMRAID_PV="${GKPKG_DMRAID_PV:-VERSION_DMRAID}"
 GKPKG_DMRAID_DEPS="lvm"
-GKPKG_DMRAID_SRCDIR="${GKPKG_DMRAID_SRCDIR:-dmraid/${GKPKG_DMRAID_PV}/dmraid}"
 GKPKG_DMRAID_SRCTAR="${GKPKG_DMRAID_SRCTAR:-${DISTDIR}/dmraid-${GKPKG_DMRAID_PV}.tar.bz2}"
+GKPKG_DMRAID_SRCDIR="${GKPKG_DMRAID_SRCDIR:-dmraid/${GKPKG_DMRAID_PV}/dmraid}"
 GKPKG_DMRAID_BINPKG="${GKPKG_DMRAID_BINPKG:-%%CACHE%%/dmraid-${GKPKG_DMRAID_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_DROPBEAR_PN="dropbear"
@@ -82,85 +82,85 @@ GKPKG_E2FSPROGS_BINPKG="${GKPKG_E2FSPROGS_BINPKG:-%%CACHE%%/e2fsprogs-${GKPKG_E2
 GKPKG_FUSE_PN="fuse"
 GKPKG_FUSE_PV="${GKPKG_FUSE_PV:-VERSION_FUSE}"
 GKPKG_FUSE_DEPS=""
-GKPKG_FUSE_SRCDIR="${GKPKG_FUSE_SRCDIR:-fuse-${GKPKG_FUSE_PV}}"
 GKPKG_FUSE_SRCTAR="${GKPKG_FUSE_SRCTAR:-${DISTDIR}/fuse-${GKPKG_FUSE_PV}.tar.gz}"
+GKPKG_FUSE_SRCDIR="${GKPKG_FUSE_SRCDIR:-fuse-${GKPKG_FUSE_PV}}"
 GKPKG_FUSE_BINPKG="${GKPKG_FUSE_BINPKG:-%%CACHE%%/fuse-${GKPKG_FUSE_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_GPG_PN="gnupg"
 GKPKG_GPG_PV="${GKPKG_GPG_PV:-VERSION_GPG}"
 GKPKG_GPG_DEPS=""
-GKPKG_GPG_SRCDIR="${GKPKG_GPG_SRCDIR:-gnupg-${GKPKG_GPG_PV}}"
 GKPKG_GPG_SRCTAR="${GKPKG_GPG_SRCTAR:-${DISTDIR}/gnupg-${GKPKG_GPG_PV}.tar.bz2}"
+GKPKG_GPG_SRCDIR="${GKPKG_GPG_SRCDIR:-gnupg-${GKPKG_GPG_PV}}"
 GKPKG_GPG_BINPKG="${GKPKG_GPG_BINPKG:-%%CACHE%%/gnupg-${GKPKG_GPG_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_ISCSI_PN="open-iscsi"
 GKPKG_ISCSI_PV="${GKPKG_ISCSI_PV:-VERSION_ISCSI}"
 GKPKG_ISCSI_DEPS="kmod zlib util-linux"
-GKPKG_ISCSI_SRCDIR="${GKPKG_ISCSI_SRCDIR:-open-iscsi-${GKPKG_ISCSI_PV}}"
 GKPKG_ISCSI_SRCTAR="${GKPKG_ISCSI_SRCTAR:-${DISTDIR}/open-iscsi-${GKPKG_ISCSI_PV}.tar.gz}"
+GKPKG_ISCSI_SRCDIR="${GKPKG_ISCSI_SRCDIR:-open-iscsi-${GKPKG_ISCSI_PV}}"
 GKPKG_ISCSI_BINPKG="${GKPKG_ISCSI_BINPKG:-%%CACHE%%/iscsi-${GKPKG_ISCSI_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_JSON_C_PN="json-c"
 GKPKG_JSON_C_PV="${GKPKG_JSON_C_PV:-VERSION_JSON_C}"
 GKPKG_JSON_C_DEPS=""
-GKPKG_JSON_C_SRCDIR="${GKPKG_JSON_C_SRCDIR:-json-c-${GKPKG_JSON_C_PV}}"
 GKPKG_JSON_C_SRCTAR="${GKPKG_JSON_C_SRCTAR:-${DISTDIR}/json-c-${GKPKG_JSON_C_PV}.tar.gz}"
+GKPKG_JSON_C_SRCDIR="${GKPKG_JSON_C_SRCDIR:-json-c-${GKPKG_JSON_C_PV}}"
 GKPKG_JSON_C_BINPKG="${GKPKG_JSON_C_BINPKG:-%%CACHE%%/json-c-${GKPKG_JSON_C_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_KMOD_PN="kmod"
 GKPKG_KMOD_PV="${GKPKG_KMOD_PV:-VERSION_KMOD}"
 GKPKG_KMOD_DEPS="zlib"
-GKPKG_KMOD_SRCDIR="${GKPKG_KMOD_SRCDIR:-kmod-${GKPKG_KMOD_PV}}"
 GKPKG_KMOD_SRCTAR="${GKPKG_KMOD_SRCTAR:-${DISTDIR}/kmod-${GKPKG_KMOD_PV}.tar.xz}"
+GKPKG_KMOD_SRCDIR="${GKPKG_KMOD_SRCDIR:-kmod-${GKPKG_KMOD_PV}}"
 GKPKG_KMOD_BINPKG="${GKPKG_KMOD_BINPKG:-%%CACHE%%/kmod-${GKPKG_KMOD_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LIBAIO_PN="libaio"
 GKPKG_LIBAIO_PV="${GKPKG_LIBAIO_PV:-VERSION_LIBAIO}"
 GKPKG_LIBAIO_DEPS=""
-GKPKG_LIBAIO_SRCDIR="${GKPKG_LIBAIO_SRCDIR:-libaio-${GKPKG_LIBAIO_PV}}"
 GKPKG_LIBAIO_SRCTAR="${GKPKG_LIBAIO_SRCTAR:-${DISTDIR}/libaio-${GKPKG_LIBAIO_PV}.tar.gz}"
+GKPKG_LIBAIO_SRCDIR="${GKPKG_LIBAIO_SRCDIR:-libaio-${GKPKG_LIBAIO_PV}}"
 GKPKG_LIBAIO_BINPKG="${GKPKG_LIBAIO_BINPKG:-%%CACHE%%/libaio-${GKPKG_LIBAIO_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LIBGCRYPT_PN="libgcrypt"
 GKPKG_LIBGCRYPT_PV="${GKPKG_LIBGCRYPT_PV:-VERSION_LIBGCRYPT}"
 GKPKG_LIBGCRYPT_DEPS="libgpg-error"
-GKPKG_LIBGCRYPT_SRCDIR="${GKPKG_LIBGCRYPT_SRCDIR:-libgcrypt-${GKPKG_LIBGCRYPT_PV}}"
 GKPKG_LIBGCRYPT_SRCTAR="${GKPKG_LIBGCRYPT_SRCTAR:-${DISTDIR}/libgcrypt-${GKPKG_LIBGCRYPT_PV}.tar.bz2}"
+GKPKG_LIBGCRYPT_SRCDIR="${GKPKG_LIBGCRYPT_SRCDIR:-libgcrypt-${GKPKG_LIBGCRYPT_PV}}"
 GKPKG_LIBGCRYPT_BINPKG="${GKPKG_LIBGCRYPT_BINPKG:-%%CACHE%%/libgcrypt-${GKPKG_LIBGCRYPT_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LIBGPG_ERROR_PN="libgpg-error"
 GKPKG_LIBGPG_ERROR_PV="${GKPKG_LIBGPG_ERROR_PV:-VERSION_LIBGPGERROR}"
 GKPKG_LIBGPG_ERROR_DEPS=""
-GKPKG_LIBGPG_ERROR_SRCDIR="${GKPKG_LIBGPG_ERROR_SRCDIR:-libgpg-error-${GKPKG_LIBGPG_ERROR_PV}}"
 GKPKG_LIBGPG_ERROR_SRCTAR="${GKPKG_LIBGPG_ERROR_SRCTAR:-${DISTDIR}/libgpg-error-${GKPKG_LIBGPG_ERROR_PV}.tar.bz2}"
+GKPKG_LIBGPG_ERROR_SRCDIR="${GKPKG_LIBGPG_ERROR_SRCDIR:-libgpg-error-${GKPKG_LIBGPG_ERROR_PV}}"
 GKPKG_LIBGPG_ERROR_BINPKG="${GKPKG_LIBGPG_ERROR_BINPKG:-%%CACHE%%/libgpg-error-${GKPKG_LIBGPG_ERROR_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LVM_PN="lvm"
 GKPKG_LVM_PV="${GKPKG_LVM_PV:-VERSION_LVM}"
 GKPKG_LVM_DEPS="util-linux libaio"
-GKPKG_LVM_SRCDIR="${GKPKG_LVM_SRCDIR:-LVM2.${GKPKG_LVM_PV}}"
 GKPKG_LVM_SRCTAR="${GKPKG_LVM_SRCTAR:-${DISTDIR}/LVM2.${GKPKG_LVM_PV}.tgz}"
+GKPKG_LVM_SRCDIR="${GKPKG_LVM_SRCDIR:-LVM2.${GKPKG_LVM_PV}}"
 GKPKG_LVM_BINPKG="${GKPKG_LVM_BINPKG:-%%CACHE%%/LVM2.${GKPKG_LVM_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LZO_PN="lzo"
 GKPKG_LZO_PV="${GKPKG_LZO_PV:-VERSION_LZO}"
 GKPKG_LZO_DEPS=""
-GKPKG_LZO_SRCDIR="${GKPKG_LZO_SRCDIR:-lzo-${GKPKG_LZO_PV}}"
 GKPKG_LZO_SRCTAR="${GKPKG_LZO_SRCTAR:-${DISTDIR}/lzo-${GKPKG_LZO_PV}.tar.gz}"
+GKPKG_LZO_SRCDIR="${GKPKG_LZO_SRCDIR:-lzo-${GKPKG_LZO_PV}}"
 GKPKG_LZO_BINPKG="${GKPKG_LZO_BINPKG:-%%CACHE%%/lzo-${GKPKG_LZO_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_MDADM_PN="mdadm"
 GKPKG_MDADM_PV="${GKPKG_MDADM_PV:-VERSION_MDADM}"
 GKPKG_MDADM_DEPS=""
-GKPKG_MDADM_SRCDIR="${GKPKG_MDADM_SRCDIR:-mdadm-${GKPKG_MDADM_PV}}"
 GKPKG_MDADM_SRCTAR="${GKPKG_MDADM_SRCTAR:-${DISTDIR}/mdadm-${GKPKG_MDADM_PV}.tar.xz}"
+GKPKG_MDADM_SRCDIR="${GKPKG_MDADM_SRCDIR:-mdadm-${GKPKG_MDADM_PV}}"
 GKPKG_MDADM_BINPKG="${GKPKG_MDADM_BINPKG:-%%CACHE%%/mdadm-${GKPKG_MDADM_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_POPT_PN="popt"
 GKPKG_POPT_PV="${GKPKG_POPT_PV:-VERSION_POPT}"
 GKPKG_POPT_DEPS=""
-GKPKG_POPT_SRCDIR="${GKPKG_POPT_SRCDIR:-popt-${GKPKG_POPT_PV}}"
 GKPKG_POPT_SRCTAR="${GKPKG_POPT_SRCTAR:-${DISTDIR}/popt-${GKPKG_POPT_PV}.tar.gz}"
+GKPKG_POPT_SRCDIR="${GKPKG_POPT_SRCDIR:-popt-${GKPKG_POPT_PV}}"
 GKPKG_POPT_BINPKG="${GKPKG_POPT_BINPKG:-%%CACHE%%/popt-${GKPKG_POPT_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_STRACE_PN="strace"
@@ -180,15 +180,15 @@ GKPKG_THIN_PROVISIONING_TOOLS_BINPKG="${GKPKG_THIN_PROVISIONING_TOOLS_BINPKG:-%%
 GKPKG_UNIONFS_FUSE_PN="unionfs-fuse"
 GKPKG_UNIONFS_FUSE_PV="${GKPKG_UNIONFS_FUSE_PV:-VERSION_UNIONFS_FUSE}"
 GKPKG_UNIONFS_FUSE_DEPS="fuse"
-GKPKG_UNIONFS_FUSE_SRCDIR="${GKPKG_UNIONFS_FUSE_SRCDIR:-unionfs-fuse-${GKPKG_UNIONFS_FUSE_PV}}"
 GKPKG_UNIONFS_FUSE_SRCTAR="${GKPKG_UNIONFS_FUSE_SRCTAR:-${DISTDIR}/unionfs-fuse-${GKPKG_UNIONFS_FUSE_PV}.tar.gz}"
+GKPKG_UNIONFS_FUSE_SRCDIR="${GKPKG_UNIONFS_FUSE_SRCDIR:-unionfs-fuse-${GKPKG_UNIONFS_FUSE_PV}}"
 GKPKG_UNIONFS_FUSE_BINPKG="${GKPKG_UNIONFS_FUSE_BINPKG:-%%CACHE%%/unionfs-fuse-${GKPKG_UNIONFS_FUSE_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_UTIL_LINUX_PN="util-linux"
 GKPKG_UTIL_LINUX_PV="${GKPKG_UTIL_LINUX_PV:-VERSION_UTIL_LINUX}"
 GKPKG_UTIL_LINUX_DEPS=""
-GKPKG_UTIL_LINUX_SRCDIR="${GKPKG_UTIL_LINUX_SRCDIR:-util-linux-${GKPKG_UTIL_LINUX_PV}}"
 GKPKG_UTIL_LINUX_SRCTAR="${GKPKG_UTIL_LINUX_SRCTAR:-${DISTDIR}/util-linux-${GKPKG_UTIL_LINUX_PV}.tar.xz}"
+GKPKG_UTIL_LINUX_SRCDIR="${GKPKG_UTIL_LINUX_SRCDIR:-util-linux-${GKPKG_UTIL_LINUX_PV}}"
 GKPKG_UTIL_LINUX_BINPKG="${GKPKG_UTIL_LINUX_BINPKG:-%%CACHE%%/util-linux-${GKPKG_UTIL_LINUX_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_XFSPROGS_PN="xfsprogs"
@@ -201,13 +201,13 @@ GKPKG_XFSPROGS_BINPKG="${GKPKG_XFSPROGS_BINPKG:-%%CACHE%%/xfsprogs-${GKPKG_XFSPR
 GKPKG_ZLIB_PN="zlib"
 GKPKG_ZLIB_PV="${GKPKG_ZLIB_PV:-VERSION_ZLIB}"
 GKPKG_ZLIB_DEPS=""
-GKPKG_ZLIB_SRCDIR="${GKPKG_ZLIB_SRCDIR:-zlib-${GKPKG_ZLIB_PV}}"
 GKPKG_ZLIB_SRCTAR="${GKPKG_ZLIB_SRCTAR:-${DISTDIR}/zlib-${GKPKG_ZLIB_PV}.tar.gz}"
+GKPKG_ZLIB_SRCDIR="${GKPKG_ZLIB_SRCDIR:-zlib-${GKPKG_ZLIB_PV}}"
 GKPKG_ZLIB_BINPKG="${GKPKG_ZLIB_BINPKG:-%%CACHE%%/zlib-${GKPKG_ZLIB_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_ZSTD_PN="zstd"
 GKPKG_ZSTD_PV="${GKPKG_ZSTD_PV:-VERSION_ZSTD}"
 GKPKG_ZSTD_DEPS=""
-GKPKG_ZSTD_SRCDIR="${GKPKG_ZSTD_SRCDIR:-zstd-${GKPKG_ZSTD_PV}}"
 GKPKG_ZSTD_SRCTAR="${GKPKG_ZSTD_SRCTAR:-${DISTDIR}/zstd-${GKPKG_ZSTD_PV}.tar.gz}"
+GKPKG_ZSTD_SRCDIR="${GKPKG_ZSTD_SRCDIR:-zstd-${GKPKG_ZSTD_PV}}"
 GKPKG_ZSTD_BINPKG="${GKPKG_ZSTD_BINPKG:-%%CACHE%%/zstd-${GKPKG_ZSTD_PV}-%%ARCH%%.tar.xz}"

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

[Thomas Deutschmann]

commit:     28d5ae82fc5269eb85b484cb7c086247156c5ea3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 21:08:12 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 22:56:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=28d5ae82

defaults/initrd.scripts: openLUKS(): Fix style

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b307fe1..426a64e 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1884,7 +1884,8 @@ openLUKS() {
 					then
 						REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
 						if [ -b "${REAL_LUKS_KEYDEV}" ]
-						then good_msg "Using key device ${REAL_LUKS_KEYDEV}." ${CRYPT_SILENT}
+						then
+							good_msg "Using key device ${REAL_LUKS_KEYDEV}." ${CRYPT_SILENT}
 						else
 							good_msg "Please insert removable device ${LUKS_KEYDEV} for ${LUKS_NAME}" ${CRYPT_SILENT}
 							# abort after 10 secs

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

[Thomas Deutschmann]

commit:     0048f44c081dce2e296b48c71a208abf2a815c84
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 20:00:12 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 20:00:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0048f44c

defaults/linuxrc: Support devices with symlinks

/dev/vg/foo can be a symlink to ../dm-1. This commit will allow
to use such a value for devices, i.e. ROOT=/dev/vg/foo.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 6dc588f..3bede8a 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -905,31 +905,39 @@ findnfsmount() {
 }
 
 find_real_device() {
-	local DEVICE="${1}"
-	case "${DEVICE}" in
+	local device="${1}"
+	local real_device=
+	local candidate=
+	case "${device}" in
 		UUID\=*|LABEL\=*|PARTLABEL=*|PARTUUID\=*)
-			local REAL_DEVICE=""
 			local retval=1
 
 			if [ ${retval} -ne 0 ]
 			then
-				REAL_DEVICE=$(findfs "${DEVICE}" 2>/dev/null)
+				candidate=$(findfs "${device}" 2>/dev/null)
 				retval=$?
 			fi
 
 			if [ ${retval} -ne 0 ]
 			then
-				REAL_DEVICE=$(blkid -o device -l -t "${DEVICE}" 2>/dev/null)
+				candidate=$(blkid -o device -l -t "${device}" 2>/dev/null)
 				retval=$?
 			fi
 
-			if [ ${retval} -eq 0 ] && [ -n "${REAL_DEVICE}" ]
+			if [ ${retval} -eq 0 ] && [ -n "${candidate}" ]
 			then
-				DEVICE="${REAL_DEVICE}"
+				real_device="${candidate}"
 			fi
 		;;
+		*)
+			candidate=$(readlink -f "${device}")
+			if [ -b "${candidate}" ]
+			then
+				real_device="${candidate}"
+			fi
 	esac
-	printf "%s" "${DEVICE}"
+
+	printf "%s" "${real_device}"
 }
 
 check_loop() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5354d09..f1357f6 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -783,15 +783,18 @@ do
 					fi
 				;;
 				*)
-					if [ -b "${REAL_ROOT}" ]
+					ROOT_DEV=$(readlink -f "${REAL_ROOT}")
+					if [ -b "${ROOT_DEV}" ]
 					then
 						got_good_root=1
+						REAL_ROOT=${ROOT_DEV}
 						echo
 						good_msg "Root device detected as ${REAL_ROOT}!"
 						break
 					fi
 				;;
 			esac
+			unset ROOT_DEV
 
 			if [ "${got_good_root}" != '1' ]
 			then

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

[Thomas Deutschmann]

commit:     7c5e666c2c4575dbf0f1901c90d13ec95520cdba
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 21:27:41 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 21:27:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7c5e666c

modules_load: Add vmw_pvscsi for VMware PVSCSI driver support

Link: https://forums.gentoo.org/viewtopic-t-1116502.html
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 9caa3c7..eddd23d 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -11,7 +11,7 @@ MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm
 MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="libata pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105"
 MODULES_SATA="ahci libata ata_piix sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor sata_mv sata_inic162x pdc_adma"
-MODULES_SCSI="mptspi megaraid_sas megaraid mpt2sas mpt3sas sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptfc mptsas 3w-sas 3w-xxxx 3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid_mbox megaraid_mm qla2xxx lpfc scsi_transport_fc aic94xx"
+MODULES_SCSI="mptspi megaraid_sas megaraid mpt2sas mpt3sas sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptfc mptsas 3w-sas 3w-xxxx 3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid_mbox megaraid_mm qla2xxx lpfc scsi_transport_fc aic94xx vmw_pvscsi"
 MODULES_WAITSCAN="scsi_wait_scan"
 MODULES_BLOCK="sdhci_acpi sdhci_pci"
 

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

[Thomas Deutschmann]

commit:     e6de787bd21542bbc94efe21eacd99178a756c65
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 17:30:03 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 19:50:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e6de787b

defaults/initrd.scripts: start_volumes(): Drop ZPOOL_IMPORT_UDEV_TIMEOUT_MS workaround

Now that we switched to (E)UDEV usage, this workaround is no longer needed.

Follow-up: 73689f8 ("ZFS: Enable UDEV support")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 22d7e85..b7dbdd8 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1630,7 +1630,6 @@ start_volumes() {
 
 	if [ "${USE_ZFS}" = '1' ]
 	then
-		export ZPOOL_IMPORT_UDEV_TIMEOUT_MS=0
 		# Avoid race involving asynchronous module loading
 		if call_func_timeout waitForZFS 5
 		then
@@ -1648,7 +1647,6 @@ start_volumes() {
 				bad_msg "Importing ZFS pools failed!"
 			fi
 		else
-
 			if [ "$(zpool list -H -o name ${ZFS_POOL} 2>&1)" = "${ZFS_POOL}" ]
 			then
 				good_msg "ZFS pool ${ZFS_POOL} already imported."
@@ -1690,7 +1688,6 @@ start_volumes() {
 				fi
 			fi
 		fi
-		unset ZPOOL_IMPORT_UDEV_TIMEOUT_MS
 	fi
 
 	udevsettle

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

[Thomas Deutschmann]

commit:     5c2d7fc5bbc302c6ad6eac111e375709d7031187
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 20:02:07 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 20:02:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5c2d7fc5

defaults/initrd.scripts: start_volumes(): Don't wait for /dev/zfs

This is not needed anymore and also not working.

Bug: https://bugs.gentoo.org/736084
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b7dbdd8..14f3c4e 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1501,17 +1501,6 @@ copyKeymap() {
 	fi
 }
 
-# This helper function is to be called using call_func_timeout.
-# It enables us to wait a reasonable amount of time until /dev/zfs appears.
-waitForZFS() {
-	while [ ! -c /dev/zfs ]
-	do
-		echo >/dev/null
-	done
-
-	exit 1
-}
-
 splash() {
 	return 0
 }
@@ -1631,7 +1620,7 @@ start_volumes() {
 	if [ "${USE_ZFS}" = '1' ]
 	then
 		# Avoid race involving asynchronous module loading
-		if call_func_timeout waitForZFS 5
+		if [ ! -e /dev/zfs ]
 		then
 			bad_msg "Cannot import ZFS pool because /dev/zfs is missing"
 		elif [ -z "${ZFS_POOL}" ]

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

[Thomas Deutschmann]

commit:     848f9d5eb48f6fe7cf1d11a2ccb2df9198f474f1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 21:29:34 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 21:29:34 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=848f9d5e

defaults/linuxrc: Process /etc/initramfs.mounts multiple times

We need to mount mountpoints listed in /etc/initramfs.mounts
before validating REAL_INIT in case init is located on seperate
mount.

In addition the code was moved to a dedicated function named
process_initramfs_mounts() to allow to run it multiple times
which is needed if REAL_INIT wasn't verified (in case system
was booted from livecd).

Link: https://forums.gentoo.org/viewtopic-t-1117762.html
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 14f3c4e..f34e5a3 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1249,6 +1249,55 @@ preserve_log() {
 	fi
 }
 
+process_initramfs_mounts() {
+	local fslist=
+
+	if [ -f "${NEW_ROOT}/etc/initramfs.mounts" ]
+	then
+		fslist="$(get_mounts_list)"
+	else
+		fslist="/usr"
+	fi
+
+	local dev= fs= fstype= opts= mnt= cmd=
+	for fs in ${fslist}
+	do
+		mnt="${NEW_ROOT}${fs}"
+		if run mountpoint -q "${mnt}"
+		then
+			good_msg "${fs} already mounted, skipping..."
+			continue
+		fi
+
+		dev=$(get_mount_device "${fs}")
+		[ -z "${dev}" ] && continue
+		# Resolve it like util-linux mount does
+		[ -L "${dev}" ] && dev=$(realpath "${dev}")
+		# In this case, it's probably part of the filesystem
+		# and not a mountpoint
+		[ -z "${dev}" ] && continue
+
+		fstype=$(get_mount_fstype "${fs}")
+		if get_mount_options "${fs}" | grep -Fq bind
+		then
+			opts="bind"
+			dev="${NEW_ROOT}${dev}"
+		else
+			# ro must be trailing, and the options will always
+			# contain at least 'defaults'
+			opts="$(get_mount_options ${fs} | strip_mount_options)"
+			opts="${opts},ro"
+		fi
+
+		cmd="mount -t ${fstype} -o ${opts} ${dev} ${mnt}"
+		good_msg "Mounting ${dev} as ${fs}: ${cmd}"
+		if ! run ${cmd}
+		then
+			bad_msg "Unable to mount ${dev} for ${fs}"
+		fi
+	done
+}
+
 prompt_user() {
 	# $1 = variable whose value is the path (examples: "REAL_ROOT",
 	#      "LUKS_KEYDEV")

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 3ca7e86..e0704f7 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -930,6 +930,11 @@ do
 		# else not a good root and start over.
 		if [ "${mountret}" = '0' ]
 		then
+			# Make sure that entries from $NEWROOT/etc/initramfs.mounts
+			# are mounted before validating $REAL_INIT in case init isn't
+			# located on $REAL_ROOT.
+			process_initramfs_mounts
+
 			init_binary_file="${NEW_ROOT}${REAL_INIT:-/sbin/init}"
 			init_binary_fallback_file="${NEW_ROOT}/bin/sh"
 
@@ -1261,40 +1266,8 @@ else
 	fi
 fi # if [ "${CDROOT}" = '1' ]
 
-# Mount the additional things as required by udev & systemd
-if [ -f ${NEW_ROOT}/etc/initramfs.mounts ]
-then
-	fslist=$(get_mounts_list)
-else
-	fslist="/usr"
-fi
-
-for fs in ${fslist}
-do
-	dev=$(get_mount_device ${fs})
-	[ -z "${dev}" ] && continue
-	# Resolve it like util-linux mount does
-	[ -L ${dev} ] && dev=$(readlink ${dev})
-	# In this case, it's probably part of the filesystem
-	# and not a mountpoint
-	[ -z "${dev}" ] && continue
-	fstype=$(get_mount_fstype ${fs})
-	if get_mount_options ${fs} | grep -Fq bind
-	then
-		opts='bind'
-		dev=${NEW_ROOT}${dev}
-	else
-		# ro must be trailing, and the options will always contain at least 'defaults'
-		opts="$(get_mount_options ${fs} | strip_mount_options),ro"
-	fi
-	mnt=${NEW_ROOT}${fs}
-	cmd="mount -t ${fstype} -o ${opts} ${dev} ${mnt}"
-	good_msg "Mounting ${dev} as ${fs}: ${cmd}"
-	if ! ${cmd}
-	then
-		bad_msg "Unable to mount ${dev} for ${fs}"
-	fi
-done # for fs in $fslist; do
+# Re-run to ensure $NEWROOT/etc/initramfs.mounts was processed at least once
+process_initramfs_mounts
 
 # Execute script on the cdrom just before boot to update things if necessary
 cdupdate

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

[Thomas Deutschmann]

commit:     6bc4264df660ff6f639cdd9625f5f0da20418e25
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 18:44:32 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 18:44:32 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6bc4264d

defaults/initrd.scripts: log_msg(): Log milliseconds

This will allow us to see more in detail where initramfs spent time.

Bug: https://bugs.gentoo.org/738378
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f34e5a3..fd87623 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1084,10 +1084,10 @@ log_msg() {
 	# codes and substitution can't be greedy.
 	# Because Busybox's sed cannot deal with control characters, we
 	# have to get rid of all non-printable characters like "^[" first...
-	LANG=C echo "${log_prefix}${msg}" | sed \
+	LANG=C echo "] ${log_prefix}${msg}" | sed \
 		-e "s,[^[:print:]],,g" \
 		-e 's,\(\\033\)\?\[[0-9;]\+m,,g' \
-		| ts '[%Y-%m-%d %H:%M:%S]' >> "${GK_INIT_LOG}"
+		| ts '[ %Y-%m-%d %H:%M:%.S' >> "${GK_INIT_LOG}"
 }
 
 # msg functions arguments

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

[Thomas Deutschmann]

commit:     064a2d9f2d6e6d4c5b5f2b04464c767387ef4f6c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 20:15:29 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 20:15:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=064a2d9f

busy-config: Disable CONFIG_STACK_OPTIMIZATION_386

Using '-mpreferred-stack-boundary=2' is considered broken and
is causing problems for some users.

Bug: https://bugs.gentoo.org/725674
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/busy-config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/busy-config b/defaults/busy-config
index 0a2456a..b34c912 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -73,6 +73,7 @@ CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
 CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
+# CONFIG_STACK_OPTIMIZATION_386 is not set
 
 #
 # Installation Options ("make install" behavior)

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

[Thomas Deutschmann]

commit:     f81f1204372a833a491ef0bcab1b6b3cc81f75d9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 20:25:53 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 20:25:53 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f81f1204

defaults/linuxrc: Hide first output until cmdline was parsed

This will make us honor QUIET kernel command-line argument and allow
full silent boot.

Link: https://forums.gentoo.org/viewtopic-t-1117988.html
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index e0704f7..9793fde 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -51,8 +51,6 @@ gk_ver="$(cat /etc/build_id)"
 gk_build_date="$(cat /etc/build_date)"
 kernel_ver="$(uname -r)"
 
-good_msg "${gk_ver} (${gk_build_date}). Linux kernel ${kernel_ver}"
-
 if [ "$0" = '/init' ]
 then
 	[ -e /linuxrc ] && run rm /linuxrc
@@ -466,6 +464,8 @@ then
 	fi
 fi
 
+good_msg "${gk_ver} (${gk_build_date}). Linux kernel ${kernel_ver}"
+
 if [ "${GK_BOOTFONT_DISABLED}" = '0' -a -e /lib/console/font ]
 then
 	hash setfont >/dev/null 2>&1 && run setfont /lib/console/font -C ${CONSOLE} 2>&1

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

[Thomas Deutschmann]

commit:     880f6e888501d49556dda0bcc96284b898d70d2b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 17:40:50 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 17:40:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=880f6e88

defaults/modules_load: Add hv_sock to Hyper-V modules list

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 8b2a47e..6f021ac 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -33,7 +33,7 @@ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse virtiofs loo
 MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic aes_generic xts af_alg algif_skcipher algif_hash algif_aead algif_rng serpent_generic"
 
 # Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv-keyboard hid_hyperv hv_utils hyperv_fb hv_storvsc"
+MODULES_HYPERV="hv_sock hv_utils hv_vmbus hv_balloon hyperv-keyboard hid_hyperv hv_utils hyperv_fb hv_storvsc"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto"

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

[Thomas Deutschmann]

commit:     0f2a198a2c613b4d035099f951fdb49d9c998275
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 17:38:44 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 17:40:33 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0f2a198a

defaults/modules_load: Fix Hyper-V keyboard support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 8ed4c62..8b2a47e 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -33,7 +33,7 @@ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse virtiofs loo
 MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic aes_generic xts af_alg algif_skcipher algif_hash algif_aead algif_rng serpent_generic"
 
 # Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hid_hyperv hv_utils hyperv_fb hv_storvsc"
+MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv-keyboard hid_hyperv hv_utils hyperv_fb hv_storvsc"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto"

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

[Thomas Deutschmann]

commit:     3fc29fcdf0af70a0dd14194089e7fe952748522c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 22:46:43 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 22:46:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3fc29fcd

kernel-generic-config: Enable WireGuard support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index bda16a5..bd8d415 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -6726,6 +6726,7 @@ CONFIG_WIL6210=m
 CONFIG_WILINK_PLATFORM_DATA=y
 # CONFIG_WIMAX is not set
 CONFIG_WINBOND_840=m
+CONFIG_WIREGUARD=m
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS=y
 CONFIG_WIZNET_BUS_ANY=y

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

[Thomas Deutschmann]

commit:     8c110e13f09aad67a666f4af10e51876fab50925
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 21:03:21 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 13:45:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8c110e13

defaults/linuxrc: Support devices with symlinks (2)

Follow up for commit 0048f44c081dce2e296b48c71a208abf2a815c84.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 438ed11..466e1f7 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -925,7 +925,7 @@ do
 		else
 			# If $REAL_ROOT is a symlink
 			# Resolve it like util-linux mount does
-			[ -L ${REAL_ROOT} ] && REAL_ROOT=$(readlink ${REAL_ROOT})
+			[ -L ${REAL_ROOT} ] && REAL_ROOT=$(readlink -f ${REAL_ROOT})
 			# mount ro so fsck doesn't barf later
 			if [ "${REAL_ROOTFLAGS}" = '' ]
 			then

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

[Thomas Deutschmann]

commit:     92a74db4286051466e7e61d53fbe51ab249c9804
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 21:00:19 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 13:45:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=92a74db4

defaults/linuxrc: Add debug breakpoint before udevd start

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 263f738..438ed11 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -576,6 +576,9 @@ else
 	good_msg 'Skipping module load; no modules in the ramdisk!'
 fi
 
+# Run debug shell if requested
+rundebugshell "before starting udevd"
+
 # Initialize udev
 if [ ! -f "/etc/udev/hwdb.bin" ]
 then

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

[Thomas Deutschmann]

commit:     3c7bcc98ee94cfda5d1d63d366a61bca281c965c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 22:56:04 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 13:45:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3c7bcc98

defaults/initrd.scripts: log_msg(): Leave function early in case log file cannot be written

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 29ec123..b579e4f 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1072,7 +1072,7 @@ log_msg() {
 
 	if [ ! -f "${GK_INIT_LOG}" ]
 	then
-		touch "${GK_INIT_LOG}"
+		touch "${GK_INIT_LOG}" 2>/dev/null || return
 	fi
 
 	local log_prefix=

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

[Thomas Deutschmann]

commit:     05f968fda2c6839744b36c442b3feaa6de974e63
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 13:38:41 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 16:35:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=05f968fd

defaults/linuxrc: Try to determine filesystem type

'mount -t auto' will not trigger module loading for filesystem kernel modules.
Therefore we try to determine filesystem to trigger module loading in case
filesystem isn't built into the kernel.

Bug: https://bugs.gentoo.org/739250
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index ee7ca2c..36f4791 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -198,6 +198,8 @@ findmediamount() {
 				fi
 				good_msg "Attempting to mount media: ${x}" ${CRYPT_SILENT}
 
+				CDROOT_TYPE=$(determine_fs "${x}" "${CDROOT_TYPE}")
+
 				run mount -t ${CDROOT_TYPE} ${x} ${mntcddir} >/dev/null 2>&1
 				if [ $? -eq 0 ]
 				then
@@ -233,6 +235,31 @@ findmediamount() {
 	[ -n "${result}" ] || bad_msg "Media not found" ${CRYPT_SILENT}
 }
 
+determine_fs() {
+	local _dev="${1}"
+	local _orig="${2:-auto}"
+	local _fs line
+
+	_fs=$(udevadm info --query=env --name="$_dev" 2>/dev/null | \
+		while read line || [ -n "${line}" ]
+		do
+			if str_starts ${line} "ID_FS_TYPE="
+			then
+				echo ${line#ID_FS_TYPE=}
+				break
+			fi
+		done
+	)
+	_fs=${_fs:-auto}
+
+	if [ "${_fs}" = "auto" ]
+	then
+		_fs="${_orig}"
+	fi
+
+	echo "${_fs}"
+}
+
 devicelist() {
 	# Locate the cdrom device with our media on it.
 	# CDROM DEVICES
@@ -697,7 +724,9 @@ setup_aufs() {
 		then
 			good_msg "Mounting ${aufs_dev} to ${aufs_memory} for aufs support"
 
-			if ! run mount -t auto "${aufs_dev}" "${aufs_dev_mnt}" >/dev/null 2>&1
+			local mounttype=$(determine_fs "${aufs_dev}" "auto")
+
+			if ! run mount -t ${mounttype} "${aufs_dev}" "${aufs_dev_mnt}" >/dev/null 2>&1
 			then
 				bad_msg "Mount of ${aufs_dev} failed, falling back to ramdisk based aufs"
 				unset aufs_dev
@@ -2727,6 +2756,17 @@ get_zfs_property() {
 	echo "$(zfs get -H -o value ${propertyname} "${device}" 2>/dev/null)"
 }
 
+# Returns TRUE if $1 contains literal string $2 at the
+# beginning and is not empty
+str_starts() {
+	if [ "${1#"${2}"*}" != "${1}" ]
+	then
+		return 0
+	fi
+
+	return 1
+}
+
 # If the kernel is handed a mount option is does not recognize, it WILL fail to
 # mount. util-linux handles auto/noauto, but busybox passes it straight to the kernel
 # which then rejects the mount.

diff --git a/defaults/linuxrc b/defaults/linuxrc
index b42366f..061d3e0 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -910,6 +910,10 @@ do
 			# If $REAL_ROOT is a symlink
 			# Resolve it like util-linux mount does
 			[ -L ${REAL_ROOT} ] && REAL_ROOT=$(readlink -f ${REAL_ROOT})
+
+			# determine fs -- 'auto' will not trigger module loading!
+			ROOTFSTYPE=$(determine_fs "${REAL_ROOT}" "${ROOTFSTYPE}")
+
 			# mount ro so fsck doesn't barf later
 			if [ "${REAL_ROOTFLAGS}" = '' ]
 			then
@@ -1028,7 +1032,7 @@ then
 				MOUNTTYPE="ext2"
 				;;
 			*)
-				MOUNTTYPE="${LOOPTYPE}"
+				MOUNTTYPE=$(determine_fs "/dev/mapper/root" "${MOUNTTYPE}")
 				;;
 		esac
 		run mount -t "${MOUNTTYPE}" -o ro /dev/mapper/root "${NEW_ROOT}/mnt/livecd"

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

[Thomas Deutschmann]

commit:     0b378bf0d675188a438bfea9dee392fb2b5d0cfd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 12:39:38 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 13:45:38 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0b378bf0

defaults/linuxrc: Make use of PATH (2)

Don't use absolute paths. Use 'hash' to test if command is available.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 466e1f7..5c3b0ce 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -509,15 +509,16 @@ esac
 # Verify that it is safe to use ZFS
 if [ "${USE_ZFS}" = '1' ]
 then
-	for i in /sbin/zfs /sbin/zpool
+	for i in zfs zpool
 	do
-		if [ ! -x ${i} ]
+		if ! hash ${i} >/dev/null 2>&1
 		then
 			USE_ZFS=0
-			bad_msg "Aborting use of ZFS because ${i} not found!"
+			bad_msg "Aborting use of ZFS because '${i}' not found!"
 			break
 		fi
 	done
+	unset i
 
 	[ "${USE_ZFS}" = '1' ] && MY_HWOPTS="${MY_HWOPTS} zfs"
 fi

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

[Thomas Deutschmann]

commit:     a2b6a16119837df4a803effaefe8ef0be08fe396
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 13:22:30 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 16:35:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a2b6a161

defaults/linuxrc: Log udevd debug output into /run/initramfs/udevd.log

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults | 1 +
 defaults/linuxrc         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index e310f19..fa71ecb 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -95,6 +95,7 @@ GK_SSHD_LOCKFILE='/tmp/remote-rescueshell.lock'
 GK_SSHD_PIDFILE='/var/run/dropbear.pid'
 GK_SSHD_PORT=22
 GK_SSHD_WAIT=
+GK_UDEV_LOG='/run/initramfs/udevd.log'
 GK_UDEV_TIMEOUT=120
 GK_USERINTERACTION_DISABLED_STATEFILE='/tmp/user-interaction.disabled'
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index a4ed811..1a4ddac 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -568,7 +568,7 @@ good_msg 'Activating udev ...'
 udevd_cmd="run udevd --resolve-names=never"
 if is_debug
 then
-	udevd_cmd="${udevd_cmd} --debug > /tmp/udev.debug 2>&1 &"
+	udevd_cmd="${udevd_cmd} --debug > ${GK_UDEV_LOG} 2>&1 &"
 else
 	udevd_cmd="${udevd_cmd} --daemon"
 fi

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

[Thomas Deutschmann]

commit:     4e42cbc5bcf0d4ed6558c90d09d8c3421d9d11d1
Author:     Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Sun Aug 30 17:38:55 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 21:07:11 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4e42cbc5

defaults/linuxrc: fix typo

Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/genkernel/pull/19
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index e96b637..bab54e1 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -2,7 +2,7 @@
 
 # shellcheck source=initrd.defaults
 . /etc/initrd.defaults
-# shellche2ck source=initrd.scripts
+# shellcheck source=initrd.scripts
 . /etc/initrd.scripts
 
 # shellcheck source=/dev/null

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

[Thomas Deutschmann]

commit:     0025f36938989750928753ff047320dccd9e3e27
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 13:16:22 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 13:16:22 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0025f369

defaults/unlock-luks.sh: Synchronize style with openLUKS()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/unlock-luks.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 710d951..bf1deaa 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -43,8 +43,11 @@ main() {
 		exit 1
 	fi
 
-	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="${NAME}" LUKS_KEY='"${CRYPT_KEYFILE_'${TYPE}'}"'
-	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
+	local LUKS_NAME="${NAME}"
+	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"'
+	eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"'
+	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
+	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
 
 	while true
 	do

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

[Thomas Deutschmann]

commit:     fbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 13:06:21 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 13:06:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fbf7eb4e

defaults/initrd.defaults: Rename $CRYPT_KEYFILE_{ROOT,SWAP} -> $CRYPT_{ROOT,SWAP}_KEYFILE

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults | 4 ++--
 defaults/login-remote.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index b665355..cf7406d 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -101,9 +101,9 @@ GK_UDEV_TIMEOUT=120
 GK_USERINTERACTION_DISABLED_STATEFILE='/tmp/user-interaction.disabled'
 
 CRYPT_ENV_FILE='/etc/CRYPT_ENV.conf'
-CRYPT_KEYFILE_ROOT='/tmp/root.key'
-CRYPT_KEYFILE_SWAP='/tmp/swap.key'
+CRYPT_ROOT_KEYFILE='/tmp/root.key'
 CRYPT_ROOT_OPENED_LOCKFILE='/tmp/ROOT.opened'
+CRYPT_SWAP_KEYFILE='/tmp/swap.key'
 CRYPT_SWAP_OPENED_LOCKFILE='/tmp/SWAP.opened'
 
 ZFS_ENC_ENV_FILE='/etc/ZFS_ENC_ENV.conf'

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 94ee014..7fcfc70 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -24,10 +24,10 @@ fi
 receivefile() {
 	case ${1} in
 		root)
-			file=${CRYPT_KEYFILE_ROOT}
+			file=${CRYPT_ROOT_KEYFILE}
 			;;
 		swap)
-			file=${CRYPT_KEYFILE_SWAP}
+			file=${CRYPT_SWAP_KEYFILE}
 			;;
 		'')
 			bad_msg "No keyfile specified." "${CRYPT_SILENT}"

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

[Thomas Deutschmann]

commit:     076201c0214837e99bebf3a05a7b0f9727fbf751
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 19:56:35 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 19:56:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=076201c0

defaults/unlock-luks.sh: Unbreak remote unlock using POST action

Fixes: 0025f3693 ("defaults/unlock-luks.sh: Synchronize style with openLUKS()")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/unlock-luks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index bf1deaa..a8ae990 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -45,7 +45,7 @@ main() {
 
 	local LUKS_NAME="${NAME}"
 	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"'
-	eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"'
+	eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEYFILE}"'
 	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
 	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
 

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

[Thomas Deutschmann]

commit:     3265be70d78e20e385f98e7aad651f4a4a68ee3b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 05:43:26 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 05:51:54 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3265be70

initrd.scripts: openLUKS(): validate argument

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 5d744ee..2fcc593 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1767,6 +1767,10 @@ openLUKS() {
 		swap)
 			local TYPE=SWAP
 			;;
+		*)
+			bad_msg "OpenLUKS(): Unknown type '${1}' specified!"
+			exit 1
+			;;
 	esac
 
 	local LUKS_NAME="${1}"

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

[Thomas Deutschmann]

commit:     c4e6b09c79f33303f749b2b40af51a01f168971f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 04:34:57 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 05:51:47 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c4e6b09c

linuxrc: load btrfs module manually

There is no trigger/rule in UDEV/btrfs-progs to load btrfs module.

The only known trigger via mount command could be too late or
is maybe insufficient depending on used BTRFS {meta,}data profile.

Bug: https://bugs.gentoo.org/739892
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index d8fee73..222dd35 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -535,6 +535,14 @@ then
 	FIRSTMODS="${FIRSTMODS} crc32_generic"
 fi
 
+if [ "${ROOTFSTYPE}" = "btrfs" -o -x /sbin/btrfs ]
+then
+	# We have no mechanism to trigger btrfs module loading before UDEV's btrfs builtin
+	# will run; In addition, loading btrfs via UDEV could cause problems for slow
+	# machines, see https://github.com/dracutdevs/dracut/issues/658
+	FIRSTMODS="${FIRSTMODS} btrfs"
+fi
+
 splash 'init'
 
 cmdline_hwopts

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

[Thomas Deutschmann]

commit:     f8a26eeba219c4027848fd50a2ae4e9d22029168
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 05:44:32 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 05:51:59 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f8a26eeb

initrd.scripts: openLUKS(): differentiate LUKS_DEVICE errors

If LUKS_DEVICE was not found user can either have not set
crypt_{root,swap}, set crypt_{root,swap} to an invalid value
or kernel is lacking storage support (i.e. missing controller driver).

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 8 +++++++-
 defaults/unlock-luks.sh | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2fcc593..f7e6c3d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1783,6 +1783,12 @@ openLUKS() {
 	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
 	local mntkey="/mnt/key/" crypt_filter_ret=
 
+	if [ -z "${LUKS_DEVICE}" ]
+	then
+		bad_msg "'crypt_${1}' kernel command-line argument is not set!"
+		exit 1
+	fi
+
 	while true
 	do
 		local gpg_cmd=""
@@ -1810,7 +1816,7 @@ openLUKS() {
 			LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}")
 			if [ -z "${LUKS_DEVICE}" ]
 			then
-				bad_msg "Looks like CRYPT_${TYPE} kernel cmdline argument is not set." ${CRYPT_SILENT}
+				bad_msg "Failed to find LUKS device. If crypt_${1} kernel command-line argument is correct you are probably missing kernel support for your storage!" ${CRYPT_SILENT}
 				DEV_ERROR=1
 				continue
 			fi

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 59e086a..4c99a1f 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -49,6 +49,12 @@ main() {
 	eval local cryptsetup_options='"${CRYPT_'${TYPE}'_OPTIONS}"'
 	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
 
+	if [ -z "${LUKS_DEVICE}" ]
+	then
+		bad_msg "'crypt_${NAME}' kernel command-line argument is not set!"
+		exit 1
+	fi
+
 	while true
 	do
 		local gpg_cmd crypt_filter_ret
@@ -61,7 +67,7 @@ main() {
 			LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}")
 			if [ -z "${LUKS_DEVICE}" ]
 			then
-				bad_msg "Looks like CRYPT_${TYPE} kernel cmdline argument is not set." "${CRYPT_SILENT}"
+				bad_msg "Failed to find LUKS device. If crypt_${NAME} kernel command-line argument is correct you are probably missing kernel support for your storage!" ${CRYPT_SILENT}
 				exit 1
 			fi
 

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

[Thomas Deutschmann]

commit:     a0ecf435b3f5093d23209eb43c51c8cb9a6bc3ae
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 21:42:31 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 21:42:31 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a0ecf435

kernel-generic-config: rebased against & and updated for linux-5.11

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 790 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 723 insertions(+), 67 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index bd8d415..927a44d 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -59,6 +59,7 @@ CONFIG_ACPI_CUSTOM_METHOD=m
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DOCK=y
+# CONFIG_ACPI_DPTF is not set
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_EXTLOG=m
 CONFIG_ACPI_FAN=y
@@ -109,14 +110,17 @@ CONFIG_AD5272=m
 # CONFIG_AD5758 is not set
 # CONFIG_AD5761 is not set
 # CONFIG_AD5764 is not set
+# CONFIG_AD5770R is not set
 # CONFIG_AD5791 is not set
 # CONFIG_AD5933 is not set
+# CONFIG_AD7091R5 is not set
 CONFIG_AD7124=m
 # CONFIG_AD7150 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
 # CONFIG_AD7280 is not set
 # CONFIG_AD7291 is not set
+CONFIG_AD7292=m
 # CONFIG_AD7298 is not set
 # CONFIG_AD7303 is not set
 # CONFIG_AD7476 is not set
@@ -135,6 +139,7 @@ CONFIG_AD7949=m
 # CONFIG_AD799X is not set
 # CONFIG_AD8366 is not set
 # CONFIG_AD8801 is not set
+CONFIG_AD9467=m
 # CONFIG_AD9523 is not set
 # CONFIG_AD9832 is not set
 # CONFIG_AD9834 is not set
@@ -143,6 +148,7 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # CONFIG_ADFS_FS is not set
+CONFIG_ADI_AXI_ADC=m
 CONFIG_ADIN_PHY=m
 # CONFIG_ADIS16080 is not set
 # CONFIG_ADIS16130 is not set
@@ -154,10 +160,12 @@ CONFIG_ADIN_PHY=m
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADIS16400 is not set
 # CONFIG_ADIS16460 is not set
+# CONFIG_ADIS16475 is not set
 # CONFIG_ADIS16480 is not set
 # CONFIG_ADJD_S311 is not set
 CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_ADT7316 is not set
+# CONFIG_ADUX1020 is not set
 # CONFIG_ADVANTECH_WDT is not set
 CONFIG_ADVISE_SYSCALLS=y
 # CONFIG_ADXL345_I2C is not set
@@ -165,6 +173,7 @@ CONFIG_ADVISE_SYSCALLS=y
 CONFIG_ADXL372_I2C=m
 CONFIG_ADXL372=m
 CONFIG_ADXL372_SPI=m
+# CONFIG_ADXRS290 is not set
 # CONFIG_ADXRS450 is not set
 # CONFIG_AFE4403 is not set
 # CONFIG_AFE4404 is not set
@@ -196,6 +205,7 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000
 CONFIG_AIO=y
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
+# CONFIG_AL3010 is not set
 # CONFIG_AL3320A is not set
 CONFIG_ALIENWARE_WMI=m
 CONFIG_ALIM1535_WDT=m
@@ -211,6 +221,8 @@ CONFIG_ALX=m
 CONFIG_AMD8111_ETH=m
 CONFIG_AMD_NB=y
 CONFIG_AMD_PHY=m
+CONFIG_AMD_PMC=m
+# CONFIG_AMD_SFH_HID is not set
 CONFIG_AMD_XGBE_DCB=y
 CONFIG_AMD_XGBE_HAVE_ECC=y
 CONFIG_AMD_XGBE=m
@@ -221,6 +233,7 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_APDS9802ALS=m
 # CONFIG_APDS9960 is not set
 CONFIG_APPLE_GMUX=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_APPLE_PROPERTIES=y
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
@@ -232,9 +245,13 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_COPY_MC=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+CONFIG_ARCH_HAS_DEBUG_WX=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_ARCH_HAS_EARLY_DEBUG=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_HAS_FILTER_PGPROT=y
@@ -242,6 +259,7 @@ CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_ARCH_HAS_REFCOUNT=y
 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
@@ -254,6 +272,7 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_HIBERNATION_HEADER=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_ARCH_MEMORY_PROBE is not set
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
@@ -273,15 +292,23 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 # CONFIG_ARCNET is not set
 # CONFIG_AS3935 is not set
+# CONFIG_AS73211 is not set
+CONFIG_AS_AVX512=y
 CONFIG_ASM_MODVERSIONS=y
 CONFIG_ASN1=y
+CONFIG_AS_SHA1_NI=y
+CONFIG_AS_SHA256_NI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_AS_TPAUSE=y
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
 CONFIG_ASUS_WIRELESS=m
@@ -299,6 +326,7 @@ CONFIG_ASYNC_XOR=m
 CONFIG_AT803X_PHY=m
 CONFIG_ATA_ACPI=y
 CONFIG_ATA_BMDMA=y
+CONFIG_ATA_FORCE=y
 CONFIG_ATA_GENERIC=m
 CONFIG_ATALK=m
 CONFIG_ATA_OVER_ETH=m
@@ -316,6 +344,7 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
+# CONFIG_ATH11K is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 CONFIG_ATH5K_PCI=y
@@ -350,6 +379,7 @@ CONFIG_ATL1C=m
 CONFIG_ATL1E=m
 CONFIG_ATL1=m
 CONFIG_ATL2=m
+# CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_ATLAS_PH_SENSOR is not set
 # CONFIG_ATM_AMBASSADOR is not set
 # CONFIG_ATM_BR2684_IPFILTER is not set
@@ -385,6 +415,7 @@ CONFIG_AUDIT=y
 CONFIG_AUTOFS4_FS=m
 CONFIG_AUTOFS_FS=m
 CONFIG_AUXDISPLAY=y
+CONFIG_AUXILIARY_BUS=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
@@ -435,15 +466,18 @@ CONFIG_BACKLIGHT_ARCXCNN=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_KTD253 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_PM8941_WLED is not set
 CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BALLOON_COMPACTION=y
+CONFIG_BAREUDP=m
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
 CONFIG_BATMAN_ADV_BATMAN_V=y
@@ -457,6 +491,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_SYSFS=y
 CONFIG_BATMAN_ADV_TRACING=y
 # CONFIG_BATTERY_BQ27XXX is not set
+CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
@@ -466,7 +501,9 @@ CONFIG_BATMAN_ADV_TRACING=y
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BCM54140_PHY=m
 CONFIG_BCM7XXX_PHY=m
+# CONFIG_BCM84881_PHY is not set
 CONFIG_BCM87XX_PHY=m
 CONFIG_BCMA_BLOCKIO=y
 # CONFIG_BCMA_DEBUG is not set
@@ -503,6 +540,7 @@ CONFIG_BINFMT_SCRIPT=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
 CONFIG_BLK_DEBUG_FS=y
@@ -516,6 +554,7 @@ CONFIG_BLK_DEV_DM=m
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_BLK_DEV_INTEGRITY_T10=m
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_BLK_DEV_LOOP=m
@@ -530,6 +569,8 @@ CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_BLK_DEV_RBD=m
+# CONFIG_BLK_DEV_RNBD_CLIENT is not set
+# CONFIG_BLK_DEV_RNBD_SERVER is not set
 # CONFIG_BLK_DEV_RSXX is not set
 CONFIG_BLK_DEV_SD=m
 CONFIG_BLK_DEV_SR=m
@@ -540,6 +581,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_RDMA=y
 CONFIG_BLK_MQ_VIRTIO=y
@@ -552,6 +594,7 @@ CONFIG_BLK_WBT=y
 CONFIG_BLOCK=y
 # CONFIG_BMA180 is not set
 # CONFIG_BMA220 is not set
+# CONFIG_BMA400 is not set
 CONFIG_BMC150_ACCEL_I2C=m
 CONFIG_BMC150_ACCEL=m
 CONFIG_BMC150_ACCEL_SPI=m
@@ -574,6 +617,7 @@ CONFIG_BNXT_HWMON=y
 CONFIG_BNXT=m
 CONFIG_BNXT_SRIOV=y
 CONFIG_BONDING=m
+CONFIG_BOOT_CONFIG=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
@@ -582,13 +626,18 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_BOOTTIME_TRACING=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_EVENTS=y
+# CONFIG_BPFILTER is not set
 CONFIG_BPFILTER_UMH=m
-CONFIG_BPFILTER=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_JIT=y
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_BPF_LSM=y
+CONFIG_BPF_PRELOAD_UMD=m
+CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF=y
@@ -605,6 +654,7 @@ CONFIG_BRCMFMAC_USB=y
 CONFIG_BRCMSMAC=m
 # CONFIG_BRCM_TRACING is not set
 CONFIG_BRCMUTIL=m
+CONFIG_BRIDGE_CFM=y
 CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_AMONG=m
 CONFIG_BRIDGE_EBT_ARP=m
@@ -627,6 +677,7 @@ CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE=m
+CONFIG_BRIDGE_MRP=y
 CONFIG_BRIDGE_NETFILTER=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_VLAN_FILTERING=y
@@ -641,7 +692,7 @@ CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_BREDR=y
-# CONFIG_BT_DEBUGFS is not set
+CONFIG_BT_DEBUGFS=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIBLUECARD=m
@@ -678,6 +729,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_MSFTEXT=y
 CONFIG_BT_MTKSDIO=m
 # CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
@@ -697,6 +749,7 @@ CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
 CONFIG_BUILD_SALT=""
 CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_BXT_WC_PMIC_OPREGION=y
 # CONFIG_C2PORT is not set
 # CONFIG_CACHEFILES_DEBUG is not set
@@ -724,15 +777,18 @@ CONFIG_CAN_GS_USB=m
 CONFIG_CAN_GW=m
 CONFIG_CAN_HI311X=m
 CONFIG_CAN_IFI_CANFD=m
+# CONFIG_CAN_ISOTP is not set
 # CONFIG_CAN_J1939 is not set
 # CONFIG_CAN_KVASER_PCIEFD is not set
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN=m
 CONFIG_CAN_M_CAN=m
+# CONFIG_CAN_M_CAN_PCI is not set
 # CONFIG_CAN_M_CAN_PLATFORM is not set
 # CONFIG_CAN_M_CAN_TCAN4X5X is not set
 CONFIG_CAN_MCBA_USB=m
+# CONFIG_CAN_MCP251XFD is not set
 # CONFIG_CAN_MCP251X is not set
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
@@ -763,14 +819,17 @@ CONFIG_CB710_CORE=m
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # CONFIG_CB710_DEBUG is not set
 # CONFIG_CC10001_ADC is not set
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_INT128=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 CONFIG_CC_IS_GCC=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -779,7 +838,11 @@ CONFIG_CDROM=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_CEC_CORE=y
+CONFIG_CEC_CH7322=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_SECO=m
+CONFIG_CEC_SECO_RC=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FS_POSIX_ACL=y
@@ -809,15 +872,18 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_WRITEBACK=y
 # CONFIG_CHARGER_ADP5061 is not set
+# CONFIG_CHARGER_BD99954 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24257 is not set
 # CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ2515X is not set
 # CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_BQ25980 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_LP8727 is not set
@@ -833,7 +899,8 @@ CONFIG_CHARLCD_BL_FLASH=y
 CONFIG_CHARLCD=m
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CHECK_SIGNATURE=y
-CONFIG_CHELSIO_IPSEC_INLINE=y
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+CONFIG_CHELSIO_IPSEC_INLINE=m
 CONFIG_CHELSIO_LIB=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
@@ -842,6 +909,7 @@ CONFIG_CHELSIO_T4_DCB=y
 # CONFIG_CHELSIO_T4_FCOE is not set
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
+# CONFIG_CHELSIO_TLS_DEVICE is not set
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_ST=m
@@ -861,6 +929,7 @@ CONFIG_CIFS=m
 CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_SMB_DIRECT is not set
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_SWN_UPCALL=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
@@ -879,9 +948,15 @@ CONFIG_CM32181=m
 # CONFIG_CM3232 is not set
 # CONFIG_CM3323 is not set
 # CONFIG_CM36651 is not set
+CONFIG_CMA_ALIGNMENT=8
 CONFIG_CMA_AREAS=7
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_SIZE_MBYTES=0
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_PARTITION is not set
@@ -894,7 +969,7 @@ CONFIG_CODA_FS=m
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_SI5341 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK_SI544=m
+# CONFIG_COMMON_CLK_SI544 is not set
 CONFIG_COMMON_CLK=y
 CONFIG_COMPACTION=y
 CONFIG_COMPAL_LAPTOP=m
@@ -922,7 +997,7 @@ CONFIG_CORTINA_PHY=m
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
@@ -938,7 +1013,7 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_IDLE_GOV_HALTPOLL=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_IDLE_GOV_TEO=y
+# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_ISOLATION=y
 CONFIG_CPU_RMAP=y
@@ -974,7 +1049,7 @@ CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_ADIANTUM=m
 CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEGIS128=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_AES_TI=m
@@ -986,7 +1061,14 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
 CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2S=m
+CONFIG_CRYPTO_BLAKE2S_X86=m
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -1002,14 +1084,18 @@ CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_CURVE25519_X86=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
 CONFIG_CRYPTO_DEV_ATMEL_ECC=m
 CONFIG_CRYPTO_DEV_ATMEL_I2C=m
 CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
@@ -1022,6 +1108,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_QAT_4XXX=m
 CONFIG_CRYPTO_DEV_QAT_C3XXX=m
 CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
 CONFIG_CRYPTO_DEV_QAT_C62X=m
@@ -1038,7 +1125,7 @@ CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECHAINIV=m
@@ -1046,9 +1133,9 @@ CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_FIPS=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH_INFO=y
@@ -1062,7 +1149,17 @@ CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
+CONFIG_CRYPTO_LIB_BLAKE2S=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
 CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_LZ4HC=m
@@ -1077,7 +1174,7 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305=m
 CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
@@ -1087,18 +1184,21 @@ CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SM2=m
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
 CONFIG_CRYPTO_STATS=y
@@ -1109,18 +1209,21 @@ CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=y
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
 CONFIG_CUSE=m
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
@@ -1149,6 +1252,9 @@ CONFIG_DEBUG_DEVRES=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
@@ -1185,6 +1291,7 @@ CONFIG_DEBUG_SHIRQ=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_VM_PGFLAGS is not set
+CONFIG_DEBUG_VM_PGTABLE=y
 # CONFIG_DEBUG_VM_RB is not set
 # CONFIG_DEBUG_VM_VMACACHE is not set
 CONFIG_DEBUG_VM=y
@@ -1198,9 +1305,11 @@ CONFIG_DECOMPRESS_LZ4=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_ZSTD=y
 CONFIG_DEFAULT_CUBIC=y
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+CONFIG_DEFAULT_INIT=""
 # CONFIG_DEFAULT_RENO is not set
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_DEFAULT_SECURITY_SELINUX=y
@@ -1216,15 +1325,18 @@ CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_DESCRIPTOR=m
 CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_SYSMAN=m
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
 CONFIG_DEV_COREDUMP=y
+CONFIG_DEV_DAX_HMEM_DEVICES=y
+CONFIG_DEV_DAX_HMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
 # CONFIG_DEVFREQ_GOV_USERSPACE is not set
-# CONFIG_DEVFREQ_THERMAL is not set
+CONFIG_DEVFREQ_THERMAL=y
 # CONFIG_DEVKMEM is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
@@ -1233,17 +1345,26 @@ CONFIG_DEVTMPFS=y
 CONFIG_DHT11=m
 CONFIG_DIMLIB=y
 CONFIG_DL2K=m
+# CONFIG_DLHL60D is not set
 CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
 CONFIG_DMA_ACPI=y
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMABUF_HEAPS_CMA is not set
+CONFIG_DMABUF_HEAPS_SYSTEM=y
+CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMA_CMA is not set
+CONFIG_DMA_CMA=y
+CONFIG_DMA_COHERENT_POOL=y
 # CONFIG_DMADEVICES_DEBUG is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_OPS=y
+# CONFIG_DMA_PERNUMA_CMA is not set
 # CONFIG_DMARD09 is not set
 CONFIG_DMARD10=m
 CONFIG_DMAR_TABLE=y
@@ -1255,13 +1376,14 @@ CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_BUFIO=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
-# CONFIG_DM_CLONE is not set
+CONFIG_DM_CLONE=m
 CONFIG_DM_CRYPT=m
 CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 CONFIG_DM_DUST=m
+# CONFIG_DM_EBS is not set
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
@@ -1272,6 +1394,8 @@ CONFIG_DMI=y
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=m
+CONFIG_DM_MULTIPATH_HST=m
+# CONFIG_DM_MULTIPATH_IOA is not set
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
@@ -1284,7 +1408,8 @@ CONFIG_DM_UEVENT=y
 CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING is not set
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_ZONED=m
@@ -1296,6 +1421,7 @@ CONFIG_DP83640_PHY=m
 CONFIG_DP83822_PHY=m
 CONFIG_DP83848_PHY=m
 # CONFIG_DP83867_PHY is not set
+CONFIG_DP83869_PHY=m
 # CONFIG_DP83TC811_PHY is not set
 # CONFIG_DPS310 is not set
 CONFIG_DPTF_POWER=m
@@ -1306,7 +1432,10 @@ CONFIG_DRM_AMD_ACP=y
 CONFIG_DRM_AMD_DC_DCN1_0=y
 CONFIG_DRM_AMD_DC_DCN2_0=y
 CONFIG_DRM_AMD_DC_DCN2_1=y
+CONFIG_DRM_AMD_DC_DCN=y
 CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
+CONFIG_DRM_AMD_DC_HDCP=y
+CONFIG_DRM_AMD_DC_SI=y
 CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
@@ -1314,6 +1443,7 @@ CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_ANALOGIX_DP=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_BRIDGE=y
@@ -1336,9 +1466,15 @@ CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_I915_ALPHA_SUPPORT is not set
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_FENCE_TIMEOUT=10000
 CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
 CONFIG_DRM_I915=m
+CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
+CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
 CONFIG_DRM_I915_SPIN_REQUEST=5
+CONFIG_DRM_I915_STOP_TIMEOUT=100
+CONFIG_DRM_I915_TIMESLICE_DURATION=1
 CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
 CONFIG_DRM_I915_USERPTR=y
 CONFIG_DRM_KMS_FB_HELPER=y
@@ -1358,12 +1494,13 @@ CONFIG_DRM_QXL=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SCHED=m
+CONFIG_DRM_TTM_HELPER=m
 CONFIG_DRM_TTM=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VIRTIO_GPU is not set
-# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VRAM_HELPER=m
@@ -1524,9 +1661,12 @@ CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
+CONFIG_DWMAC_INTEL=m
 # CONFIG_DW_WATCHDOG is not set
+CONFIG_DYNAMIC_DEBUG_CORE=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_EVENTS=y
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_E1000E_HWTS=y
@@ -1541,7 +1681,7 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_ECHO=m
 CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_EDAC_AMD64_ERROR_INJECTION=y
+# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_AMD64=m
 CONFIG_EDAC_ATOMIC_SCRUB=y
 # CONFIG_EDAC_DEBUG is not set
@@ -1557,6 +1697,7 @@ CONFIG_EDAC_I7300=m
 CONFIG_EDAC_I7CORE=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_IGEN6=m
 CONFIG_EDAC_LEGACY_SYSFS=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC_X38=m
@@ -1575,15 +1716,19 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_BOOTLOADER_CONTROL=m
 CONFIG_EFI_CAPSULE_LOADER=m
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 CONFIG_EFI_DEV_PATH_PARSER=y
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_EARLYCON=y
 CONFIG_EFI_ESRT=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 CONFIG_EFI_RCI2_TABLE=y
 CONFIG_EFI_RUNTIME_MAP=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=m
@@ -1615,11 +1760,16 @@ CONFIG_EROFS_FS_ZIP=y
 CONFIG_ET131X=m
 CONFIG_ETHERNET=y
 CONFIG_ETHOC=m
+CONFIG_ETHTOOL_NETLINK=y
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EVENTFD=y
 CONFIG_EVENT_TRACING=y
-# CONFIG_EVM is not set
-# CONFIG_EXFAT_FS is not set
+# CONFIG_EVM_ADD_XATTRS is not set
+CONFIG_EVM_ATTR_FSUUID=y
+# CONFIG_EVM_LOAD_X509 is not set
+CONFIG_EVM=y
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_EXPORTFS=y
@@ -1631,6 +1781,7 @@ CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_AXP288 is not set
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON_GPIO is not set
 CONFIG_EXTCON_INTEL_INT3496=m
@@ -1638,16 +1789,22 @@ CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_PTN5150 is not set
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
+# CONFIG_EXTCON_USBC_TUSB320 is not set
 # CONFIG_EXTCON_USB_GPIO is not set
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_EZX_PCAP is not set
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_FS_LZ4=y
+CONFIG_F2FS_FS_LZORLE=y
+CONFIG_F2FS_FS_LZO=y
 CONFIG_F2FS_FS=m
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_ZSTD=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F71808E_WDT=m
@@ -1667,7 +1824,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
-CONFIG_FAULT_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ARK is not set
@@ -1712,6 +1869,7 @@ CONFIG_FB_NOTIFY=y
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_UDL is not set
@@ -1746,6 +1904,7 @@ CONFIG_FM10K=m
 # CONFIG_FONT_10x18 is not set
 CONFIG_FONT_6x10=y
 # CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_6x8 is not set
 # CONFIG_FONT_7x14 is not set
 CONFIG_FONT_8x16=y
 # CONFIG_FONT_8x8 is not set
@@ -1767,7 +1926,7 @@ CONFIG_FPGA_DFL_FME_MGR=m
 CONFIG_FPGA_DFL_FME_REGION=m
 CONFIG_FPGA_DFL=m
 CONFIG_FPGA_DFL_PCI=m
-CONFIG_FPGA=m
+# CONFIG_FPGA is not set
 CONFIG_FPGA_MGR_ALTERA_CVP=m
 CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
 CONFIG_FPGA_MGR_MACHXO2_SPI=m
@@ -1786,6 +1945,7 @@ CONFIG_FSCACHE=m
 CONFIG_FSCACHE_OBJECT_LIST=y
 CONFIG_FSCACHE_STATS=y
 CONFIG_FS_DAX=y
+CONFIG_FS_ENCRYPTION_ALGS=m
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=m
@@ -1796,6 +1956,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_FS_VERITY=y
 # CONFIG_FTL is not set
 CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_RECORD_RECURSION is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
@@ -1817,7 +1978,8 @@ CONFIG_FUSION_SPI=m
 CONFIG_FUSION=y
 CONFIG_FUTEX_PI=y
 CONFIG_FUTEX=y
-CONFIG_FW_CFG_SYSFS_CMDLINE=y
+CONFIG_FW_CACHE=y
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
 CONFIG_FW_CFG_SYSFS=m
 CONFIG_FW_LOADER_COMPRESS=y
 CONFIG_FW_LOADER_PAGED_BUF=y
@@ -1826,6 +1988,8 @@ CONFIG_FW_LOADER=y
 CONFIG_FXAS21002C_I2C=m
 CONFIG_FXAS21002C=m
 CONFIG_FXAS21002C_SPI=m
+# CONFIG_FXOS8700_I2C is not set
+# CONFIG_FXOS8700_SPI is not set
 CONFIG_GACT_PROB=y
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
@@ -1840,7 +2004,6 @@ CONFIG_GARP=m
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
 CONFIG_GCC_PLUGINS=y
-CONFIG_GCC_VERSION=90200
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
@@ -1854,11 +2017,13 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_GENERIC_ENTRY=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_IOMAP=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
 CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_INJECTION=y
 CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -1872,12 +2037,19 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PINCONF=y
+CONFIG_GENERIC_PTDUMP=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_TRACER=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_GENEVE=m
+CONFIG_GENTOO_LINUX_INIT_SCRIPT=y
+CONFIG_GENTOO_LINUX_INIT_SYSTEMD=y
+CONFIG_GENTOO_LINUX_PORTAGE=y
+CONFIG_GENTOO_LINUX_UDEV=y
+CONFIG_GENTOO_LINUX=y
 CONFIG_GFS2_FS_LOCKING_DLM=y
 CONFIG_GFS2_FS=m
 # CONFIG_GLOB_SELFTEST is not set
@@ -1885,15 +2057,19 @@ CONFIG_GLOB=y
 # CONFIG_GNSS is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_GP2AP002 is not set
 # CONFIG_GP2AP020A00F is not set
 CONFIG_GPD_POCKET_FAN=m
 CONFIG_GPIO_ACPI=y
 # CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_AMD8111 is not set
 CONFIG_GPIO_AMD_FCH=m
 CONFIG_GPIO_AMDPT=m
 CONFIG_GPIO_BD9571MWV=m
 # CONFIG_GPIO_BT8XX is not set
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_CDEV=y
 # CONFIG_GPIO_DWAPB is not set
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_F7188X is not set
@@ -1913,7 +2089,9 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_MOCKUP is not set
+# CONFIG_GPIO_PCA953X_IRQ is not set
 CONFIG_GPIO_PCA953X=m
+# CONFIG_GPIO_PCA9570 is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
@@ -1936,6 +2114,7 @@ CONFIG_GRO_CELLS=y
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
 # CONFIG_GUP_BENCHMARK is not set
+# CONFIG_GUP_TEST is not set
 CONFIG_GVE=m
 # CONFIG_HABANA_AI is not set
 CONFIG_HALTPOLL_CPUIDLE=m
@@ -1945,6 +2124,7 @@ CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY_FALLBACK=y
 CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HARDLOCKUP_DETECTOR_PERF=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_HAS_DMA=y
@@ -1956,24 +2136,31 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
+CONFIG_HAVE_ARCH_KCSAN=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_ASM_MODVERSIONS=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y
 CONFIG_HAVE_COPY_THREAD_TLS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_EBPF_JIT=y
@@ -2002,6 +2189,7 @@ CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_ZSTD=y
 CONFIG_HAVE_KPROBES_ON_FTRACE=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -2020,6 +2208,7 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_MOVE_PUD=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_HAVE_NMI=y
 CONFIG_HAVE_OPROFILE=y
@@ -2030,18 +2219,23 @@ CONFIG_HAVE_PERF_EVENTS_NMI=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
 CONFIG_HAVE_SCHED_AVG_IRQ=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_HAVE_STATIC_CALL_INLINE=y
+CONFIG_HAVE_STATIC_CALL=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_UID16=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HD44780_COMMON=m
 CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
+# CONFIG_HDC2010 is not set
 CONFIG_HDMI_LPE_AUDIO=m
 CONFIG_HDMI=y
 # CONFIG_HEADERS_INSTALL is not set
@@ -2053,6 +2247,7 @@ CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
 CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2084,6 +2279,7 @@ CONFIG_HID_EZKEY=m
 CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GENERIC=y
 CONFIG_HID_GFRM=m
+# CONFIG_HID_GLORIOUS is not set
 CONFIG_HID_GREENASIA=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_GYRATION=m
@@ -2104,6 +2300,7 @@ CONFIG_HID_MACALLY=m
 CONFIG_HID_MAGICMOUSE=y
 CONFIG_HID_MALTRON=m
 CONFIG_HID_MAYFLASH=m
+# CONFIG_HID_MCP2221 is not set
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
@@ -2159,6 +2356,7 @@ CONFIG_HID_U2FZERO=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_UDRAW_PS3=m
 CONFIG_HID_VIEWSONIC=m
+# CONFIG_HID_VIVALDI is not set
 CONFIG_HID_WACOM=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_WIIMOTE=m
@@ -2168,7 +2366,9 @@ CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
+# CONFIG_HIST_TRIGGERS_DEBUG is not set
 CONFIG_HIST_TRIGGERS=y
+# CONFIG_HMC425 is not set
 # CONFIG_HMC6352 is not set
 CONFIG_HMM_MIRROR=y
 CONFIG_HOLTEK_FF=y
@@ -2211,13 +2411,15 @@ CONFIG_HWLAT_TRACER=y
 CONFIG_HWMON_VID=m
 CONFIG_HWMON=y
 CONFIG_HW_RANDOM_AMD=m
+# CONFIG_HW_RANDOM_BA431 is not set
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIA=m
 # CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=y
+# CONFIG_HWSPINLOCK is not set
 # CONFIG_HX711 is not set
 # CONFIG_HYPERV is not set
 CONFIG_HYPERVISOR_GUEST=y
@@ -2275,6 +2477,7 @@ CONFIG_I2C_SCMI=m
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_SIS96X=m
 CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_STUB=m
@@ -2292,6 +2495,7 @@ CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 CONFIG_I8253_LOCK=y
 CONFIG_I8K=m
+CONFIG_IA32_FEAT_CTL=y
 # CONFIG_IAQCORE is not set
 CONFIG_IAVF=m
 CONFIG_IB700_WDT=m
@@ -2299,6 +2503,7 @@ CONFIG_IBM_ASM=m
 CONFIG_IBMASR=m
 # CONFIG_IBM_RTL is not set
 CONFIG_ICE=m
+# CONFIG_ICP10100 is not set
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 CONFIG_IDEAPAD_LAPTOP=m
@@ -2328,6 +2533,8 @@ CONFIG_IGB=m
 CONFIG_IGBVF=m
 CONFIG_IGC=m
 CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_DMA=m
 CONFIG_IIO_BUFFER_HW_CONSUMER=m
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_CONFIGFS=m
@@ -2359,6 +2566,7 @@ CONFIG_IIO_SW_TRIGGER=m
 # CONFIG_IIO_SYSFS_TRIGGER is not set
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_TRIGGERED_BUFFER=m
+# CONFIG_IIO_TRIGGERED_EVENT is not set
 CONFIG_IIO_TRIGGER=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_IKCONFIG=y
@@ -2367,7 +2575,7 @@ CONFIG_IMA_APPRAISE_BOOTPARAM=y
 # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
 CONFIG_IMA_APPRAISE_MODSIG=y
 CONFIG_IMA_APPRAISE=y
-# CONFIG_IMA_ARCH_POLICY is not set
+CONFIG_IMA_ARCH_POLICY=y
 # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
 CONFIG_IMA_DEFAULT_HASH="sha256"
 CONFIG_IMA_DEFAULT_HASH_SHA256=y
@@ -2375,9 +2583,12 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
 CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
 CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
 CONFIG_IMA_LSM_RULES=y
+CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
 CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_IMA_NG_TEMPLATE=y
+CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
 CONFIG_IMA_READ_POLICY=y
+CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 # CONFIG_IMA_SIG_TEMPLATE is not set
 # CONFIG_IMA_TEMPLATE is not set
 # CONFIG_IMA_TRUSTED_KEYRING is not set
@@ -2386,6 +2597,7 @@ CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
+# CONFIG_INET6_ESPINTCP is not set
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
@@ -2394,9 +2606,11 @@ CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_INET_DIAG=m
+# CONFIG_INET_ESPINTCP is not set
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_MPTCP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_SCTP_DIAG=m
 CONFIG_INET_TCP_DIAG=m
@@ -2421,12 +2635,16 @@ CONFIG_INFINIBAND_MTHCA_DEBUG=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_VIRT_DMA=y
 CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -2449,6 +2667,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_DA7280_HAPTICS is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2463,6 +2682,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 # CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_IQS269A is not set
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_KEYBOARD=y
@@ -2502,7 +2722,9 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_TRUSTED_KEYRING=y
 CONFIG_INTEGRITY=y
+# CONFIG_INTEL_ATOMISP2_LED is not set
 CONFIG_INTEL_ATOMISP2_PM=m
+# CONFIG_INTEL_ATOMISP is not set
 CONFIG_INTEL_BXT_PMIC_THERMAL=m
 CONFIG_INTEL_BXTWC_PMIC_TMU=m
 CONFIG_INTEL_CHTDC_TI_PWRBTN=m
@@ -2510,9 +2732,12 @@ CONFIG_INTEL_GTT=y
 CONFIG_INTEL_HID_EVENT=m
 CONFIG_INTEL_IDLE=y
 CONFIG_INTEL_IDMA64=m
+CONFIG_INTEL_IDXD=m
+CONFIG_INTEL_IDXD_SVM=y
 CONFIG_INTEL_INT0002_VGPIO=m
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_SVM=y
 CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IPS=m
@@ -2524,29 +2749,45 @@ CONFIG_INTEL_MEI_WDT=m
 # CONFIG_INTEL_MENLOW is not set
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_INTEL_PMC_CORE=y
+CONFIG_INTEL_PMC_CORE=m
 CONFIG_INTEL_PMC_IPC=y
+# CONFIG_INTEL_PMT_CLASS is not set
+# CONFIG_INTEL_PMT_CRASHLOG is not set
+# CONFIG_INTEL_PMT_TELEMETRY is not set
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_RAPL_CORE=m
 CONFIG_INTEL_RAPL=m
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INTEL_SOC_PMIC_BXTWC=m
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
-# CONFIG_INTEL_TH is not set
+CONFIG_INTEL_TH_ACPI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_PTI=m
 CONFIG_INTEL_TXT=y
+# CONFIG_INTEL_UNCORE_FREQ_CONTROL is not set
 CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_INTERVAL_TREE=y
+# CONFIG_INV_ICM42600_I2C is not set
+# CONFIG_INV_ICM42600_SPI is not set
 CONFIG_INV_MPU6050_I2C=m
 CONFIG_INV_MPU6050_IIO=m
 # CONFIG_INV_MPU6050_SPI is not set
+CONFIG_IOASID=y
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set
@@ -2554,6 +2795,7 @@ CONFIG_IO_DELAY_0X80=y
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_IOMMU_DMA=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IOSCHED_BFQ=y
@@ -2561,6 +2803,7 @@ CONFIG_IOSCHED_BFQ=y
 CONFIG_IOSF_MBI=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IO_URING=y
+CONFIG_IO_WQ=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MANGLE=m
@@ -2664,6 +2907,8 @@ CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
+# CONFIG_IPV6_RPL_LWTUNNEL is not set
+CONFIG_IPV6_SEG6_BPF=y
 CONFIG_IPV6_SEG6_HMAC=y
 CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
@@ -2729,6 +2974,7 @@ CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_IRQ_POLL=y
 # CONFIG_IRQSOFF_TRACER is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
@@ -2744,6 +2990,7 @@ CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_STREAMZAP=m
+# CONFIG_IR_TOY is not set
 CONFIG_IR_TTUSBIR=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_XMP_DECODER=m
@@ -2808,6 +3055,7 @@ CONFIG_JFS_STATISTICS=y
 CONFIG_JME=m
 CONFIG_JOLIET=y
 CONFIG_JOYSTICK_A3D=m
+# CONFIG_JOYSTICK_ADC is not set
 CONFIG_JOYSTICK_ADI=m
 CONFIG_JOYSTICK_ANALOG=m
 # CONFIG_JOYSTICK_AS5011 is not set
@@ -2854,6 +3102,7 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_ZSTD is not set
 CONFIG_KERNFS=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEXEC_JUMP=y
@@ -2885,8 +3134,10 @@ CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_TM2_TOUCHKEY=m
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KGDB_HONOUR_BLOCKLIST=y
 # CONFIG_KGDB_KDB is not set
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
@@ -2895,6 +3146,7 @@ CONFIG_KGDB_TESTS=y
 CONFIG_KGDB=y
 # CONFIG_KMX61 is not set
 # CONFIG_KPC2000 is not set
+# CONFIG_KPROBE_EVENT_GEN_TEST is not set
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_KPROBE_EVENTS=y
 CONFIG_KPROBES_ON_FTRACE=y
@@ -2910,6 +3162,7 @@ CONFIG_KS0108_PORT=0x378
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
+# CONFIG_KUNIT is not set
 CONFIG_KVM_AMD=m
 CONFIG_KVM_ASYNC_PF=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -2920,6 +3173,7 @@ CONFIG_KVM=m
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_MMU_AUDIT=y
 CONFIG_KVM_VFIO=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
 CONFIG_KXCJK1013=m
 # CONFIG_KXSD9 is not set
 CONFIG_L2TP_DEBUGFS=m
@@ -2930,6 +3184,7 @@ CONFIG_L2TP_V3=y
 # CONFIG_LAPB is not set
 CONFIG_LATENCYTOP=y
 # CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_LCD2S is not set
 # CONFIG_LCD_AMS369FG06 is not set
 CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_HX8357 is not set
@@ -2946,12 +3201,15 @@ CONFIG_LCD_PLATFORM=m
 CONFIG_LDISC_AUTOLOAD=y
 # CONFIG_LDM_DEBUG is not set
 CONFIG_LDM_PARTITION=y
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_LD_VERSION=235020000
 CONFIG_LEDS_APU=m
 CONFIG_LEDS_AS3645A=m
 # CONFIG_LEDS_BD2802 is not set
 CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 CONFIG_LEDS_CLASS_FLASH=m
+# CONFIG_LEDS_CLASS_MULTICOLOR is not set
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLEVO_MAIL=m
 # CONFIG_LEDS_DAC124S085 is not set
@@ -2964,6 +3222,7 @@ CONFIG_LEDS_LM3601X=m
 # CONFIG_LEDS_LM3642 is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
+# CONFIG_LEDS_LP50XX is not set
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_LP5562 is not set
@@ -2977,6 +3236,8 @@ CONFIG_LEDS_PCA9532=m
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_PWM is not set
 # CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_RT8515 is not set
+# CONFIG_LEDS_SGM3140 is not set
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TI_LMU_COMMON is not set
 # CONFIG_LEDS_TLC591XX is not set
@@ -3020,10 +3281,12 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIDAR_LITE_V2 is not set
+CONFIG_LINEAR_RANGES=y
 CONFIG_LIRC=y
 # CONFIG_LKDTM is not set
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
+CONFIG_LLD_VERSION=0
 CONFIG_LMP91000=m
 CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
@@ -3041,7 +3304,7 @@ CONFIG_LOCK_SPIN_ON_OWNER=y
 # CONFIG_LOCK_TORTURE_TEST is not set
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_LOG_BUF_SHIFT=18
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=15
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -3058,15 +3321,17 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
 CONFIG_LTC1660=m
 # CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
+# CONFIG_LTC2496 is not set
 # CONFIG_LTC2497 is not set
 # CONFIG_LTC2632 is not set
+# CONFIG_LTC2983 is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_LTR501 is not set
 CONFIG_LV0104CS=m
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_LWTUNNEL=y
 CONFIG_LXT_PHY=m
-CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4_COMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_LZ4HC_COMPRESS=m
 CONFIG_LZO_COMPRESS=y
@@ -3097,16 +3362,19 @@ CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 # CONFIG_MAG3110 is not set
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MANAGER_SBS is not set
 # CONFIG_MANDATORY_FILE_LOCKING is not set
+CONFIG_MAPPING_DIRTY_HELPERS=y
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX11100 is not set
 # CONFIG_MAX1118 is not set
+CONFIG_MAX1241=m
 CONFIG_MAX1363=m
 CONFIG_MAX30100=m
 # CONFIG_MAX30102 is not set
@@ -3122,8 +3390,15 @@ CONFIG_MAX44009=m
 CONFIG_MAXIM_THERMOCOUPLE=m
 CONFIG_MAX_RAW_DEVS=8192
 CONFIG_MB1232=m
+# CONFIG_MBARCELONA is not set
+# CONFIG_MBOBCAT is not set
+# CONFIG_MBROADWELL is not set
+# CONFIG_MBULLDOZER is not set
 # CONFIG_MC3230 is not set
+# CONFIG_MCANNONLAKE is not set
+# CONFIG_MCASCADELAKE is not set
 # CONFIG_MCB is not set
+# CONFIG_MCOOPERLAKE is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
@@ -3140,10 +3415,12 @@ CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS=m
 CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVRES=m
 # CONFIG_MDIO_GPIO is not set
 CONFIG_MDIO_I2C=m
 CONFIG_MDIO=m
 # CONFIG_MDIO_MSCC_MIIM is not set
+# CONFIG_MDIO_MVUSB is not set
 CONFIG_MD_LINEAR=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_RAID0=m
@@ -3154,6 +3431,7 @@ CONFIG_MD=y
 CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CEC_SUPPORT=y
 CONFIG_MEDIA_COMMON_OPTIONS=y
 CONFIG_MEDIA_CONTROLLER_DVB=y
@@ -3162,10 +3440,13 @@ CONFIG_MEDIA_CONTROLLER=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 # CONFIG_MEDIA_PCI_SUPPORT is not set
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_SUPPORT_FILTER=y
 CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_TEST_SUPPORT is not set
 CONFIG_MEDIA_TUNER_E4000=m
 CONFIG_MEDIA_TUNER_FC0011=m
 CONFIG_MEDIA_TUNER_FC0012=m
@@ -3205,7 +3486,7 @@ CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
-CONFIG_MELLANOX_PLATFORM=y
+# CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_MEMBARRIER=y
 CONFIG_MEMCG_KMEM=y
 # CONFIG_MEMCG_SWAP_ENABLED is not set
@@ -3220,6 +3501,7 @@ CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY is not set
 CONFIG_MEMORY_ISOLATION=y
 # CONFIG_MEMORY_NOTIFIER_ERROR_INJECT is not set
+CONFIG_MEMREGION=y
 # CONFIG_MEMSTICK_DEBUG is not set
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK=m
@@ -3228,9 +3510,10 @@ CONFIG_MEMSTICK_REALTEK_PCI=m
 CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-# CONFIG_MEMTEST is not set
+CONFIG_MEMTEST=y
 # CONFIG_MEN_A21_WDT is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_MEXCAVATOR is not set
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
@@ -3247,7 +3530,11 @@ CONFIG_MFD_CORE=m
 CONFIG_MFD_INTEL_LPSS_ACPI=m
 CONFIG_MFD_INTEL_LPSS=m
 CONFIG_MFD_INTEL_LPSS_PCI=m
+# CONFIG_MFD_INTEL_M10_BMC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
+CONFIG_MFD_INTEL_PMT=m
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
+# CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_LM3533 is not set
@@ -3259,6 +3546,8 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
 # CONFIG_MFD_MENF21BMC is not set
+# CONFIG_MFD_MP2629 is not set
+# CONFIG_MFD_MT6360 is not set
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_RDC321X is not set
@@ -3281,6 +3570,11 @@ CONFIG_MFD_VX855=m
 CONFIG_MFD_WL1273_CORE=m
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_WM8994 is not set
+# CONFIG_MGOLDMONT is not set
+# CONFIG_MGOLDMONTPLUS is not set
+# CONFIG_MHASWELL is not set
+# CONFIG_MHI_BUS is not set
+# CONFIG_MICELAKE is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@@ -3296,7 +3590,11 @@ CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MISC_RTSX=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
+# CONFIG_MIVYBRIDGE is not set
+# CONFIG_MJAGUAR is not set
+# CONFIG_MK10 is not set
 # CONFIG_MK8 is not set
+# CONFIG_MK8SSE3 is not set
 CONFIG_MKISS=m
 CONFIG_MLX4_CORE_GEN2=y
 CONFIG_MLX4_CORE=m
@@ -3304,6 +3602,7 @@ CONFIG_MLX4_DEBUG=y
 CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_CLS_ACT=y
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_IPOIB=y
@@ -3312,8 +3611,10 @@ CONFIG_MLX5_EN_ARFS=y
 CONFIG_MLX5_EN_RXNFC=y
 CONFIG_MLX5_ESWITCH=y
 # CONFIG_MLX5_FPGA is not set
+# CONFIG_MLX5_IPSEC is not set
 CONFIG_MLX5_MPFS=y
 CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_TC_CT=y
 # CONFIG_MLX5_TLS is not set
 CONFIG_MLX90614=m
 CONFIG_MLX90632=m
@@ -3345,6 +3646,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_HSQ is not set
 CONFIG_MMC=m
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
@@ -3369,13 +3671,17 @@ CONFIG_MMC_VUB300=m
 CONFIG_MMC_WBSD=m
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_MMIOTRACE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_MMU=y
+# CONFIG_MNATIVE is not set
+# CONFIG_MNEHALEM is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULE_FORCE_LOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODULE_SIG_ALL=y
 # CONFIG_MODULE_SIG_FORCE is not set
 CONFIG_MODULE_SIG_FORMAT=y
@@ -3419,6 +3725,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
+# CONFIG_MPILEDRIVER is not set
 CONFIG_MPILIB=y
 CONFIG_MPL115_I2C=m
 CONFIG_MPL115=m
@@ -3427,6 +3734,8 @@ CONFIG_MPL115=m
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS=y
+CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MPU3050=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -3434,15 +3743,23 @@ CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_MRP=m
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
+# CONFIG_MSANDYBRIDGE is not set
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_LAPTOP=m
+# CONFIG_MSILVERMONT is not set
 CONFIG_MSI_WMI=m
+# CONFIG_MSKYLAKE is not set
+# CONFIG_MSKYLAKEX is not set
 CONFIG_MSPRO_BLOCK=m
+# CONFIG_MSTEAMROLLER is not set
 CONFIG_MT7601U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615_COMMON=m
 CONFIG_MT7615E=m
+# CONFIG_MT7663S is not set
+# CONFIG_MT7663U is not set
 CONFIG_MT76_CORE=m
 CONFIG_MT76_LEDS=y
 CONFIG_MT76_USB=m
@@ -3454,6 +3771,7 @@ CONFIG_MT76x0U=m
 CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
+# CONFIG_MT7915E is not set
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLOCK2MTD=m
@@ -3475,12 +3793,14 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MCHP23K256 is not set
 # CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_NAND_ARASAN is not set
 CONFIG_MTD_NAND_CORE=m
 # CONFIG_MTD_NAND_DENALI_PCI is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 CONFIG_MTD_NAND_ECC_SW_HAMMING=m
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC=y
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_MXIC is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
@@ -3492,6 +3812,7 @@ CONFIG_MTD_NAND_ECC_SW_HAMMING=m
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -3508,23 +3829,31 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
+# CONFIG_MTIGERLAKE is not set
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR=y
+CONFIG_MULTIPLEXER=m
 CONFIG_MULTIUSER=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
+# CONFIG_MUX_ADG792A is not set
+# CONFIG_MUX_ADGS1408 is not set
+# CONFIG_MUX_GPIO is not set
 CONFIG_MVMDIO=m
 CONFIG_MWAVE=m
+# CONFIG_MWESTMERE is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_USB=m
 CONFIG_MWL8K=m
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
 CONFIG_MXM_WMI=m
 CONFIG_MYRI10GE=m
+# CONFIG_MZEN2 is not set
+# CONFIG_MZEN is not set
 CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
@@ -3545,6 +3874,7 @@ CONFIG_NET_ACT_CSUM=m
 CONFIG_NET_ACT_CTINFO=m
 CONFIG_NET_ACT_CT=m
 CONFIG_NET_ACT_GACT=m
+# CONFIG_NET_ACT_GATE is not set
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_MIRRED=m
@@ -3580,7 +3910,9 @@ CONFIG_NET_DEVLINK=y
 CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_DROP_MONITOR=y
+# CONFIG_NET_DSA_AR9331 is not set
 CONFIG_NET_DSA_BCM_SF2=m
+# CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK is not set
 # CONFIG_NET_DSA_LANTIQ_GSWIP is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
@@ -3601,18 +3933,25 @@ CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
 CONFIG_NET_DSA_TAG_8021Q=m
+# CONFIG_NET_DSA_TAG_AR9331 is not set
 CONFIG_NET_DSA_TAG_BRCM_COMMON=m
 CONFIG_NET_DSA_TAG_BRCM=m
 CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
 CONFIG_NET_DSA_TAG_DSA=m
 CONFIG_NET_DSA_TAG_EDSA=m
 CONFIG_NET_DSA_TAG_GSWIP=m
+# CONFIG_NET_DSA_TAG_HELLCREEK is not set
 CONFIG_NET_DSA_TAG_KSZ=m
 CONFIG_NET_DSA_TAG_LAN9303=m
 CONFIG_NET_DSA_TAG_MTK=m
+# CONFIG_NET_DSA_TAG_OCELOT is not set
 CONFIG_NET_DSA_TAG_QCA=m
+# CONFIG_NET_DSA_TAG_RTL4_A is not set
 CONFIG_NET_DSA_TAG_SJA1105=m
 CONFIG_NET_DSA_TAG_TRAILER=m
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
 CONFIG_NET_EGRESS=y
 CONFIG_NET_EMATCH_CANID=m
 CONFIG_NET_EMATCH_CMP=m
@@ -3743,6 +4082,7 @@ CONFIG_NET_PKTGEN=m
 CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_NETPOLL=y
 CONFIG_NET_PTP_CLASSIFY=y
+CONFIG_NET_REDIRECT=y
 CONFIG_NETROM=m
 CONFIG_NET_RX_BUSY_POLL=y
 # CONFIG_NET_SB1000 is not set
@@ -3757,9 +4097,11 @@ CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_ETF=m
+# CONFIG_NET_SCH_ETS is not set
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
+# CONFIG_NET_SCH_FQ_PIE is not set
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
@@ -3900,6 +4242,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NFC_PN532_UART is not set
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@@ -3908,6 +4251,7 @@ CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_PORT100=m
 # CONFIG_NFC_S3FWRN5_I2C is not set
+# CONFIG_NFC_S3FWRN82_UART is not set
 CONFIG_NFC_SHDLC=y
 CONFIG_NFC_SIM=m
 CONFIG_NFC_ST21NFCA_I2C=m
@@ -3959,12 +4303,14 @@ CONFIG_NFS_COMMON=y
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFS_DEBUG=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_V4_2_INTER_SSC=y
 CONFIG_NFSD_V4_SECURITY_LABEL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFS_FSCACHE=y
@@ -3980,6 +4326,7 @@ CONFIG_NFS_V3=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NFS_V4_1=y
+# CONFIG_NFS_V4_2_READ_PLUS is not set
 CONFIG_NFS_V4_2=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_V4_SECURITY_LABEL=y
@@ -4025,6 +4372,7 @@ CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_NETDEV=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
@@ -4035,6 +4383,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
 CONFIG_NIC7018_WDT=m
 CONFIG_NILFS2_FS=m
+# CONFIG_NITRO_ENCLAVES is not set
 CONFIG_NIU=m
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLATTR=y
@@ -4100,6 +4449,7 @@ CONFIG_NOTIFIER_ERROR_INJECTION=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOZOMI=m
 CONFIG_NS83820=m
@@ -4107,9 +4457,11 @@ CONFIG_NS83820=m
 CONFIG_NTFS_FS=m
 CONFIG_NTFS_RW=y
 CONFIG_NULL_TTY=m
+CONFIG_NUMA_KEEP_MEMINFO=y
 CONFIG_NVME_CORE=m
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_FC=m
+CONFIG_NVME_HWMON=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
@@ -4118,6 +4470,7 @@ CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_PASSTHRU=y
 CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_TCP=m
 CONFIG_NVME_TCP=m
@@ -4169,6 +4522,7 @@ CONFIG_PAGE_COUNTER=y
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
 CONFIG_PAGE_POOL=y
+CONFIG_PAGE_REPORTING=y
 CONFIG_PANASONIC_LAPTOP=m
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
 # CONFIG_PANEL is not set
@@ -4232,6 +4586,7 @@ CONFIG_PATA_SCH=m
 CONFIG_PATA_SERVERWORKS=m
 CONFIG_PATA_SIL680=m
 CONFIG_PATA_SIS=m
+CONFIG_PATA_TIMINGS=y
 CONFIG_PATA_TOSHIBA=m
 CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_VIA=m
@@ -4256,6 +4611,7 @@ CONFIG_PCIEASPM=y
 CONFIG_PCIE_DPC=y
 # CONFIG_PCIE_DW_PLAT_HOST is not set
 CONFIG_PCIE_ECRC=y
+# CONFIG_PCIE_EDR is not set
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_PCIE_PME=y
@@ -4294,6 +4650,7 @@ CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCNET32=m
 CONFIG_PCSPKR_PLATFORM=y
+CONFIG_PCS_XPCS=m
 CONFIG_PD6729=m
 # CONFIG_PDA_POWER is not set
 CONFIG_PDC_ADMA=m
@@ -4310,6 +4667,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHANTOM is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
+# CONFIG_PHY_INTEL_LGM_EMMC is not set
 CONFIG_PHYLIB=m
 CONFIG_PHYLINK=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@@ -4320,28 +4678,38 @@ CONFIG_PHYLINK=m
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 CONFIG_PINCONF=y
+# CONFIG_PINCTRL_ALDERLAKE is not set
 CONFIG_PINCTRL_AMD=m
-CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_BAYTRAIL=m
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CANNONLAKE=m
 CONFIG_PINCTRL_CEDARFORK=m
-CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_CHERRYVIEW=m
 CONFIG_PINCTRL_DENVERTON=m
+# CONFIG_PINCTRL_ELKHARTLAKE is not set
+# CONFIG_PINCTRL_EMMITSBURG is not set
 CONFIG_PINCTRL_GEMINILAKE=m
 CONFIG_PINCTRL_ICELAKE=m
 CONFIG_PINCTRL_INTEL=m
+# CONFIG_PINCTRL_JASPERLAKE is not set
+# CONFIG_PINCTRL_LAKEFIELD is not set
 CONFIG_PINCTRL_LEWISBURG=m
+# CONFIG_PINCTRL_LYNXPOINT is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_TIGERLAKE=m
 CONFIG_PINCTRL=y
+# CONFIG_PING is not set
 CONFIG_PINMUX=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
 CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_PLDMFW=y
 # CONFIG_PLIP is not set
 CONFIG_PLUGIN_HOSTCC="g++"
+# CONFIG_PLX_DMA is not set
 CONFIG_PLX_HERMES=m
-CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
 CONFIG_PMC_ATOM=y
@@ -4359,7 +4727,7 @@ CONFIG_PM_SLEEP_DEBUG=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_TRACE_RTC=y
 CONFIG_PM_TRACE=y
 # CONFIG_PM_WAKELOCKS is not set
@@ -4370,6 +4738,7 @@ CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_PNPACPI=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 CONFIG_PNP=y
+CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_TIMERS=y
@@ -4405,7 +4774,9 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PRESTERA is not set
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
 CONFIG_PRINTK_NMI=y
@@ -4417,6 +4788,7 @@ CONFIG_PRINTK=y
 # CONFIG_PRISM54 is not set
 CONFIG_PROBE_EVENTS=y
 CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_CPU_RESCTRL=y
 CONFIG_PROC_EVENTS=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
@@ -4424,6 +4796,7 @@ CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_PID_ARCH_STATUS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_THERMAL_MMIO_RAPL=m
 CONFIG_PROC_VMCORE_DEVICE_DUMP=y
 CONFIG_PROC_VMCORE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -4435,9 +4808,14 @@ CONFIG_PSI_DEFAULT_DISABLED=y
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 CONFIG_PSTORE_COMPRESS_DEFAULT="lzo"
 CONFIG_PSTORE_COMPRESS=y
 # CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 # CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
 # CONFIG_PSTORE_FTRACE is not set
@@ -4450,13 +4828,23 @@ CONFIG_PSTORE_LZO_COMPRESS=m
 # CONFIG_PSTORE_PMSG is not set
 CONFIG_PSTORE_RAM=m
 CONFIG_PSTORE=y
+CONFIG_PSTORE_ZONE=m
 # CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_ZSTD_COMPRESS=y
+CONFIG_PTDUMP_CORE=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+# CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_OCP is not set
+CONFIG_PTP_1588_CLOCK_VMW=m
 CONFIG_PTP_1588_CLOCK=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
 CONFIG_PVH=y
 CONFIG_PVPANIC=m
+# CONFIG_PWM_DEBUG is not set
+# CONFIG_PWM_DWC is not set
 CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
@@ -4484,6 +4872,7 @@ CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLGE=m
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
+# CONFIG_QRTR is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_QTNFMAC=m
 CONFIG_QTNFMAC_PCIE=m
@@ -4533,6 +4922,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_EXPERT is not set
 CONFIG_RCU_NEED_SEGCBLIST=y
 # CONFIG_RCU_PERF_TEST is not set
+# CONFIG_RCU_REF_SCALE_TEST is not set
+# CONFIG_RCU_SCALE_TEST is not set
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_TORTURE_TEST=m
 # CONFIG_RCU_TRACE is not set
@@ -4549,6 +4940,7 @@ CONFIG_RDS=m
 CONFIG_RDS_RDMA=m
 CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
+CONFIG_RD_ZSTD=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_REALTEK_AUTOPM=y
@@ -4560,6 +4952,8 @@ CONFIG_REED_SOLOMON=m
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_MMIO=m
+CONFIG_REGMAP_SOUNDWIRE=m
 CONFIG_REGMAP_SPI=m
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PG86X is not set
@@ -4580,15 +4974,21 @@ CONFIG_REGMAP=y
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77826 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MP8859 is not set
 # CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_PCA9450 is not set
 # CONFIG_REGULATOR_PFUZE100 is not set
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 # CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+# CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RTMV20 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
@@ -4607,9 +5007,10 @@ CONFIG_REISERFS_FS_XATTR=y
 CONFIG_REISERFS_PROC_INFO=y
 CONFIG_RELAY=y
 CONFIG_RELOCATABLE=y
-CONFIG_REMOTEPROC=y
+# CONFIG_REMOTEPROC is not set
 # CONFIG_RENESAS_PHY is not set
 CONFIG_RESET_ATTACK_MITIGATION=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
@@ -4623,6 +5024,7 @@ CONFIG_RFS_ACCEL=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
 CONFIG_RING_BUFFER=y
 CONFIG_RMI4_2D_SENSOR=y
 CONFIG_RMI4_CORE=m
@@ -4632,6 +5034,7 @@ CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
 CONFIG_RMI4_F34=y
+# CONFIG_RMI4_F3A is not set
 # CONFIG_RMI4_F54 is not set
 CONFIG_RMI4_F55=y
 CONFIG_RMI4_I2C=m
@@ -4748,6 +5151,7 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_RV3028=m
 CONFIG_RTC_DRV_RV3029C2=m
 CONFIG_RTC_DRV_RV3029_HWMON=y
+# CONFIG_RTC_DRV_RV3032 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
 CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
@@ -4769,7 +5173,7 @@ CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RTC_MC146818_LIB=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
@@ -4803,8 +5207,12 @@ CONFIG_RTLWIFI_PCI=m
 CONFIG_RTLWIFI_USB=m
 CONFIG_RT_MUTEXES=y
 # CONFIG_RTS5208 is not set
-CONFIG_RTW88_8822BE=y
-CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_8723DE is not set
+# CONFIG_RTW88_8821CE is not set
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8822C=m
 CONFIG_RTW88_CORE=m
 # CONFIG_RTW88_DEBUGFS is not set
 # CONFIG_RTW88_DEBUG is not set
@@ -4821,6 +5229,7 @@ CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
 # CONFIG_SATA_DWC is not set
+CONFIG_SATA_HOST=y
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MOBILE_LPM_POLICY=3
 CONFIG_SATA_MV=m
@@ -4844,6 +5253,8 @@ CONFIG_SBP_TARGET=m
 # CONFIG_SC1200_WDT is not set
 CONFIG_SC92031=m
 # CONFIG_SCA3000 is not set
+# CONFIG_SCD30_CORE is not set
+# CONFIG_SCF_TORTURE_TEST is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_HRTICK=y
@@ -4957,6 +5368,7 @@ CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
 CONFIG_SDIO_UART=m
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
 CONFIG_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
 CONFIG_SECONDARY_TRUSTED_KEYRING=y
@@ -4977,6 +5389,8 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
 CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
@@ -4998,6 +5412,8 @@ CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
+# CONFIG_SENSORS_ADM1177 is not set
+# CONFIG_SENSORS_ADM1266 is not set
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ADS7828=m
@@ -5010,6 +5426,7 @@ CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_ADT7X10=m
 CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_AMD_ENERGY=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_SENSORS_APPLESMC=m
 # CONFIG_SENSORS_AS370 is not set
@@ -5018,10 +5435,15 @@ CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_ASPEED=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+# CONFIG_SENSORS_BEL_PFE is not set
 CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_CORETEMP=m
+# CONFIG_SENSORS_CORSAIR_CPRO is not set
+CONFIG_SENSORS_CORSAIR_PSU=m
 CONFIG_SENSORS_DELL_SMM=m
 CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_DRIVETEMP=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_EMC1403=m
@@ -5082,9 +5504,12 @@ CONFIG_SENSORS_LM95234=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_LTC2945=m
+# CONFIG_SENSORS_LTC2947_I2C is not set
+# CONFIG_SENSORS_LTC2947_SPI is not set
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
 CONFIG_SENSORS_LTC2990=m
+# CONFIG_SENSORS_LTC2992 is not set
 CONFIG_SENSORS_LTC3815=m
 CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
@@ -5093,13 +5518,17 @@ CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4260=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_MAX1111=m
+# CONFIG_SENSORS_MAX127 is not set
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+# CONFIG_SENSORS_MAX16601 is not set
 CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX197=m
+# CONFIG_SENSORS_MAX20730 is not set
 CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31730 is not set
 # CONFIG_SENSORS_MAX31785 is not set
 CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_MAX34440=m
@@ -5111,6 +5540,8 @@ CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_MLXREG_FAN=m
+# CONFIG_SENSORS_MP2975 is not set
+# CONFIG_SENSORS_MR75203 is not set
 CONFIG_SENSORS_NCT6683=m
 CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
@@ -5120,12 +5551,15 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
+# CONFIG_SENSORS_PM6764TR is not set
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_POWR1220=m
 # CONFIG_SENSORS_PXE1610 is not set
+# CONFIG_SENSORS_Q54SJ108A2 is not set
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_SPI=m
+# CONFIG_SENSORS_SBTSI is not set
 CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_SCH56XX_COMMON=m
@@ -5147,6 +5581,7 @@ CONFIG_SENSORS_TMP103=m
 CONFIG_SENSORS_TMP108=m
 CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TMP421=m
+# CONFIG_SENSORS_TMP513 is not set
 CONFIG_SENSORS_TPS40422=m
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_TSL2550=m
@@ -5168,7 +5603,9 @@ CONFIG_SENSORS_W83793=m
 CONFIG_SENSORS_W83795=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
+# CONFIG_SENSORS_XDPE122 is not set
 CONFIG_SENSORS_ZL6100=m
+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
@@ -5194,6 +5631,7 @@ CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_ALTERA_UART is not set
 CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
+# CONFIG_SERIAL_BCM63XX is not set
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_DEV_BUS=y
@@ -5204,6 +5642,7 @@ CONFIG_SERIAL_EARLYCON=y
 # CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_JSM=m
 # CONFIG_SERIAL_KGDB_NMI is not set
+# CONFIG_SERIAL_LANTIQ is not set
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
 CONFIG_SERIAL_MCTRL_GPIO=y
@@ -5211,6 +5650,7 @@ CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SPRD is not set
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_ARC_PS2=m
@@ -5226,6 +5666,7 @@ CONFIG_SERIO_SERPORT=y
 CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
+# CONFIG_SF_PDMA is not set
 CONFIG_SFP=m
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SGI_PARTITION=y
@@ -5275,7 +5716,7 @@ CONFIG_SMSC911X=m
 CONFIG_SMSC9420=m
 CONFIG_SMSC_PHY=m
 CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMS_SDIO_DRV=m
+# CONFIG_SMS_SDIO_DRV is not set
 # CONFIG_SMS_SIANO_DEBUGFS is not set
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
@@ -5298,6 +5739,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
 CONFIG_SND_BCD2000=m
+# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
@@ -5311,7 +5753,7 @@ CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
 CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
-CONFIG_SND_DESIGNWARE_I2S=m
+# CONFIG_SND_DESIGNWARE_I2S is not set
 CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
@@ -5356,12 +5798,14 @@ CONFIG_SND_HDA_COMPONENT=y
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_INPUT_BEEP_MODE=0
 CONFIG_SND_HDA_INPUT_BEEP=y
 # CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
+# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA=m
 CONFIG_SND_HDA_PATCH_LOADER=y
@@ -5382,6 +5826,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_INTEL_DSP_CONFIG=m
 CONFIG_SND_INTEL_NHLT=m
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK_INPUT_DEV=y
@@ -5443,13 +5888,18 @@ CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_AC97_CODEC=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_ACPI=m
+# CONFIG_SND_SOC_ADAU1372_I2C is not set
+# CONFIG_SND_SOC_ADAU1372_SPI is not set
 # CONFIG_SND_SOC_ADAU1701 is not set
 CONFIG_SND_SOC_ADAU1761_I2C=m
 CONFIG_SND_SOC_ADAU1761=m
 CONFIG_SND_SOC_ADAU1761_SPI=m
 CONFIG_SND_SOC_ADAU17X1=m
 CONFIG_SND_SOC_ADAU7002=m
+# CONFIG_SND_SOC_ADAU7118_HW is not set
+# CONFIG_SND_SOC_ADAU7118_I2C is not set
 CONFIG_SND_SOC_ADAU_UTILS=m
+# CONFIG_SND_SOC_ADI is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4118 is not set
 # CONFIG_SND_SOC_AK4458 is not set
@@ -5463,6 +5913,8 @@ CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_RENOIR=m
+CONFIG_SND_SOC_AMD_RENOIR_MACH=m
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_COMPRESS=y
@@ -5471,6 +5923,7 @@ CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
+# CONFIG_SND_SOC_CS4234 is not set
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -5502,6 +5955,7 @@ CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_FSL_SAI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_XCVR is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
 CONFIG_SND_SOC_HDAC_HDA=m
@@ -5511,16 +5965,19 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 CONFIG_SND_SOC_INTEL_APL=m
-CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
-CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
+# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
+# CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
 CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+# CONFIG_SND_SOC_INTEL_CATPT is not set
 CONFIG_SND_SOC_INTEL_CFL=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
@@ -5531,6 +5988,8 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_CML_LP=m
 CONFIG_SND_SOC_INTEL_CNL=m
 CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
+# CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH is not set
+# CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH is not set
 CONFIG_SND_SOC_INTEL_GLK=m
 # CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC_INTEL_HASWELL=m
@@ -5549,20 +6008,31 @@ CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
-# CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+# CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
+# CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
+# CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+# CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
+# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
 CONFIG_SND_SOC_INTEL_SST_ACPI=m
 CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
 CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98373_I2C=m
 CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_SDW=m
+CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
@@ -5570,7 +6040,9 @@ CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_MT6351 is not set
 # CONFIG_SND_SOC_MT6358 is not set
+# CONFIG_SND_SOC_MT6660 is not set
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
+# CONFIG_SND_SOC_NAU8315 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
@@ -5589,11 +6061,15 @@ CONFIG_SND_SOC_PCM3060=m
 CONFIG_SND_SOC_PCM3060_SPI=m
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM5102A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RK3328 is not set
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RL6347A=m
+CONFIG_SND_SOC_RT1011=m
+CONFIG_SND_SOC_RT1015=m
+CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT286=m
 CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT5514=m
@@ -5608,17 +6084,30 @@ CONFIG_SND_SOC_RT5663=m
 CONFIG_SND_SOC_RT5670=m
 CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682_I2C=m
 CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_RT5682_SDW=m
+CONFIG_SND_SOC_RT700=m
+CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711=m
+CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIGMADSP=m
 CONFIG_SND_SOC_SIGMADSP_REGMAP=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+# CONFIG_SND_SOC_SIMPLE_MUX is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_ALDERLAKE=m
+CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_APOLLOLAKE=m
 CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
-# CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT is not set
-# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
 CONFIG_SND_SOC_SOF_CANNONLAKE=m
 CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_COFFEELAKE=m
@@ -5627,7 +6116,10 @@ CONFIG_SND_SOC_SOF_COMETLAKE_H=m
 CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT=y
 CONFIG_SND_SOC_SOF_COMETLAKE_LP=m
 CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y
+CONFIG_SND_SOC_SOF_COMETLAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE_SUPPORT=y
 # CONFIG_SND_SOC_SOF_DEBUG is not set
+# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
 CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
 CONFIG_SND_SOC_SOF_ELKHARTLAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_GEMINILAKE=m
@@ -5645,7 +6137,12 @@ CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
 CONFIG_SND_SOC_SOF_INTEL_COMMON=m
 CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
 CONFIG_SND_SOC_SOF_INTEL_PCI=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK=y
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_JASPERLAKE=m
+CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF=m
 CONFIG_SND_SOC_SOF_MERRIFIELD=m
 CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
@@ -5667,12 +6164,16 @@ CONFIG_SND_SOC_SSM4567=m
 # CONFIG_SND_SOC_STA350 is not set
 # CONFIG_SND_SOC_STI_SAS is not set
 # CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS2562 is not set
+# CONFIG_SND_SOC_TAS2764 is not set
+# CONFIG_SND_SOC_TAS2770 is not set
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
 # CONFIG_SND_SOC_TAS5720 is not set
 CONFIG_SND_SOC_TAS6424=m
 CONFIG_SND_SOC_TDA7419=m
 # CONFIG_SND_SOC_TFA9879 is not set
+# CONFIG_SND_SOC_TLV320ADCX140 is not set
 # CONFIG_SND_SOC_TLV320AIC23_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
 # CONFIG_SND_SOC_TLV320AIC31XX is not set
@@ -5709,16 +6210,18 @@ CONFIG_SND_SOC_WM8524=m
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_WSA881X is not set
 # CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
 # CONFIG_SND_SOC_XILINX_I2S is not set
 # CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
+# CONFIG_SND_SOC_ZL38060 is not set
 # CONFIG_SND_SOC_ZX_AUD96P22 is not set
 CONFIG_SND_SONICVIBES=m
 # CONFIG_SND_SPI is not set
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+# CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
 CONFIG_SND_SST_IPC_ACPI=m
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_PCI=m
@@ -5751,6 +6254,7 @@ CONFIG_SND_VMASTER=y
 CONFIG_SND_VX222=m
 CONFIG_SND_VX_LIB=m
 CONFIG_SND_X86=y
+CONFIG_SND_XEN_FRONTEND=m
 CONFIG_SND_YMFPCI=m
 CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_SOCK_VALIDATE_XMIT=y
@@ -5765,25 +6269,31 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUNDWIRE_CADENCE=m
+CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 CONFIG_SOUNDWIRE_INTEL=m
-CONFIG_SOUNDWIRE=y
+CONFIG_SOUNDWIRE=m
+CONFIG_SOUNDWIRE_QCOM=m
 CONFIG_SP5100_TCO=m
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 # CONFIG_SPEAKUP is not set
 # CONFIG_SPI_ALTERA is not set
+CONFIG_SPI_AMD=m
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DYNAMIC=y
 # CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LANTIQ_SSC is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_MEM is not set
+CONFIG_SPI_MUX=m
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_NXP_FLEXSPI is not set
 # CONFIG_SPI_OC_TINY is not set
@@ -5844,6 +6354,7 @@ CONFIG_STACKTRACE=y
 CONFIG_STAGING_MEDIA=y
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
+# CONFIG_STATIC_CALL_SELFTEST is not set
 # CONFIG_STATIC_KEYS_SELFTEST is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_STE10XP=m
@@ -5878,7 +6389,10 @@ CONFIG_SUNRPC=m
 CONFIG_SUNRPC_SWAP=y
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_SURFACE_3_BUTTON=m
+# CONFIG_SURFACE_3_POWER_OPREGION is not set
 CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_GPE is not set
+CONFIG_SURFACE_PLATFORMS=y
 CONFIG_SURFACE_PRO3_BUTTON=m
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
@@ -5886,18 +6400,23 @@ CONFIG_SWAP=y
 CONFIG_SWIOTLB=y
 CONFIG_SWPHY=y
 # CONFIG_SW_SYNC is not set
+# CONFIG_SX9310 is not set
 # CONFIG_SX9500 is not set
+CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SYNCLINK_CS is not set
 CONFIG_SYNCLINK_GT=m
 CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m
 CONFIG_SYN_COOKIES=y
+# CONFIG_SYNTH_EVENT_GEN_TEST is not set
+CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_SYSFS=y
+CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
@@ -5921,8 +6440,11 @@ CONFIG_TAP=m
 CONFIG_TARGET_CORE=m
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
+CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKSTATS=y
+CONFIG_TASKS_TRACE_RCU=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_CRB=y
@@ -5932,6 +6454,7 @@ CONFIG_TCG_TIS_CORE=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
+# CONFIG_TCG_TIS_SPI_CR50 is not set
 CONFIG_TCG_TIS_SPI=m
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
@@ -5965,24 +6488,31 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
+# CONFIG_TEE is not set
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BITOPS is not set
 # CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_FPU is not set
+# CONFIG_TEST_FREE_PAGES is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_LKM is not set
+# CONFIG_TEST_LOCKUP is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_MIN_HEAP is not set
 # CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_PARMAN is not set
@@ -6012,10 +6542,11 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 # CONFIG_THERMAL_EMULATION is not set
 CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_NETLINK is not set
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL=y
@@ -6047,14 +6578,17 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_NS=y
 CONFIG_TIMERFD=y
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9225 is not set
 # CONFIG_TINYDRM_ILI9341 is not set
+# CONFIG_TINYDRM_ILI9486 is not set
 # CONFIG_TINYDRM_MI0283QT is not set
 # CONFIG_TINYDRM_REPAPER is not set
 # CONFIG_TINYDRM_ST7586 is not set
 # CONFIG_TINYDRM_ST7735R is not set
+CONFIG_TIPC_CRYPTO=y
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
@@ -6064,9 +6598,11 @@ CONFIG_TIPC_MEDIA_UDP=y
 CONFIG_TLAN=m
 CONFIG_TLS_DEVICE=y
 CONFIG_TLS=m
+# CONFIG_TLS_TOE is not set
 # CONFIG_TMD_HERMES is not set
 # CONFIG_TMP006 is not set
 # CONFIG_TMP007 is not set
+CONFIG_TMPFS_INODE64=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_TMPFS=y
@@ -6083,6 +6619,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
 # CONFIG_TOUCHSCREEN_BU21029 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMA140 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
@@ -6155,6 +6692,7 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=m
 # CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
+# CONFIG_TOUCHSCREEN_ZINITIX is not set
 # CONFIG_TPL0102 is not set
 CONFIG_TPM_KEY_PARSER=m
 # CONFIG_TPS6105X is not set
@@ -6163,6 +6701,8 @@ CONFIG_TPM_KEY_PARSER=m
 CONFIG_TQMX86_WDT=m
 CONFIG_TRACE_CLOCK=y
 CONFIG_TRACE_EVAL_MAP_FILE=y
+# CONFIG_TRACE_EVENT_INJECT is not set
+CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 CONFIG_TRACEPOINTS=y
@@ -6195,15 +6735,19 @@ CONFIG_TUN=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
+# CONFIG_TYPEC_HD3SS3220 is not set
 CONFIG_TYPEC=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 CONFIG_TYPEC_NVIDIA_ALTMODE=m
 # CONFIG_TYPEC_RT1711H is not set
+# CONFIG_TYPEC_STUSB160X is not set
 CONFIG_TYPEC_TCPCI=m
+# CONFIG_TYPEC_TCPCI_MAXIM is not set
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TPS6598X=m
 CONFIG_TYPEC_UCSI=m
 CONFIG_TYPHOON=m
+# CONFIG_UACCE is not set
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_AUTHENTICATION=y
@@ -6218,7 +6762,7 @@ CONFIG_UBSAN_ALIGNMENT=y
 # CONFIG_UCB1400_CORE is not set
 CONFIG_UCLAMP_BUCKETS_COUNT=5
 # CONFIG_UCLAMP_TASK_GROUP is not set
-CONFIG_UCLAMP_TASK=y
+# CONFIG_UCLAMP_TASK is not set
 CONFIG_UCS2_STRING=y
 CONFIG_UCSI_ACPI=m
 CONFIG_UCSI_CCG=m
@@ -6256,6 +6800,7 @@ CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UPROBE_EVENTS=y
 CONFIG_UPROBES=y
 # CONFIG_US5182D is not set
+# CONFIG_USB4 is not set
 CONFIG_USB_ACM=m
 CONFIG_USB_ADUTUX=m
 CONFIG_USB_ALI_M5632=y
@@ -6283,9 +6828,9 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_EHCI_PCI=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
@@ -6293,6 +6838,7 @@ CONFIG_USB_EMI26=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_EZUSB_FX2=m
+# CONFIG_USB_FEW_INIT_RETRIES is not set
 # CONFIG_USB_FOTG210_HCD is not set
 CONFIG_USB_FTDI_ELAN=m
 # CONFIG_USB_GADGET is not set
@@ -6377,6 +6923,7 @@ CONFIG_USB_LD=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
+# CONFIG_USB_LGM_PHY is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
 CONFIG_USB_M5602=m
 # CONFIG_USB_MA901 is not set
@@ -6420,6 +6967,7 @@ CONFIG_USB_OHCI_HCD_PCI=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 CONFIG_USB_PCI=y
@@ -6427,15 +6975,18 @@ CONFIG_USBPCWATCHDOG=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_PHY=y
 CONFIG_USB_PRINTER=m
+CONFIG_USB_PULSE8_CEC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_PWC=m
 # CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 CONFIG_USB_ROLES_INTEL_XHCI=m
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
+# CONFIG_USB_RTL8153_ECM is not set
 CONFIG_USB_S2255=m
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
@@ -6539,6 +7090,7 @@ CONFIG_USB_WDM=m
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=m
 CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
 CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
@@ -6548,10 +7100,12 @@ CONFIG_USB_ZR364XX=m
 # CONFIG_USELIB is not set
 CONFIG_USERFAULTFD=y
 # CONFIG_USERIO is not set
+CONFIG_USERMODE_DRIVER=y
 CONFIG_USER_NS=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_UTS_NS=y
+# CONFIG_UV_SYSFS is not set
 CONFIG_UWB_HWA=m
 CONFIG_UWB_I1480U=m
 CONFIG_UWB=m
@@ -6562,8 +7116,12 @@ CONFIG_V4L2_FWNODE=m
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 CONFIG_VBOXGUEST=m
+CONFIG_VBOXSF_FS=m
+# CONFIG_VCNL3020 is not set
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
+# CONFIG_VDPA is not set
+# CONFIG_VEML6030 is not set
 # CONFIG_VEML6070 is not set
 CONFIG_VETH=m
 CONFIG_VFAT_FS=m
@@ -6587,7 +7145,9 @@ CONFIG_VGA_CONSOLE=y
 CONFIG_VGASTATE=m
 CONFIG_VGA_SWITCHEROO=y
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_VSOCK=m
@@ -6595,7 +7155,10 @@ CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_VELOCITY=m
 CONFIG_VIA_WDT=m
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_ADP1653 is not set
 # CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_AK7375 is not set
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_RC=y
 CONFIG_VIDEO_AU0828_V4L2=y
@@ -6605,6 +7168,7 @@ CONFIG_VIDEOBUF2_V4L2=m
 CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_VMALLOC=m
+# CONFIG_VIDEO_CCS is not set
 CONFIG_VIDEO_CPIA2=m
 CONFIG_VIDEO_CS53L32A=m
 CONFIG_VIDEO_CX231XX_ALSA=m
@@ -6614,27 +7178,78 @@ CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_CX25840=m
 CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9768 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_RC=m
 CONFIG_VIDEO_EM28XX_V4L2=m
+# CONFIG_VIDEO_ET8EK8 is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_GO7007_LOADER=m
 CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_HDPVR=m
+# CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX219 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX290 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 # CONFIG_VIDEO_IPU3_IMGU is not set
 CONFIG_VIDEO_IR_I2C=m
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# CONFIG_VIDEO_M5MOLS is not set
 CONFIG_VIDEO_MSP3400=m
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_OV02A10 is not set
+# CONFIG_VIDEO_OV13858 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV2740 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5675 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV7251 is not set
 CONFIG_VIDEO_OV7640=m
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_OV772X is not set
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV9734 is not set
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
+# CONFIG_VIDEO_RDACM20 is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K6AA is not set
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_SONY_BTF_MPX=m
+# CONFIG_VIDEO_SR030PC30 is not set
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 CONFIG_VIDEO_TM6000_ALSA=m
@@ -6652,7 +7267,9 @@ CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_VS6624 is not set
 CONFIG_VIDEO_WM8775=m
+# CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
 CONFIG_VIRT_DRIVERS=y
 # CONFIG_VIRTIO_BLK is not set
@@ -6672,6 +7289,7 @@ CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_VMAP_PFN=y
 # CONFIG_VME_BUS is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VMWARE_BALLOON=m
@@ -6681,6 +7299,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_VMXNET3=m
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VSOCKETS=m
 CONFIG_VSOCKMON=m
 # CONFIG_VT6655 is not set
@@ -6709,6 +7328,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
 # CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_WCN36XX=m
 CONFIG_WDAT_WDT=m
@@ -6717,6 +7337,7 @@ CONFIG_WEXT_CORE=y
 CONFIG_WEXT_PRIV=y
 CONFIG_WEXT_PROC=y
 CONFIG_WEXT_SPY=y
+# CONFIG_WFX is not set
 CONFIG_WIL6210_DEBUGFS=y
 CONFIG_WIL6210_ISR_COR=y
 CONFIG_WIL6210=m
@@ -6726,6 +7347,7 @@ CONFIG_WIL6210=m
 CONFIG_WILINK_PLATFORM_DATA=y
 # CONFIG_WIMAX is not set
 CONFIG_WINBOND_840=m
+# CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_WIREGUARD=m
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS=y
@@ -6749,6 +7371,7 @@ CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_WLAN_VENDOR_REALTEK=y
@@ -6774,6 +7397,7 @@ CONFIG_X86_AMD_PLATFORM_DEVICE=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_CMOV=y
 CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CPA_STATISTICS=y
 CONFIG_X86_CPUID=m
 CONFIG_X86_CPU_RESCTRL=y
 CONFIG_X86_DEBUGCTLMSR=y
@@ -6791,6 +7415,7 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y
 CONFIG_X86_INTEL_UMIP=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_IO_APIC=y
+CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_MCE_AMD=y
@@ -6813,24 +7438,33 @@ CONFIG_X86_PTDUMP_CORE=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_RESERVE_LOW=64
+CONFIG_X86_SGX=y
 CONFIG_X86_SMAP=y
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_LIB=m
 # CONFIG_X86_SYSFB is not set
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_X86_TSC=y
+CONFIG_X86_UMIP=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_X86_VMX_FEATURE_NAMES=y
 CONFIG_X86=y
 CONFIG_XARRAY_MULTI=y
 CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_UNPOPULATED_ALLOC=y
+CONFIG_XFRM_AH=m
 CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_ESP=m
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_IPCOMP=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
+# CONFIG_XFRM_USER_COMPAT is not set
 CONFIG_XFRM_USER=y
 CONFIG_XFRM=y
 # CONFIG_XFS_DEBUG is not set
@@ -6839,7 +7473,8 @@ CONFIG_XFS_FS=m
 CONFIG_XFS_ONLINE_SCRUB=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_QUOTA=y
-# CONFIG_XFS_RT is not set
+CONFIG_XFS_RT=y
+CONFIG_XFS_SUPPORT_V4=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XIAOMI_WMI is not set
 # CONFIG_XILINX_AXI_EMAC is not set
@@ -6850,6 +7485,7 @@ CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_XILINX_XADC is not set
+# CONFIG_XILINX_ZYNQMP_DPDMA is not set
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XOR_BLOCKS=m
@@ -6882,15 +7518,35 @@ CONFIG_ZISOFS=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA=y
+CONFIG_ZONEFS_FS=m
 CONFIG_ZOPT2201=m
 # CONFIG_ZPA2326 is not set
 CONFIG_ZPOOL=y
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
 CONFIG_ZRAM=m
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-# CONFIG_ZRAM_WRITEBACK is not set
+CONFIG_ZRAM_MEMORY_TRACKING=y
+CONFIG_ZRAM_WRITEBACK=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+# CONFIG_ZSWAP_DEFAULT_ON is not set
 CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
 # CONFIG_ZX_TDM is not set

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

[Thomas Deutschmann]

commit:     282b201cc46bb00c4a840cc7780084bf38b36cbb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 23:48:38 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 23:48:38 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=282b201c

defaults/modules_load: Add netconsole

This will ensure that netconsole will be available in initramfs.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 6f021ac..1cc1478 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -16,7 +16,7 @@ MODULES_WAITSCAN="scsi_wait_scan"
 MODULES_BLOCK="sdhci_acpi sdhci_pci"
 
 # Hardware (Network)
-MODULES_NET="8139cp 8139too atl1c atlantic bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e ena hv_netvsc ionic igb ixgb ixgbe macvlan pcnet32 r8169 realtek samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve"
+MODULES_NET="8139cp 8139too atl1c atlantic bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000 e1000e ena hv_netvsc ionic igb ixgb ixgbe macvlan pcnet32 r8169 realtek samsung-sxgbe sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan gve netconsole"
 
 # iSCSI support
 MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"

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

[Thomas Deutschmann]

commit:     3f1a037b36a3df7ba5acb3b91f925df06dbd61da
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  8 00:35:19 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar  8 00:36:13 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3f1a037b

initrd.scripts: Add trim() function

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 10 ++++++++++
 defaults/unlock-luks.sh |  1 +
 2 files changed, 11 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f7e6c3d..d005e0d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1103,6 +1103,15 @@ test_success() {
 	fi
 }
 
+trim() {
+	local var="$*"
+
+	var="${var#"${var%%[![:space:]]*}"}"  # remove leading whitespace characters
+	var="${var%"${var##*[![:space:]]}"}"  # remove trailing whitespace characters
+
+	printf "%s" "${var}"
+}
+
 log_msg() {
 	is_log_enabled || return
 
@@ -1779,6 +1788,7 @@ openLUKS() {
 	eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
 	eval local LUKS_KEYDEV_FSTYPE='"${CRYPT_'${TYPE}'_KEYDEV_FSTYPE}"'
 	eval local cryptsetup_options='"${CRYPT_'${TYPE}'_OPTIONS}"'
+	cryptsetup_options="$(trim "${cryptsetup_options}")"
 	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
 	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
 	local mntkey="/mnt/key/" crypt_filter_ret=

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 4c99a1f..9ef54e0 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -47,6 +47,7 @@ main() {
 	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"'
 	eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEYFILE}"'
 	eval local cryptsetup_options='"${CRYPT_'${TYPE}'_OPTIONS}"'
+	cryptsetup_options="$(trim "${cryptsetup_options}")"
 	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
 
 	if [ -z "${LUKS_DEVICE}" ]

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

[Thomas Deutschmann]

commit:     c26b9d493c8530bbfd69e0148ce72a959d7c5321
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 16:56:29 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:33:20 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c26b9d49

initrd.scripts: bootstrapFS(): Create /dev/tty0

If we create ttyS0, we should also create tty0.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d005e0d..b64a2c4 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -314,6 +314,7 @@ bootstrapFS() {
 	[ ! -e "${NEW_ROOT}/dev/null" ]    && run mknod -m 666 "${NEW_ROOT}"/dev/null c 1 3
 	[ ! -e "${NEW_ROOT}/dev/zero" ]    && run mknod -m 666 "${NEW_ROOT}"/dev/zero c 1 5
 	[ ! -e "${NEW_ROOT}/dev/console" ] && run mknod -m 600 "${NEW_ROOT}"/dev/console c 5 1
+	[ ! -e "${NEW_ROOT}/dev/tty0" ]    && run mknod -m 620 "${NEW_ROOT}"/dev/tty0 c 4 0
 	[ ! -e "${NEW_ROOT}/dev/ttyS0" ]   && run mknod -m 660 "${NEW_ROOT}"/dev/ttyS0 c 4 64
 
 	# For SGI LiveCDs

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

[Thomas Deutschmann]

commit:     b2f55a479ffbb07dc0abc36660f6cc12bc63eda6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 18:35:19 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:33:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b2f55a47

linuxrc: Determine active console

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults |  1 -
 defaults/initrd.scripts  | 15 +++++++++++++++
 defaults/linuxrc         |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 7ee78e9..c9e956a 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -56,7 +56,6 @@ ROOT_LINKS='bin sbin lib lib32 lib64 boot usr opt emul'
 ROOT_TREES='etc root home var'
 
 REAL_ROOT=''
-CONSOLE='/dev/console'
 NEW_ROOT='/newroot'
 no_umounts='/newroot|/mnt/aufs-dev|/mnt/aufs-rw-branch|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino'
 ROOTDELAY=5

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c133282..505ca02 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2722,6 +2722,21 @@ setup_unionfs() {
 	fi
 }
 
+get_active_console() {
+	local active_console=console
+
+	while [ -f /sys/class/tty/${active_console}/active ]
+	do
+		active_console=$(cat /sys/class/tty/${active_console}/active)
+
+		# last console will be the active one,
+		# see https://www.kernel.org/doc/html/latest/admin-guide/serial-console.html
+		active_console=${active_console##* }
+	done
+
+	echo ${active_console}
+}
+
 get_mounts_list() {
 	awk '
 		/^[[:blank:]]*#/ { next }

diff --git a/defaults/linuxrc b/defaults/linuxrc
index f20d606..37a8dfa 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -21,6 +21,7 @@
 [ ! -e /dev/zero ]     && mknod /dev/zero c 1 5
 
 # Take control
+CONSOLE="/dev/$(get_active_console)"
 exec 0<>${CONSOLE} 1<>${CONSOLE} 2<>${CONSOLE}
 
 if [ "$$" != '1' ]

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

[Thomas Deutschmann]

commit:     20993333687bbcc00e5ca3b6e11f2eb1e01e085e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 15:56:34 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:34:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=20993333

linuxrc: Rename rundebugshell() -> run_debug_shell()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index da15db7..3be18b5 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -821,7 +821,7 @@ setup_overlayfs() {
 	local workdir="${overlay}/.work"
 	local static=/mnt/livecd
 
-	rundebugshell overlayfs
+	run_debug_shell overlayfs
 	for i in "${overlay}" "${static}"
 	do
 		[ ! -d "${i}" ] && run mkdir -p "${i}"
@@ -1001,6 +1001,16 @@ run() {
 	return ${retval}
 }
 
+run_debug_shell() {
+	is_debug || return
+
+	good_msg 'Starting debug shell as requested by "debug" option.'
+	good_msg "Run '${BOLD}gksosreport${NORMAL}' to generate debug report"
+	good_msg "in case you want to file a bug report."
+	good_msg "Stopping by: ${1}"
+	run_shell
+}
+
 run_emergency_shell() {
 	echo
 	gksosreport
@@ -2516,20 +2526,6 @@ cdupdate() {
 	fi
 }
 
-rundebugshell() {
-	if is_debug
-	then
-		good_msg 'Starting debug shell as requested by "debug" option.'
-		good_msg "Run '${BOLD}gksosreport${NORMAL}' to generate debug report"
-		good_msg "in case you want to file a bug report."
-	else
-		return 0
-	fi
-
-	good_msg "Stopping by: ${1}"
-	run_shell
-}
-
 do_resume() {
 	local device=$(find_real_device "${REAL_RESUME}")
 	if [ -z "${device}" ]

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 7888130..8356aea 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -572,7 +572,7 @@ else
 fi
 
 # Run debug shell if requested
-rundebugshell "before starting udevd"
+run_debug_shell "before starting udevd"
 
 # Initialize udev
 if [ ! -f "/etc/udev/hwdb.bin" ]
@@ -670,7 +670,7 @@ run mkdir -p "${NEW_ROOT}"
 CHROOT="${NEW_ROOT}"
 
 # Run debug shell if requested
-rundebugshell "before setting up the root filesystem"
+run_debug_shell "before setting up the root filesystem"
 
 if [ "${CDROOT}" = '1' ]
 then
@@ -1331,7 +1331,7 @@ then
 fi
 
 # Run debug shell if requested
-rundebugshell "before entering switch_root"
+run_debug_shell "before switch_root"
 
 if [ "${GK_PRESERVE_RUN}" = '0' ]
 then

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

[Thomas Deutschmann]

commit:     8544f0b7a0b574fc982d971347b7b2b06dd91a09
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 17:10:45 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:33:40 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8544f0b7

initrd.scripts: run_shell(): Reformat exec code

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b64a2c4..c133282 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1035,7 +1035,7 @@ run_shell() {
 		&& [ -c "${CONSOLE}" ]
 	then
 		log_msg "Opening rescue shell on ${CONSOLE} ..."
-		setsid ${SH} -c "exec sh --login <${CONSOLE} >${CONSOLE} 2>&1"
+		setsid ${SH} -c "exec sh --login 0<>${CONSOLE} 1<>${CONSOLE} 2<>${CONSOLE}"
 	elif command -v cttyhack 1>/dev/null 2>&1
 	then
 		log_msg "Opening rescue shell using cttyhack ..."
@@ -1043,7 +1043,7 @@ run_shell() {
 	elif [ -c '/dev/tty1' ]
 	then
 		log_msg "Opening rescue shell on /dev/tty1 fallback ..."
-		setsid ${SH} -c 'exec sh --login </dev/tty1 >/dev/tty1 2>&1'
+		setsid ${SH} -c "exec sh --login 0<>/dev/tty1 1<>/dev/tty1 2<>/dev/tty1"
 	else
 		log_msg "Opening rescue shell (last resort) ..."
 		${SH} --login
@@ -1055,7 +1055,7 @@ run_shell() {
 
 	# We maybe have called exec and dettached from main script; We
 	# must restore control...
-	exec >${CONSOLE} <${CONSOLE} 2>&1
+	exec 0<>${CONSOLE} 1<>${CONSOLE} 2<>${CONSOLE}
 }
 
 fs_type_in_use() {

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

[Thomas Deutschmann]

commit:     d61b95fa199284170990948b3f0e51e32a213262
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 15:58:17 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:34:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d61b95fa

initrd.scripts: Add is_userinteraction_allowed() function

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 3be18b5..53cb633 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -648,6 +648,15 @@ is_true() {
 	return 1
 }
 
+is_userinteraction_allowed() {
+	if [ -f "${GK_USERINTERACTION_DISABLED_STATEFILE}" ]
+	then
+		return 1
+	fi
+
+	return 0
+}
+
 # Function to create an ext2 fs on $aufs_dev, $aufs_dev_mnt mountpoint
 create_changefs() {
 	local size
@@ -1012,15 +1021,19 @@ run_debug_shell() {
 }
 
 run_emergency_shell() {
-	echo
-	gksosreport
-	good_msg 'You might want to save "/run/initramfs/gksosreport.txt" to a USB stick or /boot'
-	good_msg 'after mounting them and attach it to a bug report.'
+	if is_userinteraction_allowed
+	then
+		echo
+		gksosreport
+		good_msg 'You might want to save "/run/initramfs/gksosreport.txt" to a USB stick or /boot'
+		good_msg 'after mounting them and attach it to a bug report.'
+	fi
+
 	run_shell
 }
 
 run_shell() {
-	if [ -f "${GK_USERINTERACTION_DISABLED_STATEFILE}" ]
+	if ! is_userinteraction_allowed
 	then
 		bad_msg "gk.userinteraction.disabled is set; Spawning a shell is disabled!"
 		return

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

[Thomas Deutschmann]

commit:     f492e244b60324fac15d7a8f6e74b4a022bdd3bd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 18:55:21 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:33:57 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f492e244

initrd.scripts: setup_keymap(): Skip keymap loading for serial consoles

Bug: https://bugs.gentoo.org/222699
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 505ca02..55fe73f 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1417,6 +1417,13 @@ cmdline_hwopts() {
 }
 
 setup_keymap() {
+	local console=$(get_active_console)
+	if echo "${console}" | grep -qF 'ttyS'
+	then
+		warn_msg "Active console is ${console}; Skipping dokeymap ..."
+		return
+	fi
+
 	if [ "${DO_keymap}" ]
 	then
 		if [ ! -e /dev/vc/0 -a ! -e /dev/tty0 ]

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

[Thomas Deutschmann]

commit:     bf26667ac4a906601eda8ce72cdd7058556bf387
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 17:08:40 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:33:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bf26667a

linuxrc: Reformat exec code

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 1c051bc..f20d606 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -21,7 +21,7 @@
 [ ! -e /dev/zero ]     && mknod /dev/zero c 1 5
 
 # Take control
-exec >${CONSOLE} <${CONSOLE} 2>&1
+exec 0<>${CONSOLE} 1<>${CONSOLE} 2<>${CONSOLE}
 
 if [ "$$" != '1' ]
 then
@@ -462,7 +462,7 @@ then
 	[ ! -c "${NEW_CONSOLE}" ] && NEW_CONSOLE="/dev/${NEW_CONSOLE}"
 	if [ -c "${NEW_CONSOLE}" ]
 	then
-		exec >${NEW_CONSOLE} <${NEW_CONSOLE} 2>&1
+		exec 0<>${NEW_CONSOLE} 1<>${NEW_CONSOLE} 2<>${NEW_CONSOLE}
 		good_msg "Console switched from '${CONSOLE}' to '${NEW_CONSOLE}'!"
 		CONSOLE="${NEW_CONSOLE}"
 	else

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

[Thomas Deutschmann]

commit:     6f2867c2bcc027cfe088804dfeb5d3a6b3866a3e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 19:09:48 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:34:02 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6f2867c2

linuxrc: Skip loading embedded boot font for serial consoles

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index acb246c..7888130 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -453,7 +453,13 @@ good_msg "${gk_ver} (${gk_build_date}). Linux kernel ${kernel_ver}"
 
 if [ "${GK_BOOTFONT_DISABLED}" = '0' -a -e /lib/console/font ]
 then
-	hash setfont >/dev/null 2>&1 && run setfont /lib/console/font -C ${CONSOLE} 2>&1
+	if echo "$(get_active_console)" | grep -qF ttyS
+	then
+		warn_msg "Active console is ${console}; Not loading embedded boot font ..."
+	elif hash setfont >/dev/null 2>&1
+	then
+		run setfont /lib/console/font -C ${CONSOLE} 2>&1
+	fi
 fi
 
 quiet_kmsg

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

[Thomas Deutschmann]

commit:     c81285f02aaad8bd8161d06976147e9c1aca7a8a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 19:30:53 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:39:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c81285f0

initrd.scripts: run_shell(): Exit early when /dev is gone

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 53cb633..ff956b0 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1072,6 +1072,10 @@ run_shell() {
 		${SH} --login
 	fi
 
+	# Leave function early when /dev/null does not exist anymore,
+	# i.e. after failed switch_root call
+	[ ! -e /dev/null ] && return
+
 	rm "${GK_SHELL_LOCKFILE}"
 
 	echo

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

[Thomas Deutschmann]

commit:     90d2a28d3d589ba6eb1c1c54b2d12715be1e2673
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 16:58:53 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:33:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=90d2a28d

linuxrc: Don't delete /linuxrc

It's not clear why this was ever added via commit c4e37560598d4dc59ef3619084f3822df71e8aef.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 222dd35..1c051bc 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -57,11 +57,6 @@ gk_ver="$(cat /etc/build_id)"
 gk_build_date="$(cat /etc/build_date)"
 kernel_ver="$(uname -r)"
 
-if [ "$0" = '/init' ]
-then
-	[ -e /linuxrc ] && run rm /linuxrc
-fi
-
 CMDLINE=$(cat /proc/cmdline)
 # Scan CMDLINE for any specified real_root= or cdroot arguments
 FAKE_ROOT=''

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

[Thomas Deutschmann]

commit:     f2bff3217a493b661dcde5dc1dea2f187106ca1a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 15:49:27 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:34:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f2bff321

initrd.scripts: modules_scan(): Rename GK_ROOTFS_DETECTED_STATEFILE -> GK_ROOT_DEV_DETECTED_STATEFILE

GK_ROOT_DEV_DETECTED_STATEFILE is the more precise name.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index c9e956a..b4e1e1d 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -89,7 +89,7 @@ GK_NET_TIMEOUT_INTERFACE=10
 GK_PRESERVE_RUN=1
 GK_PROMPT_FILE='/tmp/current_prompt'
 GK_PROMPT_TIMEOUT=0
-GK_ROOTFS_DETECTED_STATEFILE="/tmp/rootfs.detected"
+GK_ROOT_DEV_DETECTED_STATEFILE="/tmp/root_dev.detected"
 GK_SHELL_LOCKFILE='/tmp/rescueshell.lock'
 GK_SSHD_LOCKFILE='/tmp/remote-rescueshell.lock'
 GK_SSHD_PIDFILE='/var/run/dropbear.pid'

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 55fe73f..da15db7 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -99,16 +99,16 @@ modules_scan() {
 		then
 			if [ "${smart_loading}" = "yes" ]
 			then
-				if [ ! -f "${GK_ROOTFS_DETECTED_STATEFILE}" ]
+				if [ ! -f "${GK_ROOT_DEV_DETECTED_STATEFILE}" ]
 				then
 					_root_dev=$(findfs "${REAL_ROOT}" 2>/dev/null)
 					if [ $? -eq 0 ] && [ -n "${_root_dev}" ] && [ -b "${_root_dev}" ]
 					then
-						echo "${_root_dev}" > "${GK_ROOTFS_DETECTED_STATEFILE}"
+						echo "${_root_dev}" > "${GK_ROOT_DEV_DETECTED_STATEFILE}"
 					fi
 				fi
 
-				if [ -f "${GK_ROOTFS_DETECTED_STATEFILE}" ]
+				if [ -f "${GK_ROOT_DEV_DETECTED_STATEFILE}" ]
 				then
 					log_msg "${root_dev_found}"
 					printf "%b" "${root_dev_found}"

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

[Thomas Deutschmann]

commit:     ccdfc66e1dd25a361ac8d445225394b581eec729
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 19:07:20 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 00:12:35 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ccdfc66e

linuxrc: Fix QUIET mode

This commit will ensure that we really don't output anything
when running in QUIET mode -- only errors will be shown.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2bf736f..ea66d9b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -419,7 +419,7 @@ cache_cd_contents() {
 			run cp -a ${CDROOT_PATH}/${LOOP} ${NEW_ROOT}/mnt/${LOOP}
 			if [ $? -ne 0 ]
 			then
-				warn_msg "Failed to cache the loop file! Lack of RAM?"
+				warn_msg "Failed to cache the loop file! Lack of RAM?" 0
 				run rm -rf ${NEW_ROOT}/mnt/${LOOP} 2>/dev/null
 				run rm -rf ${NEW_ROOT}/mnt/livecd.* 2>/dev/null
 				run rm -rf ${NEW_ROOT}/mnt/image.* 2>/dev/null
@@ -1013,10 +1013,10 @@ run() {
 run_debug_shell() {
 	is_debug || return
 
-	good_msg 'Starting debug shell as requested by "debug" option.'
-	good_msg "Run '${BOLD}gksosreport${NORMAL}' to generate debug report"
-	good_msg "in case you want to file a bug report."
-	good_msg "Stopping by: ${1}"
+	good_msg 'Starting debug shell as requested by "debug" option.' 0
+	good_msg "Run '${BOLD}gksosreport${NORMAL}' to generate debug report" 0
+	good_msg "in case you want to file a bug report." 0
+	good_msg "Stopping by: ${1}" 0
 	run_shell
 }
 
@@ -1025,8 +1025,8 @@ run_emergency_shell() {
 	then
 		echo
 		gksosreport
-		good_msg 'You might want to save "/run/initramfs/gksosreport.txt" to a USB stick or /boot'
-		good_msg 'after mounting them and attach it to a bug report.'
+		good_msg 'You might want to save "/run/initramfs/gksosreport.txt" to a USB stick or /boot' 0
+		good_msg 'after mounting them and attach it to a bug report.' 0
 	fi
 
 	run_shell
@@ -1046,8 +1046,8 @@ run_shell() {
 	export PS1='rescueshell \w \# '
 
 	echo
-	GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}${gk_ver}${NORMAL} (${gk_build_date}) ${BOLD}rescue shell${NORMAL}!"
-	GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel ${BOLD}${kernel_ver}${NORMAL}"
+	GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}${gk_ver}${NORMAL} (${gk_build_date}) ${BOLD}rescue shell${NORMAL}!" 0
+	GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel ${BOLD}${kernel_ver}${NORMAL}" 0
 	echo
 
 	# Avoid /dev/{console,tty0} due to "can't access tty; job control turned off" problem;
@@ -1168,25 +1168,21 @@ log_msg() {
 # $2 hide flag
 
 good_msg() {
-	[ -n "${QUIET}" ] && ! is_debug && return 0
-
 	local msg_string=${1}
 	msg_string="${msg_string:-...}"
 
 	log_msg "[OK] ${msg_string}"
 
-	[ "$2" != '1' ] && printf "%b\n" "${GOOD}>>${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
+	[ "${2-${QUIET}}" != '1' ] && printf "%b\n" "${GOOD}>>${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
 }
 
 good_msg_n() {
-	[ -n "${QUIET}" ] && ! is_debug && return 0
-
 	local msg_string=${1}
 	msg_string="${msg_string:-...}"
 
 	log_msg "[OK] ${msg_string}"
 
-	[ "$2" != '1' ] && printf "%b" "${GOOD}>>${NORMAL}${BOLD} ${msg_string}"
+	[ "${2-${QUIET}}" != '1' ] && printf "%b" "${GOOD}>>${NORMAL}${BOLD} ${msg_string}"
 }
 
 bad_msg() {
@@ -1195,11 +1191,8 @@ bad_msg() {
 
 	log_msg "[!!] ${msg_string}"
 
-	if [ "$2" != '1' ]
-	then
-		splash 'verbose' >/dev/null &
-		printf "%b\n" "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
-	fi
+	splash 'verbose' >/dev/null &
+	printf "%b\n" "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
 }
 
 warn_msg() {
@@ -1208,7 +1201,7 @@ warn_msg() {
 
 	log_msg "[**] ${msg_string}"
 
-	[ "$2" != '1' ] && printf "%b\n" "${WARN}**${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
+	[ "${2-${QUIET}}" != '1' ] && printf "%b\n" "${WARN}**${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
 }
 
 warn_msg_n() {
@@ -1217,7 +1210,7 @@ warn_msg_n() {
 
 	log_msg "[**] ${msg_string}"
 
-	[ "$2" != '1' ] && printf "%b" "${WARN}**${NORMAL}${BOLD} ${msg_string}"
+	[ "${2-${QUIET}}" != '1' ] && printf "%b" "${WARN}**${NORMAL}${BOLD} ${msg_string}"
 }
 
 write_env_file() {
@@ -1325,8 +1318,8 @@ prompt_user() {
 
 		if [ -f "${GK_SSHD_LOCKFILE}" ]
 		then
-			warn_msg "The lockfile at '${GK_SSHD_LOCKFILE}' exists."
-			warn_msg "The boot process will be paused until the lock is removed."
+			warn_msg "The lockfile at '${GK_SSHD_LOCKFILE}' exists." 0
+			warn_msg "The boot process will be paused until the lock is removed." 0
 			while true
 			do
 				if [ -f "${GK_SSHD_LOCKFILE}" ]
@@ -1341,7 +1334,7 @@ prompt_user() {
 		local timeout=${GK_PROMPT_TIMEOUT}
 		[ ${timeout} -eq 0 ] && timeout=10
 
-		warn_msg_n "System will automatically reboot in ${timeout} seconds ..."
+		warn_msg_n "System will automatically reboot in ${timeout} seconds ..." 0
 		while [ ${timeout} -gt 0 ]
 		do
 			let timeout=${timeout}-1
@@ -1377,7 +1370,7 @@ prompt_user() {
 
 			if [ -f "${GK_PROMPT_FILE}" ]
 			then
-				warn_msg "Timeout! Trying to read answer from '${GK_PROMPT_FILE}' ..."
+				warn_msg "Timeout! Trying to read answer from '${GK_PROMPT_FILE}' ..." 0
 				. "${GK_PROMPT_FILE}" && run rm "${GK_PROMPT_FILE}"
 			fi
 		fi
@@ -1386,11 +1379,11 @@ prompt_user() {
 	case $(eval echo '$'${1}) in
 		'q')
 			eval ${1}'='${oldvalue}
-			warn_msg "Skipping step, this will likely cause a boot failure."
+			warn_msg "Skipping step, this will likely cause a boot failure." 0
 			;;
 		'shell')
 			eval ${1}'='${oldvalue}
-			warn_msg "To leave and try again just press <Ctrl>+D"
+			warn_msg "To leave and try again just press <Ctrl>+D" 0
 			run_emergency_shell
 			;;
 		'')
@@ -1631,6 +1624,7 @@ start_volumes() {
 
 				local lvm_cmd="run lvm vgscan 2>&1"
 				is_log_enabled && lvm_cmd="${lvm_cmd} | tee -a '${GK_INIT_LOG}'"
+				[ -n "${QUIET}" ] && lvm_cmd="${lvm_cmd} 1>/dev/null"
 
 				eval "${lvm_cmd}"
 				if [ $? -ne 0 ]
@@ -1646,6 +1640,7 @@ start_volumes() {
 			# To activate volumegroups on all devices in the cache
 			local lvm_cmd="run lvm vgchange -ay --sysinit 2>&1"
 			is_log_enabled && lvm_cmd="${lvm_cmd} | tee -a '${GK_INIT_LOG}'"
+			[ -n "${QUIET}" ] && lvm_cmd="${lvm_cmd} 1>/dev/null"
 
 			eval "${lvm_cmd}"
 			if [ $? -ne 0 ]
@@ -1667,6 +1662,7 @@ start_volumes() {
 
 			local zfs_cmd="run /sbin/zpool import -N -a ${ZPOOL_CACHE} ${ZPOOL_FORCE} 2>&1"
 			is_log_enabled && zfs_cmd="${zfs_cmd} | tee -a '${GK_INIT_LOG}'"
+			[ -n "${QUIET}" ] && zfs_cmd="${zfs_cmd} 1>/dev/null"
 
 			eval "${zfs_cmd}"
 			if [ $? -ne 0 ]
@@ -1684,6 +1680,7 @@ start_volumes() {
 
 					local zfs_cmd="run /sbin/zpool export -f '${ZFS_POOL}' 2>&1"
 					is_log_enabled && zfs_cmd="${zfs_cmd} | tee -a '${GK_INIT_LOG}'"
+					[ -n "${QUIET}" ] && zfs_cmd="${zfs_cmd} 1>/dev/null"
 
 					eval "${zfs_cmd}"
 					if [ $? -ne 0 ]
@@ -1695,6 +1692,7 @@ start_volumes() {
 
 					zfs_cmd="run /sbin/zpool import -N ${ZPOOL_CACHE} ${ZPOOL_FORCE} '${ZFS_POOL}' 2>&1"
 					is_log_enabled && zfs_cmd="${zfs_cmd} | tee -a '${GK_INIT_LOG}'"
+					[ -n "${QUIET}" ] && zfs_cmd="${zfs_cmd} 1>/dev/null"
 
 					eval "${zfs_cmd}"
 					if [ $? -ne 0 ]
@@ -1707,6 +1705,7 @@ start_volumes() {
 
 				local zfs_cmd="run /sbin/zpool import -N ${ZPOOL_CACHE} ${ZPOOL_FORCE} '${ZFS_POOL}' 2>&1"
 				is_log_enabled && zfs_cmd="${zfs_cmd} | tee -a '${GK_INIT_LOG}'"
+				[ -n "${QUIET}" ] && zfs_cmd="${zfs_cmd} 1>/dev/null"
 
 				eval "${zfs_cmd}"
 				if [ $? -ne 0 ]
@@ -1729,6 +1728,7 @@ start_iscsi() {
 
 		iscsi_cmd="run iscsistart -b 2>&1"
 		is_log_enabled && iscsi_cmd="${iscsi_cmd} | tee -a '${GK_INIT_LOG}'"
+		[ -n "${QUIET}" ] && iscsi_cmd="${iscsi_cmd} 1>/dev/null"
 
 		eval "${iscsi_cmd}"
 		if [ $? -ne 0 ]
@@ -1782,6 +1782,7 @@ start_iscsi() {
 
 		iscsi_cmd="run iscsistart -i '${ISCSI_INITIATORNAME}' -t '${ISCSI_TARGET}' -a '${ISCSI_ADDRESS}' ${ADDITIONAL} 2>&1"
 		is_log_enabled && iscsi_cmd="${iscsi_cmd} | tee -a '${GK_INIT_LOG}'"
+		[ -n "${QUIET}" ] && iscsi_cmd="${iscsi_cmd} 1>/dev/null"
 
 		eval "${iscsi_cmd}"
 		if [ $? -ne 0 ]
@@ -2140,12 +2141,12 @@ start_network() {
 			let interface_timeout_100msec_modulo=${interface_time_waited}%10
 			if [ ${interface_timeout_100msec_modulo} = 0 ]
 			then
-				printf "."
+				[ -z "${QUIET}" ] && printf "."
 			fi
 		fi
 	done
 
-	echo
+	[ -z "${QUIET}" ] && echo
 
 	if [ "${have_interface}" != '1' ]
 	then
@@ -2179,7 +2180,7 @@ start_network() {
 		local udhcpc_cmd="run udhcpc -i '${GK_NET_IFACE}' -n -t ${GK_NET_DHCP_RETRIES} -T ${GK_NET_TIMEOUT_DHCP} -R -p '${GK_NET_DHCP_PIDFILE}' 2>&1"
 		is_log_enabled && udhcpc_cmd="${udhcpc_cmd} | tee -a '${GK_INIT_LOG}'"
 
-		good_msg "Bringing up interface ${GK_NET_IFACE} using dhcp ..." ${QUIET}
+		good_msg "Bringing up interface ${GK_NET_IFACE} using dhcp ..."
 		eval "${udhcpc_cmd}"
 		if [ $? -ne 0 ]
 		then
@@ -2213,10 +2214,10 @@ start_network() {
 			kill_network
 		fi
 
-		good_msg "Bringing up interface ${GK_NET_IFACE} ..." ${QUIET}
+		good_msg "Bringing up interface ${GK_NET_IFACE} ..."
 		run ip link set "${GK_NET_IFACE}" up
 
-		good_msg "Setting address '${IP}' on ${GK_NET_IFACE} ..." ${QUIET}
+		good_msg "Setting address '${IP}' on ${GK_NET_IFACE} ..."
 		run ip addr add "${IP}" dev "${GK_NET_IFACE}"
 
 		if [ -n "${GK_NET_ROUTES}" ]
@@ -2224,14 +2225,14 @@ start_network() {
 			local route=
 			for route in ${GK_NET_ROUTES}
 			do
-				good_msg "Adding additional route '${route}' on ${GK_NET_IFACE} ..." ${QUIET}
+				good_msg "Adding additional route '${route}' on ${GK_NET_IFACE} ..."
 				run ip route add "${route}" dev "${GK_NET_IFACE}"
 			done
 		fi
 
 		if [ -n "${GK_NET_GW}" ]
 		then
-			good_msg "Adding default route via '${GK_NET_GW}' on ${GK_NET_IFACE} ..." ${QUIET}
+			good_msg "Adding default route via '${GK_NET_GW}' on ${GK_NET_IFACE} ..."
 			run ip route add default via "${GK_NET_GW}" dev "${GK_NET_IFACE}"
 		fi
 	fi
@@ -2261,7 +2262,7 @@ kill_network() {
 	# interface.
 	if ipv6_tentative
 	then
-		[ -z "${QUIET}" ] && good_msg_n "Waiting for tentative IPv6 addresses to complete DAD ..."
+		good_msg_n "Waiting for tentative IPv6 addresses to complete DAD ..."
 
 		local dad_timeout=10
 		while [ ${dad_timeout} -gt 0 ]
@@ -2280,7 +2281,7 @@ kill_network() {
 		fi
 	fi
 
-	[ -z "${QUIET}" ] && good_msg_n "Bringing down interface ${GK_NET_IFACE} ..."
+	good_msg_n "Bringing down interface ${GK_NET_IFACE} ..."
 
 	local deconfiguration_timeout=${GK_NET_TIMEOUT_DECONFIGURATION}
 	while [ ${deconfiguration_timeout} -gt 0 ]
@@ -2369,7 +2370,7 @@ start_sshd() {
 
 	if [ ! -f "${GK_NET_LOCKFILE}" ]
 	then
-		warn_msg "Network not started; Not starting sshd ..."
+		warn_msg "Network not started; Not starting sshd ..." 0
 		return
 	fi
 
@@ -2392,7 +2393,7 @@ start_sshd() {
 
 	run touch /var/log/lastlog
 
-	good_msg "Starting dropbear sshd ..." ${QUIET}
+	good_msg "Starting dropbear sshd ..."
 	run dropbear -p ${GK_SSHD_PORT} -R -P "${GK_SSHD_PIDFILE}" 2>/run/initramfs/dropbear.log
 	if [ $? -eq 0 ]
 	then
@@ -2431,16 +2432,16 @@ wait_sshd() {
 		fi
 		sleep 1
 		: $(( ssh_timeout -= 1 ))
-		printf "."
+		[ -z "${QUIET}" ] && printf "."
 	done
 
-	echo ""
+	[ -z "${QUIET}" ] && echo ""
 }
 
 kill_sshd() {
 	if [ -s "${GK_SSHD_PIDFILE}" ]
 	then
-		good_msg "Stopping dropbear sshd ..." ${QUIET}
+		good_msg "Stopping dropbear sshd ..."
 		run kill $(cat "${GK_SSHD_PIDFILE}")
 	fi
 }
@@ -2450,8 +2451,8 @@ cleanup() {
 	then
 		if [ -f "${GK_SSHD_LOCKFILE}" ]
 		then
-			warn_msg "The lockfile at '${GK_SSHD_LOCKFILE}' exists."
-			warn_msg "The boot process will be paused until the lock is removed."
+			warn_msg "The lockfile at '${GK_SSHD_LOCKFILE}' exists." 0
+			warn_msg "The boot process will be paused until the lock is removed." 0
 			while true
 			do
 				if [ -f "${GK_SSHD_LOCKFILE}" ]
@@ -2492,7 +2493,7 @@ sdelay() {
 		do
 			let SDELAY=${SDELAY}-1
 			sleep 1
-			printf "."
+			[ -z "${QUIET}" ] && printf "."
 		done
 		echo
 	elif [ "${CDROOT}" = '1' ]

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ebed7d8..1861f23 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -969,32 +969,32 @@ do
 			then
 				break
 			else
-				warn_msg "'${init_binary_file}' was not found, is not a file or is not executable, maybe a symlink?" ${QUIET}
+				warn_msg "'${init_binary_file}' was not found, is not a file or is not executable, maybe a symlink?"
 			fi
 
 			if [ -L "${init_binary_file}" ]
 			then
-				good_msg "Symlink detected! Assuming split /usr ..." ${QUIET}
+				good_msg "Symlink detected! Assuming split /usr ..."
 				break
 			else
-				warn_msg "'${init_binary_file}' is not a symlink, do we have at least /bin/sh?" ${QUIET}
+				warn_msg "'${init_binary_file}' is not a symlink, do we have at least /bin/sh?"
 			fi
 
 			if [ -f "${init_binary_fallback_file}" -a -x "${init_binary_fallback_file}" ]
 			then
 				REAL_INIT="${init_binary_fallback_file/${NEW_ROOT}}"
-				good_msg "Executable fallback file '${init_binary_fallback_file}' detected!" ${QUIET}
+				good_msg "Executable fallback file '${init_binary_fallback_file}' detected!"
 				break
 			else
-				warn_msg "'${init_binary_fallback_file}' was not found, is not a file or is not executable, maybe we are working with NFS?" ${QUIET}
+				warn_msg "'${init_binary_fallback_file}' was not found, is not a file or is not executable, maybe we are working with NFS?"
 			fi
 
 			if [ "${REAL_ROOT}" = "/dev/nfs" ]
 			then
-				good_msg "NFS detected!" ${QUIET}
+				good_msg "NFS detected!"
 				break
 			else
-				warn_msg "No NFS detected!" ${QUIET}
+				warn_msg "No NFS detected!"
 			fi
 
 			bad_msg "The filesystem mounted at ${REAL_ROOT} does not appear to be a valid /:"

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

[Thomas Deutschmann]

commit:     abbdac08738be00b7194edd91d5fc922c565c51c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 00:08:48 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 00:12:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=abbdac08

initrd.scripts: setup_keymap(): check console only when dokeymap is set

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index ff956b0..2bf736f 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1444,15 +1444,15 @@ cmdline_hwopts() {
 }
 
 setup_keymap() {
-	local console=$(get_active_console)
-	if echo "${console}" | grep -qF 'ttyS'
-	then
-		warn_msg "Active console is ${console}; Skipping dokeymap ..."
-		return
-	fi
-
 	if [ "${DO_keymap}" ]
 	then
+		local console=$(get_active_console)
+		if echo "${console}" | grep -qF 'ttyS'
+		then
+			warn_msg "Active console is ${console}; Skipping dokeymap ..."
+			return
+		fi
+
 		if [ ! -e /dev/vc/0 -a ! -e /dev/tty0 ]
 		then
 			DEVBIND=1

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

[Thomas Deutschmann]

commit:     d5f7d79bab1563c301e0722ede0d75549297a031
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 19:09:36 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 00:12:35 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d5f7d79b

linuxrc: Refactor handling of console log level

Closes: https://github.com/gentoo/genkernel/pull/24
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults |  1 +
 defaults/initrd.scripts  | 18 ------------------
 defaults/linuxrc         | 18 +++++++++++-------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 18e1382..8849539 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -70,6 +70,7 @@ VERIFY=0
 
 IP='dhcp'
 GK_BOOTFONT_DISABLED=0
+GK_CONSOLE_LOGLEVEL=3
 GK_DEBUGMODE_STATEFILE="/tmp/debug.enabled"
 GK_EMERGENCY_ACTION="halt -f"
 GK_HW_LOAD_ALL_MODULES=0

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index ea66d9b..d68875b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2502,24 +2502,6 @@ sdelay() {
 	fi
 }
 
-quiet_kmsg() {
-	# if QUIET is set make the kernel less chatty
-	if [ -n "${QUIET}" ]
-	then
-		echo '0' > /proc/sys/kernel/printk \
-			&& log_msg "COMMAND: 'echo \"0\" > /proc/sys/kernel/printk'"
-	fi
-}
-
-verbose_kmsg() {
-	# if QUIET is set make the kernel less chatty
-	if [ -n "${QUIET}" ]
-	then
-		echo '6' > /proc/sys/kernel/printk \
-			&& log_msg "COMMAND: 'echo \"6\" > /proc/sys/kernel/printk'"
-	fi
-}
-
 cdupdate() {
 	if [ "${CDROOT}" = '1' ]
 	then

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 1861f23..dc34439 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -42,9 +42,6 @@ then
 	chmod 0750 /run/initramfs
 fi
 
-# Prevent superfluous printks from being printed to the console
-echo 1 > /proc/sys/kernel/printk
-
 if [ ! -s /etc/ld.so.cache ]
 then
 	# Looks like we were unable to run ldconfig during initramfs generation
@@ -54,6 +51,7 @@ fi
 # Set up symlinks
 run busybox --install -s
 
+console_loglevel="$(cut -b1 /proc/sys/kernel/printk 2>/dev/null || echo 7)"
 gk_ver="$(cat /etc/build_id)"
 gk_build_date="$(cat /etc/build_date)"
 kernel_ver="$(uname -r)"
@@ -467,6 +465,9 @@ do
 	esac
 done
 
+# Prevent superfluous printks from being printed to the console
+echo ${GK_CONSOLE_LOGLEVEL} > /proc/sys/kernel/printk
+
 good_msg "${gk_ver} (${gk_build_date}). Linux kernel ${kernel_ver}"
 
 if [ "${GK_BOOTFONT_DISABLED}" = '0' -a -e /lib/console/font ]
@@ -480,8 +481,6 @@ then
 	fi
 fi
 
-quiet_kmsg
-
 if [ "${CDROOT}" = '0' ]
 then
 	if [ -z "${REAL_ROOT}" -a "${FAKE_ROOT}" != "/dev/ram0" ]
@@ -1305,8 +1304,6 @@ then
 	CHROOT="${CHROOT}/${SUBDIR}"
 fi
 
-verbose_kmsg
-
 if [ "${aufs}" = '1' ]
 then
 	aufs_union_memory=${CHROOT}/.unions/memory
@@ -1384,6 +1381,13 @@ do
 	fi
 done
 
+if [[ "${console_loglevel}" != "${GK_CONSOLE_LOGLEVEL}" ]]
+then
+	good_msg "Restoring console log level (${console_loglevel}) ..."
+	echo ${console_loglevel} > /proc/sys/kernel/printk \
+		&& log_msg "COMMAND: 'echo \"${console_loglevel}\" > /proc/sys/kernel/printk'"
+fi
+
 good_msg "Switching to real root: switch_root ${CHROOT} ${init} ${init_opts}"
 exec switch_root "${CHROOT}" "${init}" ${init_opts}
 

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

[Thomas Deutschmann]

commit:     90a6419e5f0982baa1493749f6fb1b3c2fe33e7d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 17:19:35 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 18:19:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=90a6419e

initrd.scripts: is_true(): Optimize for most frequently used value

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 8dcb9e2..ccbc16d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -628,7 +628,10 @@ is_log_enabled() {
 }
 
 is_true() {
-	case "$1" in
+	case "${1}" in
+		1)
+			return 0
+		;;
 		[Tt][Rr][Uu][Ee])
 			return 0
 		;;
@@ -641,10 +644,8 @@ is_true() {
 		[Yy])
 			return 0
 		;;
-		1)
-			return 0
-		;;
 	esac
+
 	return 1
 }
 

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

[Thomas Deutschmann]

commit:     b020169858590fb291003c86c8ddfc4194d9ca19
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 17:13:22 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 16:26:39 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b0201698

linuxrc: Use same $CRYPT_SILENT style

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc         | 2 +-
 defaults/login-remote.sh | 8 ++++----
 defaults/unlock-luks.sh  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index dc34439..2bb4bae 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1045,7 +1045,7 @@ then
 	then
 		CRYPT_ROOT_KEY="$(head -n 1 "${CDROOT_PATH}"/${CDROOT_MARKER})"
 		CRYPT_ROOT='/dev/loop0'
-		good_msg 'You booted an encrypted livecd' "${CRYPT_SILENT}"
+		good_msg 'You booted an encrypted livecd' ${CRYPT_SILENT}
 
 		losetup /dev/loop0 "${CDROOT_PATH}/${LOOPEXT}${LOOP}"
 		test_success 'Preparing loop filesystem'

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 7fcfc70..8eee09a 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -30,11 +30,11 @@ receivefile() {
 			file=${CRYPT_SWAP_KEYFILE}
 			;;
 		'')
-			bad_msg "No keyfile specified." "${CRYPT_SILENT}"
+			bad_msg "No keyfile specified." ${CRYPT_SILENT}
 			exit 1
 			;;
 		*)
-			bad_msg "Unknown '${1}' keyfile received." "${CRYPT_SILENT}"
+			bad_msg "Unknown '${1}' keyfile received." ${CRYPT_SILENT}
 			exit 1
 			;;
 	esac
@@ -67,12 +67,12 @@ then
 					exit 1
 				fi
 			else
-				bad_msg "Keyfile was not properly received!" "${CRYPT_SILENT}"
+				bad_msg "Keyfile was not properly received!" ${CRYPT_SILENT}
 				exit 1
 			fi
 			;;
 		*)
-			bad_msg "Command '${command}' is not supported!" "${CRYPT_SILENT}"
+			bad_msg "Command '${command}' is not supported!" ${CRYPT_SILENT}
 			exit 1
 	esac
 else

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 9ef54e0..2674d93 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -74,7 +74,7 @@ main() {
 
 			if ! run cryptsetup isLuks "${LUKS_DEVICE}"
 			then
-				bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" "${CRYPT_SILENT}"
+				bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" ${CRYPT_SILENT}
 
 				# User has SSH access and is able to call script again or
 				# able to investigate the problem on its own.
@@ -103,10 +103,10 @@ main() {
 				if [ ${crypt_filter_ret} -eq 0 ]
 				then
 					run touch "${OPENED_LOCKFILE}"
-					good_msg "LUKS device ${LUKS_DEVICE} opened" "${CRYPT_SILENT}"
+					good_msg "LUKS device ${LUKS_DEVICE} opened" ${CRYPT_SILENT}
 					break
 				else
-					bad_msg "Failed to open LUKS device ${LUKS_DEVICE}" "${CRYPT_SILENT}"
+					bad_msg "Failed to open LUKS device ${LUKS_DEVICE}" ${CRYPT_SILENT}
 
 					# We need to stop here with a non-zero exit code to prevent
 					# a loop when invalid keyfile was sent.

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

[Thomas Deutschmann]

commit:     28c3b424687a0e68f0ebc9f53105bcf0a5cac1bf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 17:17:43 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 16:26:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=28c3b424

initrd.scripts: is_debug(): Mark local variable as such

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d68875b..8dcb9e2 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -592,7 +592,7 @@ conf_rc_no_umounts() {
 }
 
 is_debug() {
-	is_debug=1
+	local is_debug=1
 
 	if [ -f "${GK_DEBUGMODE_STATEFILE}" ]
 	then

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

[Thomas Deutschmann]

commit:     92e8f61d4e151549b6e66a073461f7d1dc3659f6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 17:23:44 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 18:24:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=92e8f61d

initrd.scripts: Add is_quiet() function

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 65 +++++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index ccbc16d..cbeb6bc 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -85,16 +85,16 @@ modules_scan() {
 	fi
 
 	log_msg "Loading modules of module group '${1}' (smart loading: ${smart_loading}) ..."
-	[ -z "${QUIET}" ] && \
-		printf "%b" "${BOLD}   ::${NORMAL} Loading from ${1}: "
+	is_quiet \
+		|| printf "%b" "${BOLD}   ::${NORMAL} Loading from ${1}: "
 
 	for x in ${MODS}
 	do
 		MLOAD=$(echo ${MLIST} | sed -e "s/.*${x}.*/${x}/")
 		if [ "${MLOAD}" = "${x}" ] # Only module to no-load
 		then
-			[ -z "${QUIET}" ] && \
-				printf "%b\n" "${BOLD}   ::${NORMAL} Skipping ${x} ..."
+			is_quiet \
+				|| printf "%b\n" "${BOLD}   ::${NORMAL} Skipping ${x} ..."
 		elif [ "${MLOAD}" = "${MLIST}" ]
 		then
 			if [ "${smart_loading}" = "yes" ]
@@ -131,14 +131,15 @@ modules_scan() {
 				echo "not loaded"
 
 			! is_debug && [ "${loaded}" = "0" ] && \
-				[ -z "${QUIET}" ] && \
+				! is_quiet && \
 				printf "%b" "${x} "
 		else
-			[ -z "${QUIET}" ] && \
-				printf "%b\n" "${BOLD}   ::${NORMAL} Skipping ${x} ..."
+			is_quiet \
+				|| printf "%b\n" "${BOLD}   ::${NORMAL} Skipping ${x} ..."
 		fi
 	done
-	[ -z "${QUIET}" ] && echo
+
+	is_quiet || echo
 }
 
 uppercase() {
@@ -627,6 +628,12 @@ is_log_enabled() {
 	return 0
 }
 
+is_quiet() {
+	is_true "${QUIET}" && return 0
+
+	return 1
+}
+
 is_true() {
 	case "${1}" in
 		1)
@@ -1174,7 +1181,7 @@ good_msg() {
 
 	log_msg "[OK] ${msg_string}"
 
-	[ "${2-${QUIET}}" != '1' ] && printf "%b\n" "${GOOD}>>${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
+	is_true "${2-${QUIET}}" || printf "%b\n" "${GOOD}>>${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
 }
 
 good_msg_n() {
@@ -1183,7 +1190,7 @@ good_msg_n() {
 
 	log_msg "[OK] ${msg_string}"
 
-	[ "${2-${QUIET}}" != '1' ] && printf "%b" "${GOOD}>>${NORMAL}${BOLD} ${msg_string}"
+	is_true "${2-${QUIET}}" || printf "%b" "${GOOD}>>${NORMAL}${BOLD} ${msg_string}"
 }
 
 bad_msg() {
@@ -1202,7 +1209,7 @@ warn_msg() {
 
 	log_msg "[**] ${msg_string}"
 
-	[ "${2-${QUIET}}" != '1' ] && printf "%b\n" "${WARN}**${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
+	is_true "${2-${QUIET}}" || printf "%b\n" "${WARN}**${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
 }
 
 warn_msg_n() {
@@ -1211,7 +1218,7 @@ warn_msg_n() {
 
 	log_msg "[**] ${msg_string}"
 
-	[ "${2-${QUIET}}" != '1' ] && printf "%b" "${WARN}**${NORMAL}${BOLD} ${msg_string}"
+	is_true "${2-${QUIET}}" || printf "%b" "${WARN}**${NORMAL}${BOLD} ${msg_string}"
 }
 
 write_env_file() {
@@ -1625,7 +1632,7 @@ start_volumes() {
 
 				local lvm_cmd="run lvm vgscan 2>&1"
 				is_log_enabled && lvm_cmd="${lvm_cmd} | tee -a '${GK_INIT_LOG}'"
-				[ -n "${QUIET}" ] && lvm_cmd="${lvm_cmd} 1>/dev/null"
+				is_quiet && lvm_cmd="${lvm_cmd} 1>/dev/null"
 
 				eval "${lvm_cmd}"
 				if [ $? -ne 0 ]
@@ -1641,7 +1648,7 @@ start_volumes() {
 			# To activate volumegroups on all devices in the cache
 			local lvm_cmd="run lvm vgchange -ay --sysinit 2>&1"
 			is_log_enabled && lvm_cmd="${lvm_cmd} | tee -a '${GK_INIT_LOG}'"
-			[ -n "${QUIET}" ] && lvm_cmd="${lvm_cmd} 1>/dev/null"
+			is_quiet && lvm_cmd="${lvm_cmd} 1>/dev/null"
 
 			eval "${lvm_cmd}"
 			if [ $? -ne 0 ]
@@ -1663,7 +1670,7 @@ start_volumes() {
 
 			local zfs_cmd="run /sbin/zpool import -N -a ${ZPOOL_CACHE} ${ZPOOL_FORCE} 2>&1"
 			is_log_enabled && zfs_cmd="${zfs_cmd} | tee -a '${GK_INIT_LOG}'"
-			[ -n "${QUIET}" ] && zfs_cmd="${zfs_cmd} 1>/dev/null"
+			is_quiet && zfs_cmd="${zfs_cmd} 1>/dev/null"
 
 			eval "${zfs_cmd}"
 			if [ $? -ne 0 ]
@@ -1681,7 +1688,7 @@ start_volumes() {
 
 					local zfs_cmd="run /sbin/zpool export -f '${ZFS_POOL}' 2>&1"
 					is_log_enabled && zfs_cmd="${zfs_cmd} | tee -a '${GK_INIT_LOG}'"
-					[ -n "${QUIET}" ] && zfs_cmd="${zfs_cmd} 1>/dev/null"
+					is_quiet && zfs_cmd="${zfs_cmd} 1>/dev/null"
 
 					eval "${zfs_cmd}"
 					if [ $? -ne 0 ]
@@ -1693,7 +1700,7 @@ start_volumes() {
 
 					zfs_cmd="run /sbin/zpool import -N ${ZPOOL_CACHE} ${ZPOOL_FORCE} '${ZFS_POOL}' 2>&1"
 					is_log_enabled && zfs_cmd="${zfs_cmd} | tee -a '${GK_INIT_LOG}'"
-					[ -n "${QUIET}" ] && zfs_cmd="${zfs_cmd} 1>/dev/null"
+					is_quiet && zfs_cmd="${zfs_cmd} 1>/dev/null"
 
 					eval "${zfs_cmd}"
 					if [ $? -ne 0 ]
@@ -1706,7 +1713,7 @@ start_volumes() {
 
 				local zfs_cmd="run /sbin/zpool import -N ${ZPOOL_CACHE} ${ZPOOL_FORCE} '${ZFS_POOL}' 2>&1"
 				is_log_enabled && zfs_cmd="${zfs_cmd} | tee -a '${GK_INIT_LOG}'"
-				[ -n "${QUIET}" ] && zfs_cmd="${zfs_cmd} 1>/dev/null"
+				is_quiet && zfs_cmd="${zfs_cmd} 1>/dev/null"
 
 				eval "${zfs_cmd}"
 				if [ $? -ne 0 ]
@@ -1729,7 +1736,7 @@ start_iscsi() {
 
 		iscsi_cmd="run iscsistart -b 2>&1"
 		is_log_enabled && iscsi_cmd="${iscsi_cmd} | tee -a '${GK_INIT_LOG}'"
-		[ -n "${QUIET}" ] && iscsi_cmd="${iscsi_cmd} 1>/dev/null"
+		is_quiet && iscsi_cmd="${iscsi_cmd} 1>/dev/null"
 
 		eval "${iscsi_cmd}"
 		if [ $? -ne 0 ]
@@ -1783,7 +1790,7 @@ start_iscsi() {
 
 		iscsi_cmd="run iscsistart -i '${ISCSI_INITIATORNAME}' -t '${ISCSI_TARGET}' -a '${ISCSI_ADDRESS}' ${ADDITIONAL} 2>&1"
 		is_log_enabled && iscsi_cmd="${iscsi_cmd} | tee -a '${GK_INIT_LOG}'"
-		[ -n "${QUIET}" ] && iscsi_cmd="${iscsi_cmd} 1>/dev/null"
+		is_quiet && iscsi_cmd="${iscsi_cmd} 1>/dev/null"
 
 		eval "${iscsi_cmd}"
 		if [ $? -ne 0 ]
@@ -2142,12 +2149,12 @@ start_network() {
 			let interface_timeout_100msec_modulo=${interface_time_waited}%10
 			if [ ${interface_timeout_100msec_modulo} = 0 ]
 			then
-				[ -z "${QUIET}" ] && printf "."
+				is_quiet || printf "."
 			fi
 		fi
 	done
 
-	[ -z "${QUIET}" ] && echo
+	is_quiet || echo
 
 	if [ "${have_interface}" != '1' ]
 	then
@@ -2271,10 +2278,10 @@ kill_network() {
 			ipv6_tentative || break
 			sleep 1
 			: $(( dad_timeout -= 1 ))
-			[ -z "${QUIET}" ] && printf "."
+			is_quiet || printf "."
 		done
 
-		[ -z "${QUIET}" ] && echo ''
+		is_quiet || echo
 
 		if [ ${dad_timeout} -le 0 ]
 		then
@@ -2296,10 +2303,10 @@ kill_network() {
 		fi
 		sleep 1
 		: $(( deconfiguration_timeout -= 1 ))
-		[ -z "${QUIET}" ] && printf "."
+		is_quiet || printf "."
 	done
 
-	[ -z "${QUIET}" ] && echo ''
+	is_quiet || echo
 
 	if [ ${deconfiguration_timeout} -le 0 ]
 	then
@@ -2433,10 +2440,10 @@ wait_sshd() {
 		fi
 		sleep 1
 		: $(( ssh_timeout -= 1 ))
-		[ -z "${QUIET}" ] && printf "."
+		is_quiet || printf "."
 	done
 
-	[ -z "${QUIET}" ] && echo ""
+	is_quiet || echo
 }
 
 kill_sshd() {
@@ -2494,7 +2501,7 @@ sdelay() {
 		do
 			let SDELAY=${SDELAY}-1
 			sleep 1
-			[ -z "${QUIET}" ] && printf "."
+			is_quiet || printf "."
 		done
 		echo
 	elif [ "${CDROOT}" = '1' ]

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

[Thomas Deutschmann]

commit:     60ecb8b6d85b70d07e9aacb12771dde7cd86adf3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 21 16:24:51 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 18:24:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=60ecb8b6

linuxrc: Move global variables to initrd.defaults

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults | 17 ++++++++++++++---
 defaults/initrd.scripts  |  4 ++--
 defaults/linuxrc         | 25 ++++++-------------------
 defaults/login-remote.sh |  8 ++------
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 8849539..9ebeecc 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -46,15 +46,21 @@ WHITE="^[[1;37m"
 # printf "^[[H^[[J"
 
 KV=$(uname -r)
-KMAJOR=$(echo $KV | cut -f1 -d.)
-KMINOR=$(echo $KV | cut -f2 -d.)
+KMAJOR=$(echo ${KV} | cut -f1 -d.)
+KMINOR=$(echo ${KV} | cut -f2 -d.)
 KVER="${KMAJOR}.${KMINOR}"
 MISCOPTS='debug detect'
 
-QUIET=''
+CONSOLE_LOGLEVEL=$(cut -b1 /proc/sys/kernel/printk 2>/dev/null || echo 7)
+
+QUIET=0
 ROOT_LINKS='bin sbin lib lib32 lib64 boot usr opt emul'
 ROOT_TREES='etc root home var'
 
+FAKE_ROOT=''
+FAKE_INIT=''
+FAKE_ROOTFLAGS=''
+
 REAL_ROOT=''
 NEW_ROOT='/newroot'
 no_umounts='/newroot|/mnt/aufs-dev|/mnt/aufs-rw-branch|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino'
@@ -88,6 +94,8 @@ GK_NET_TIMEOUT_DAD=10
 GK_NET_TIMEOUT_DECONFIGURATION=10
 GK_NET_TIMEOUT_DHCP=10
 GK_NET_TIMEOUT_INTERFACE=10
+GK_META_BUILD_DATE=$(cat /etc/build_date 2>/dev/null || echo "Unknown")
+GK_META_VERSION=$(cat /etc/build_id 2>/dev/null || echo "Unknown")
 GK_PRESERVE_RUN=1
 GK_PROMPT_FILE='/tmp/current_prompt'
 GK_PROMPT_TIMEOUT=0
@@ -107,11 +115,14 @@ CRYPT_ROOT_KEYDEV_FSTYPE='auto'
 CRYPT_ROOT_KEYFILE='/tmp/root.key'
 CRYPT_ROOT_OPENED_LOCKFILE='/tmp/ROOT.opened'
 CRYPT_ROOT_OPTIONS=''
+CRYPT_SILENT=0
 CRYPT_SWAP_KEYDEV_FSTYPE='auto'
 CRYPT_SWAP_KEYFILE='/tmp/swap.key'
 CRYPT_SWAP_OPENED_LOCKFILE='/tmp/SWAP.opened'
 CRYPT_SWAP_OPTIONS=''
 
+ROOTFSTYPE='auto'
+
 ZFS_ENC_ENV_FILE='/etc/ZFS_ENC_ENV.conf'
 ZFS_ENC_OPENED_LOCKFILE='/tmp/ZFS.opened'
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index cbeb6bc..fb6f314 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1054,8 +1054,8 @@ run_shell() {
 	export PS1='rescueshell \w \# '
 
 	echo
-	GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}${gk_ver}${NORMAL} (${gk_build_date}) ${BOLD}rescue shell${NORMAL}!" 0
-	GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel ${BOLD}${kernel_ver}${NORMAL}" 0
+	GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}${GK_META_VERSION}${NORMAL} (${GK_META_BUILD_DATE}) ${BOLD}rescue shell${NORMAL}!" 0
+	GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel ${BOLD}${KV}${NORMAL}" 0
 	echo
 
 	# Avoid /dev/{console,tty0} due to "can't access tty; job control turned off" problem;

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 2bb4bae..bd6d192 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -51,21 +51,8 @@ fi
 # Set up symlinks
 run busybox --install -s
 
-console_loglevel="$(cut -b1 /proc/sys/kernel/printk 2>/dev/null || echo 7)"
-gk_ver="$(cat /etc/build_id)"
-gk_build_date="$(cat /etc/build_date)"
-kernel_ver="$(uname -r)"
-
-CMDLINE=$(cat /proc/cmdline)
-# Scan CMDLINE for any specified real_root= or cdroot arguments
-FAKE_ROOT=''
-FAKE_INIT=''
-FAKE_ROOTFLAGS=''
-ROOTFSTYPE='auto'
-CRYPT_SILENT=0
-QUIET=''
-
-run mkdir -p /etc/cmdline /etc/modprobe.d
+# Handle kernel command-line parameters
+CMDLINE=$(cat /proc/cmdline 2>/dev/null)
 for x in ${CMDLINE}
 do
 	case "${x}" in
@@ -468,7 +455,7 @@ done
 # Prevent superfluous printks from being printed to the console
 echo ${GK_CONSOLE_LOGLEVEL} > /proc/sys/kernel/printk
 
-good_msg "${gk_ver} (${gk_build_date}). Linux kernel ${kernel_ver}"
+good_msg "${GK_META_VERSION} (${GK_META_BUILD_DATE}). Linux kernel ${KV}"
 
 if [ "${GK_BOOTFONT_DISABLED}" = '0' -a -e /lib/console/font ]
 then
@@ -1381,11 +1368,11 @@ do
 	fi
 done
 
-if [[ "${console_loglevel}" != "${GK_CONSOLE_LOGLEVEL}" ]]
+if [[ "${CONSOLE_LOGLEVEL}" != "${GK_CONSOLE_LOGLEVEL}" ]]
 then
 	good_msg "Restoring console log level (${console_loglevel}) ..."
-	echo ${console_loglevel} > /proc/sys/kernel/printk \
-		&& log_msg "COMMAND: 'echo \"${console_loglevel}\" > /proc/sys/kernel/printk'"
+	echo ${CONSOLE_LOGLEVEL} > /proc/sys/kernel/printk \
+		&& log_msg "COMMAND: 'echo \"${CONSOLE_LOGLEVEL}\" > /proc/sys/kernel/printk'"
 fi
 
 good_msg "Switching to real root: switch_root ${CHROOT} ${init} ${init_opts}"

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 8eee09a..4664d7b 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -81,14 +81,10 @@ else
 	# Don't log further remote shell output
 	GK_INIT_LOG=
 
-	gk_ver="$(cat /etc/build_id)"
-	gk_build_date="$(cat /etc/build_date)"
-	kernel_ver="$(uname -r)"
-
 	export PS1='remote rescueshell \w \# '
 
-	GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}${gk_ver}${NORMAL} (${gk_build_date}) ${BOLD}remote rescue shell${NORMAL}!"
-	GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel ${BOLD}${kernel_ver}${NORMAL}"
+	GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}${GK_META_VERSION}${NORMAL} (${GK_META_BUILD_DATE}) ${BOLD}remote rescue shell${NORMAL}!"
+	GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel ${BOLD}${KV}${NORMAL}"
 	echo
 	good_msg "${NORMAL}The lockfile '${BOLD}${GK_SSHD_LOCKFILE}${NORMAL}' was created."
 	good_msg "${NORMAL}In order to resume boot process, run '${BOLD}resume-boot${NORMAL}'."

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

[Thomas Deutschmann]

commit:     cc8a012bb8525cfa2c378f2f5d21323e44b106d9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 21 21:53:39 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 21:53:39 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cc8a012b

initrd.scripts: crypt_filter(): crypt_silent shouldn't hide cryptsetup prompt

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 927404d..5ec8adb 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1238,7 +1238,7 @@ write_env_file() {
 crypt_filter() {
 	if [ "${CRYPT_SILENT}" = '1' ]
 	then
-		eval run ${1} >/dev/null 2>&1
+		eval run ${1}
 	else
 		splash 'verbose' >/dev/null &
 		eval run ${1}

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

[Thomas Deutschmann]

commit:     3e69d8284b17f5f3471a9f7b7c58787d4a2bf051
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 21 18:17:47 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 21:39:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3e69d828

initrd.scripts: do_resume(): Show warning when kernel doesn't support hibernation

...but "resume" was specified on kernel command-line.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index fb6f314..927404d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2538,30 +2538,38 @@ do_resume() {
 	local device=$(find_real_device "${REAL_RESUME}")
 	if [ -z "${device}" ]
 	then
-		warn_msg "REAL_RESUME (${REAL_RESUME}) device not found; Skipping resume ..."
+		warn_msg "resume device (${REAL_RESUME}) not found; Skipping resume ..." 0
 		return 0
 	else
 		REAL_RESUME="${device}"
 	fi
 
+	local resume_tried=no
 	if [ -d /proc/suspend2 -o -d /sys/power/suspend2 -o -d /sys/power/tuxonice ]
 	then
 		tuxonice_resume
-	else
+		resume_tried=yes
+	elif [ -f /sys/power/resume ]
+	then
 		swsusp_resume
+		resume_tried=yes
+	fi
+
+	if is_true "${resume_tried}"
+	then
+		warn_msg "System is not resuming from ${REAL_RESUME}, probably because it wasn't suspended; Continue normal booting ..."
+	else
+		warn_msg "resume device (${REAL_RESUME}) specified but kernel is lacking proper hibernation support!"
 	fi
 }
 
 swsusp_resume() {
 	# determine swap resume partition
 	local device=$(ls -lL "${REAL_RESUME}" | sed 's/\  */ /g' | cut -d \  -f 5-6 | sed 's/,\ */:/')
-	if [ -f /sys/power/resume ]
-	then
-		log_msg "Trying to resume using swsusp ..."
-		log_msg "COMMAND: 'echo \"${device}\" > /sys/power/resume'"
-		echo "${device}" > /sys/power/resume
-		log_msg "System is not resuming from ${REAL_RESUME}, probably because it wasn't suspended; Continue normal booting ..."
-	fi
+
+	log_msg "Trying to resume using swsusp ..."
+	log_msg "COMMAND: 'echo \"${device}\" > /sys/power/resume'"
+	echo "${device}" > /sys/power/resume
 }
 
 tuxonice_resume() {
@@ -2627,7 +2635,6 @@ tuxonice_resume() {
 	echo "${REAL_RESUME}" > "${tuxonice_resumedev}"
 	log_msg "COMMAND: 'echo > ${tuxonice_do_resume}'"
 	echo > "${tuxonice_do_resume}"
-	log_msg "System is not resuming from ${REAL_RESUME}, probably because it wasn't suspended; Continue normal booting ..."
 }
 
 find_loop() {

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

[Thomas Deutschmann]

commit:     5e3215ff97e980bf52cceb230488b0587c965ba1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 21 18:16:21 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 18:24:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5e3215ff

linuxrc: Adjust resume device messages

Use same messages we use for root device.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index bd6d192..81e1050 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -646,6 +646,8 @@ then
 				RESUME_DEV=""
 				retval=1
 
+				good_msg "Determining resume device (trying ${REAL_RESUME}) ..."
+
 				if [ ${retval} -ne 0 ]
 				then
 					RESUME_DEV=$(findfs "${REAL_RESUME}" 2>/dev/null)
@@ -660,7 +662,7 @@ then
 
 				if [ ${retval} -eq 0 ] && [ -n "${RESUME_DEV}" ]
 				then
-					good_msg "Detected real_resume=${RESUME_DEV}"
+					good_msg "Resume device detected as ${RESUME_DEV}!"
 					REAL_RESUME="${RESUME_DEV}"
 				fi
 				;;

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

[Thomas Deutschmann]

commit:     950d8474866b643fbbf7d2b70a9593472a57c226
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 22:55:37 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 22:55:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=950d8474

linuxrc: Fix log message

Fixes: 60ecb8b6d ("linuxrc: Move global variables to initrd.defaults")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 81e1050..932df46 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1372,7 +1372,7 @@ done
 
 if [[ "${CONSOLE_LOGLEVEL}" != "${GK_CONSOLE_LOGLEVEL}" ]]
 then
-	good_msg "Restoring console log level (${console_loglevel}) ..."
+	good_msg "Restoring console log level (${CONSOLE_LOGLEVEL}) ..."
 	echo ${CONSOLE_LOGLEVEL} > /proc/sys/kernel/printk \
 		&& log_msg "COMMAND: 'echo \"${CONSOLE_LOGLEVEL}\" > /proc/sys/kernel/printk'"
 fi

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

[Thomas Deutschmann]

commit:     cdaef312247a3ed18c9fdcea084058e5f25a7f3e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 16:07:21 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 16:14:55 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cdaef312

defaults/modules_load: Add support for Lenovo / Thinkpad devices

Support for IBM/Lenovo devices that are not fully compliant with HID standard.

Reported-by: Patrick Lauer <patrick <AT> gentoo.org>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 1cc1478..cee5f4d 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -24,7 +24,7 @@ MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci usb-ohci hid usb-storage uas uhci-hcd ohci-hcd usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
+MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci usb-ohci hid usb-storage uas uhci-hcd ohci-hcd usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-lenovo hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
 
 # Filesystems
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse virtiofs loop squashfs aufs overlay cramfs configfs fscrypto msdos"

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

[Thomas Deutschmann]

commit:     203500a030b608538b15a4a8094de680e1937266
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 23:19:34 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 23:40:52 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=203500a0

initrd.scripts: openLUKS(): Reset cryptsetup_options on each iteration

Fixes: a0a6d631 ("linuxrc: add kernel command-line argument to allow user to pass additional options to cryptsetup")
Bug: https://bugs.gentoo.org/794817
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 6 ++++--
 defaults/unlock-luks.sh | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 5ec8adb..cdee2a4 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1831,8 +1831,6 @@ openLUKS() {
 	eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"'
 	eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
 	eval local LUKS_KEYDEV_FSTYPE='"${CRYPT_'${TYPE}'_KEYDEV_FSTYPE}"'
-	eval local cryptsetup_options='"${CRYPT_'${TYPE}'_OPTIONS}"'
-	cryptsetup_options="$(trim "${cryptsetup_options}")"
 	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
 	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
 	local mntkey="/mnt/key/" crypt_filter_ret=
@@ -1845,6 +1843,10 @@ openLUKS() {
 
 	while true
 	do
+		# Reset cryptsetup_options on each iteration
+		eval local cryptsetup_options='"${CRYPT_'${TYPE}'_OPTIONS}"'
+		cryptsetup_options="$(trim "${cryptsetup_options}")"
+
 		local gpg_cmd=""
 		if [ -e "${OPENED_LOCKFILE}" ]
 		then

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 2674d93..54ed1a0 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -58,6 +58,10 @@ main() {
 
 	while true
 	do
+		# Reset cryptsetup_options on each iteration
+		eval local cryptsetup_options='"${CRYPT_'${TYPE}'_OPTIONS}"'
+		cryptsetup_options="$(trim "${cryptsetup_options}")"
+
 		local gpg_cmd crypt_filter_ret
 
 		if [ -e "${OPENED_LOCKFILE}" ]

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

[Thomas Deutschmann]

commit:     f80b81da305f1f782043d31751f81264be6f2ecd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 22:42:13 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 22:44:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f80b81da

linuxrc: Don't mess with console log level in quiet mode

Fixes: d5f7d79b ("linuxrc: Refactor handling of console log level")
Bug: https://bugs.gentoo.org/788970
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 932df46..6ede740 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -452,8 +452,11 @@ do
 	esac
 done
 
-# Prevent superfluous printks from being printed to the console
-echo ${GK_CONSOLE_LOGLEVEL} > /proc/sys/kernel/printk
+if ! is_quiet
+then
+	# Prevent superfluous printks from being printed to the console
+	echo ${GK_CONSOLE_LOGLEVEL} > /proc/sys/kernel/printk
+fi
 
 good_msg "${GK_META_VERSION} (${GK_META_BUILD_DATE}). Linux kernel ${KV}"
 
@@ -1370,7 +1373,7 @@ do
 	fi
 done
 
-if [[ "${CONSOLE_LOGLEVEL}" != "${GK_CONSOLE_LOGLEVEL}" ]]
+if ! is_quiet && [[ "${CONSOLE_LOGLEVEL}" != "${GK_CONSOLE_LOGLEVEL}" ]]
 then
 	good_msg "Restoring console log level (${CONSOLE_LOGLEVEL}) ..."
 	echo ${CONSOLE_LOGLEVEL} > /proc/sys/kernel/printk \

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

[Thomas Deutschmann]

commit:     a3e1af34bb4dce30d99fdeca7b8217f89f219a01
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  8 02:04:16 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep  8 14:00:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a3e1af34

initrd.scripts: don't skip top level devices with partitions

ppc64 media should be mounted as /dev/sdX, not as /dev/sdX1
this loop was skipping /dev/sdX if /dev/sdX1 is present.

Bug: https://bugs.gentoo.org/212794
Bug: https://bugs.gentoo.org/796272
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Closes: https://bugs.gentoo.org/796272
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index cdee2a4..7eac892 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -178,24 +178,6 @@ findmediamount() {
 			# Check for a block device to mount
 			if [ -b "${x}" ]
 			then
-				skip=0
-				bsn=$(basename "${x}")
-				#
-				# If disk and it has at least one partition, skip.
-				# We use /sys/block/${bsn}/${bsn}[0-9]* to make sure that we
-				# don't skip device mapper devices. Even the craziest scenario
-				# deserves a fair chance.
-				#
-				# shellcheck disable=SC2045
-				for part in $(ls /sys/block/${bsn}/${bsn}*[0-9]* 2>/dev/null)
-				do
-					skip=1
-					break;
-				done
-				if [ ${skip} -eq 1 ]
-				then
-					continue
-				fi
 				good_msg "Attempting to mount media: ${x}" ${CRYPT_SILENT}
 
 				CDROOT_TYPE=$(determine_fs "${x}" "${CDROOT_TYPE}")

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

[Thomas Deutschmann]

commit:     e43878aa62e563fcefa7c1da5c44017816ac65b4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 29 18:15:56 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 29 18:15:56 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e43878aa

defaults/software.sh: dropbear needs libxcrypt

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index 54836ad..9f64ab0 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -67,7 +67,7 @@ GKPKG_DMRAID_BINPKG="${GKPKG_DMRAID_BINPKG:-%%CACHE%%/dmraid-${GKPKG_DMRAID_PV}-
 
 GKPKG_DROPBEAR_PN="dropbear"
 GKPKG_DROPBEAR_PV="${GKPKG_DROPBEAR_PV:-VERSION_DROPBEAR}"
-GKPKG_DROPBEAR_DEPS="zlib"
+GKPKG_DROPBEAR_DEPS="zlib libxcrypt"
 GKPKG_DROPBEAR_SRCTAR="${GKPKG_DROPBEAR_SRCTAR:-${DISTDIR}/dropbear-${GKPKG_DROPBEAR_PV}.tar.bz2}"
 GKPKG_DROPBEAR_SRCDIR="${GKPKG_DROPBEAR_SRCDIR:-dropbear-${GKPKG_DROPBEAR_PV}}"
 GKPKG_DROPBEAR_BINPKG="${GKPKG_DROPBEAR_BINPKG:-%%CACHE%%/dropbear-${GKPKG_DROPBEAR_PV}-%%ARCH%%.tar.xz}"

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

[Thomas Deutschmann]

commit:     a0140d2e77cc0d48b60f38121b73445351c52678
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 01:56:46 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 01:58:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a0140d2e

defaults/modules_load: Add support for i8042 & AT keyboards

Closes: https://bugs.gentoo.org/341193
Closes: https://bugs.gentoo.org/822087
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/modules_load | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/defaults/modules_load b/defaults/modules_load
index cee5f4d..1c78415 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -37,3 +37,6 @@ MODULES_HYPERV="hv_sock hv_utils hv_vmbus hv_balloon hyperv-keyboard hid_hyperv
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto"
+
+# Misc
+MODULES_MISC="atkbd i8042"

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

[Thomas Deutschmann]

commit:     779376e0a1e3c55a8bdc40c5e55ce9bb50ee8eae
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 17:33:12 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 17:33:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=779376e0

btrfs-progs-5.15+ needs libudev

Fixes: d3ee3d06 ("Bump btrfs-progs to v5.15")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index 9f64ab0..ec2bacb 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -32,7 +32,7 @@ GKPKG_BOOST_BUILD_BINPKG="${GKPKG_BOOST_BUILD_BINPKG:-%%CACHE%%/boost-build-${GK
 
 GKPKG_BTRFS_PROGS_PN="btrfs-progs"
 GKPKG_BTRFS_PROGS_PV="${GKPKG_BTRFS_PROGS_PV:-VERSION_BTRFS_PROGS}"
-GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo"
+GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo eudev"
 GKPKG_BTRFS_PROGS_SRCTAR="${GKPKG_BTRFS_PROGS_SRCTAR:-${DISTDIR}/btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}.tar.xz}"
 GKPKG_BTRFS_PROGS_SRCDIR="${GKPKG_BTRFS_PROGS_SRCDIR:-btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}}"
 GKPKG_BTRFS_PROGS_BINPKG="${GKPKG_BTRFS_PROGS_BINPKG:-%%CACHE%%/btrfs-progs-${GKPKG_BTRFS_PROGS_PV}-%%ARCH%%.tar.xz}"

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

[Robin H. Johnson]

commit:     efdf4d0affb587655d703140db86d45ffd2a1ede
Author:     Dmitry Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Tue Dec 29 20:10:50 2020 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Aug  7 17:20:10 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=efdf4d0a

defaults/initrd.scripts: Get rid of extra padding

Simplify conditional blocks where 'continue' is present.

Signed-off-by: Dmitry Baranov <reagentoo <AT> gmail.com>

 defaults/initrd.scripts | 184 ++++++++++++++++++++++++------------------------
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index cdee2a4..33a48b3 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1882,119 +1882,119 @@ openLUKS() {
 				bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" ${CRYPT_SILENT}
 				DEV_ERROR=1
 				continue
-			else
-				if [ -n "${cryptsetup_options}" ]
-				then
-					good_msg "Using the following cryptsetup options for ${LUKS_NAME}: ${cryptsetup_options}" ${CRYPT_SILENT}
-				fi
+			fi
 
-				# Handle keys
-				if [ -n "${LUKS_KEY}" ]
+			if [ -n "${cryptsetup_options}" ]
+			then
+				good_msg "Using the following cryptsetup options for ${LUKS_NAME}: ${cryptsetup_options}" ${CRYPT_SILENT}
+			fi
+
+			# Handle keys
+			if [ -n "${LUKS_KEY}" ]
+			then
+				local REAL_LUKS_KEYDEV="${LUKS_KEYDEV}"
+				if [ ! -e "${mntkey}${LUKS_KEY}" ]
 				then
-					local REAL_LUKS_KEYDEV="${LUKS_KEYDEV}"
-					if [ ! -e "${mntkey}${LUKS_KEY}" ]
+					REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
+					if [ -b "${REAL_LUKS_KEYDEV}" ]
 					then
-						REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
-						if [ -b "${REAL_LUKS_KEYDEV}" ]
+						good_msg "Using key device ${REAL_LUKS_KEYDEV}." ${CRYPT_SILENT}
+					else
+						good_msg "Please insert removable device ${LUKS_KEYDEV} for ${LUKS_NAME}" ${CRYPT_SILENT}
+						# abort after 10 secs
+						local count=10
+						while [ ${count} -gt 0 ]
+						do
+							count=$((count-1))
+							sleep 1
+							REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
+							if [ -b "${REAL_LUKS_KEYDEV}" ]
+							then
+								good_msg "Removable device ${REAL_LUKS_KEYDEV} detected." ${CRYPT_SILENT}
+								break
+							fi
+						done
+						if [ ! -b "${REAL_LUKS_KEYDEV}" ]
 						then
-							good_msg "Using key device ${REAL_LUKS_KEYDEV}." ${CRYPT_SILENT}
-						else
-							good_msg "Please insert removable device ${LUKS_KEYDEV} for ${LUKS_NAME}" ${CRYPT_SILENT}
-							# abort after 10 secs
-							local count=10
-							while [ ${count} -gt 0 ]
-							do
-								count=$((count-1))
-								sleep 1
-								REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
-								if [ -b "${REAL_LUKS_KEYDEV}" ]
-								then
-									good_msg "Removable device ${REAL_LUKS_KEYDEV} detected." ${CRYPT_SILENT}
-									break
-								fi
-							done
+							eval CRYPT_${TYPE}_KEY=${LUKS_KEY}
+							bootstrapKey ${TYPE}
+							eval LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
+							REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
 							if [ ! -b "${REAL_LUKS_KEYDEV}" ]
 							then
-								eval CRYPT_${TYPE}_KEY=${LUKS_KEY}
-								bootstrapKey ${TYPE}
-								eval LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
-								REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
-								if [ ! -b "${REAL_LUKS_KEYDEV}" ]
-								then
-									KEYDEV_ERROR=1
-									bad_msg "Removable device ${LUKS_KEYDEV} not found." ${CRYPT_SILENT}
-									continue
-								fi
-								# continue otherwise will mount keydev which is mounted by bootstrap
+								KEYDEV_ERROR=1
+								bad_msg "Removable device ${LUKS_KEYDEV} not found." ${CRYPT_SILENT}
 								continue
 							fi
+							# continue otherwise will mount keydev which is mounted by bootstrap
+							continue
 						fi
+					fi
 
-						# At this point a device was recognized, now let's see if the key is there
-						[ ! -d "${mntkey}" ] && mkdir -p "${mntkey}" >/dev/null 2>&1
+					# At this point a device was recognized, now let's see if the key is there
+					[ ! -d "${mntkey}" ] && mkdir -p "${mntkey}" >/dev/null 2>&1
 
-						# determine fs -- 'auto' will not trigger module loading!
-						LUKS_KEYDEV_FSTYPE=$(determine_fs "${REAL_LUKS_KEYDEV}" "${LUKS_KEYDEV_FSTYPE}")
+					# determine fs -- 'auto' will not trigger module loading!
+					LUKS_KEYDEV_FSTYPE=$(determine_fs "${REAL_LUKS_KEYDEV}" "${LUKS_KEYDEV_FSTYPE}")
 
-						if ! run mount -n -t ${LUKS_KEYDEV_FSTYPE} -o ro ${REAL_LUKS_KEYDEV} ${mntkey} >/dev/null 2>&1
-						then
-							KEYDEV_ERROR=1
-							bad_msg "Mounting of device ${REAL_LUKS_KEYDEV} failed." ${CRYPT_SILENT}
-							continue
-						else
-							good_msg "Removable device ${REAL_LUKS_KEYDEV} mounted." ${CRYPT_SILENT}
-							sleep 2
-							# keyfile exists?
-							if [ ! -e "${mntkey}${LUKS_KEY}" ]
-							then
-								run umount -n "${mntkey}" >/dev/null 2>&1
-								KEY_ERROR=1
-								KEYDEV_ERROR=1
-								bad_msg "Key {LUKS_KEY} on device ${REAL_LUKS_KEYDEV} not found." ${CRYPT_SILENT}
-								continue
-							fi
-						fi
+					if ! run mount -n -t ${LUKS_KEYDEV_FSTYPE} -o ro ${REAL_LUKS_KEYDEV} ${mntkey} >/dev/null 2>&1
+					then
+						KEYDEV_ERROR=1
+						bad_msg "Mounting of device ${REAL_LUKS_KEYDEV} failed." ${CRYPT_SILENT}
+						continue
 					fi
-					# At this point a candidate key exists (either mounted before or not)
-					good_msg "${LUKS_KEY} on device ${REAL_LUKS_KEYDEV} found" ${CRYPT_SILENT}
 
-					if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ]
+					good_msg "Removable device ${REAL_LUKS_KEYDEV} mounted." ${CRYPT_SILENT}
+					sleep 2
+					# keyfile exists?
+					if [ ! -e "${mntkey}${LUKS_KEY}" ]
 					then
-						if ! hash gpg >/dev/null 2>&1
-						then
-							bad_msg "GPG-encrypted key file provided but gpg program is missing. Was initramfs built without --gpg parameter?"
-							bad_msg "Falling back to passphrase usage!"
-						else
-							[ -e /dev/tty ] && run mv /dev/tty /dev/tty.org
-							run mknod /dev/tty c 5 1
-							cryptsetup_options="${cryptsetup_options} -d -"
-							gpg_cmd="gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
-						fi
-					else
-						cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}"
+						run umount -n "${mntkey}" >/dev/null 2>&1
+						KEY_ERROR=1
+						KEYDEV_ERROR=1
+						bad_msg "Key {LUKS_KEY} on device ${REAL_LUKS_KEYDEV} not found." ${CRYPT_SILENT}
+						continue
 					fi
 				fi
-				# At this point, keyfile or not, we're ready!
-				crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
-				crypt_filter_ret=$?
-
-				[ -e /dev/tty.org ] \
-					&& run rm -f /dev/tty \
-					&& run mv /dev/tty.org /dev/tty
+				# At this point a candidate key exists (either mounted before or not)
+				good_msg "${LUKS_KEY} on device ${REAL_LUKS_KEYDEV} found" ${CRYPT_SILENT}
 
-				if [ ${crypt_filter_ret} -eq 0 ]
+				if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ]
 				then
-					run touch "${OPENED_LOCKFILE}"
-					good_msg "LUKS device ${LUKS_DEVICE} opened" ${CRYPT_SILENT}
-					break
-				elif [ ! -e "${OPENED_LOCKFILE}" ]
-				then
-					bad_msg "Failed to open LUKS device ${LUKS_DEVICE}" ${CRYPT_SILENT}
-					DEV_ERROR=1
-					KEY_ERROR=1
-					KEYDEV_ERROR=1
+					if ! hash gpg >/dev/null 2>&1
+					then
+						bad_msg "GPG-encrypted key file provided but gpg program is missing. Was initramfs built without --gpg parameter?"
+						bad_msg "Falling back to passphrase usage!"
+					else
+						[ -e /dev/tty ] && run mv /dev/tty /dev/tty.org
+						run mknod /dev/tty c 5 1
+						cryptsetup_options="${cryptsetup_options} -d -"
+						gpg_cmd="gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
+					fi
+				else
+					cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}"
 				fi
 			fi
+			# At this point, keyfile or not, we're ready!
+			crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
+			crypt_filter_ret=$?
+
+			[ -e /dev/tty.org ] \
+				&& run rm -f /dev/tty \
+				&& run mv /dev/tty.org /dev/tty
+
+			if [ ${crypt_filter_ret} -eq 0 ]
+			then
+				run touch "${OPENED_LOCKFILE}"
+				good_msg "LUKS device ${LUKS_DEVICE} opened" ${CRYPT_SILENT}
+				break
+			elif [ ! -e "${OPENED_LOCKFILE}" ]
+			then
+				bad_msg "Failed to open LUKS device ${LUKS_DEVICE}" ${CRYPT_SILENT}
+				DEV_ERROR=1
+				KEY_ERROR=1
+				KEYDEV_ERROR=1
+			fi
 		fi
 	done
 

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

[Robin H. Johnson]

commit:     63da86622d47e919ebb08c894b1552d71151473a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 05:42:04 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 05:43:22 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=63da8662

defaults/modules_load: more crypto modules

Needed more cryptsetup in weirder cases. Maybe better in future to
provide easier way to detect these and/or match dracut's code for module
selection.

Based on old https://github.com/robbat2/genkernel/pull/29 submission

Closes: https://github.com/robbat2/genkernel/pull/29
Suggested-by: David Guglielmi <david.guglielmi <AT> gmail.com>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/modules_load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index 1c78415..2ca2046 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci us
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse virtiofs loop squashfs aufs overlay cramfs configfs fscrypto msdos"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic aes_generic xts af_alg algif_skcipher algif_hash algif_aead algif_rng serpent_generic"
+MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic aes_generic xts af_alg algif_skcipher algif_hash algif_aead algif_rng serpent_generic ecb blake2b_generic blake2s_generic ccm cfb cmac chacha20poly1305 chacha_generic curve25519-generic ofb pcbc sha3_generic vmac xcbc"
 
 # Hyper-V
 MODULES_HYPERV="hv_sock hv_utils hv_vmbus hv_balloon hyperv-keyboard hid_hyperv hv_utils hyperv_fb hv_storvsc"

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

[Andreas K. Hüttel]

commit:     33394fef9f712ca0854eca248fe85863771ca04a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 19:31:34 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon May 16 19:33:25 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=33394fef

linuxrc: do not rely on chroot evaluating PATH

When trying to install a new kernel on catbus.sparc.dev.gentoo.org, the
newly built initrd consistently claimed that it could not find init, and
dropped to the rescue shell.

However, init was there just fine in /newroot (as before).

I dug out the command that is actually run inside linuxrc,

        elif ! chroot "${CHROOT}" test -x /${init#/} 1>/dev/null 2>&1

and tried to run that manually, which led to a rather strange error message

rescueshell / # chroot /newroot test -x /lib/systemd/systemd
chroot: can't execute 'test': File name too long

Some more research led me to the busybox manpage (where here chroot comes
from):
https://busybox.net/downloads/BusyBox.html#chroot

chroot
    chroot NEWROOT [PROG [ARGS]]
    Run PROG with root directory set to NEWROOT

Note, the third argument is *not* a command (as with usual chroot, see the
manpage from coreutils chroot) but a program!

Bug: https://bugs.gentoo.org/842027
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ff08ba2..15fbf7c 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1376,7 +1376,7 @@ do
 	if  ! mountpoint "${CHROOT}" 1>/dev/null 2>&1
 	then
 		bad_msg "${CHROOT} is not a mountpoint; Was root device (${REAL_ROOT}) not mounted?"
-	elif ! chroot "${CHROOT}" test -x /${init#/} 1>/dev/null 2>&1
+	elif ! chroot "${CHROOT}" /usr/bin/test -x /${init#/} 1>/dev/null 2>&1
 	then
 		mounted_root_device=$(mountpoint -n /newroot 2>/dev/null | awk '{ print $1 }')
 		bad_msg "init (${init}) not found in mounted root device (${mounted_root_device})!"

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

[Robin H. Johnson]

commit:     c3249d243fcf6dc56f46e2442df6751db91a4606
Author:     Dmitry Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Tue May 24 23:38:22 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed May 25 06:02:41 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c3249d24

defaults/initrd.scripts: start_LUKS_*(): fix bootstrap calls and sleeps

Signed-off-by: Dmitry Baranov <reagentoo <AT> gmail.com>

 defaults/initrd.scripts | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 7012356..f8cc861 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2486,18 +2486,23 @@ ipv6_tentative() {
 }
 
 start_LUKS_root() {
-	# if key is set but neither ssh enabled or key device is given, find
-	# the key device
+	# if key/header is set but neither ssh enabled or key device is given, find
+	# the key/header device
 
-	if [ -n "${CRYPT_ROOT_KEY}" ]
+	if (
+		[ -n "${CRYPT_ROOT_KEY}" -a -z "${CRYPT_ROOT_KEYDEV}" ] ||
+		[ -n "${CRYPT_ROOT_HEADER}" -a -z "${CRYPT_ROOT_HEADERDEV}" ]
+	)
 	then
-		( [ -z "${CRYPT_ROOT_KEYDEV}" ] || [ -z "${CRYPT_ROOT_HEADERDEV}" ] ) \
-			&& sleep 6
-
-		[ -z "${CRYPT_ROOT_KEYDEV}" ] && bootstrapKey "ROOT"
-		[ -z "${CRYPT_ROOT_HEADERDEV}" ] && bootstrapHeader "ROOT"
+		sleep 6
 	fi
 
+	[ -n "${CRYPT_ROOT_KEY}" -a -z "${CRYPT_ROOT_KEYDEV}" ] \
+		&& bootstrapKey "ROOT"
+
+	[ -n "${CRYPT_ROOT_HEADER}" -a -z "${CRYPT_ROOT_HEADERDEV}" ] \
+		&& bootstrapHeader "ROOT"
+
 	if [ -n "${CRYPT_ROOT}" ]
 	then
 		openLUKS "root"
@@ -2512,16 +2517,22 @@ start_LUKS_root() {
 }
 
 start_LUKS_swap() {
-	if [ -n "${CRYPT_SWAP_KEY}" ]
-	then
-		# same for swap, but no need to sleep if root was unencrypted
-		( [ -z "${CRYPT_ROOT_KEYDEV}" ] || [ -z "${CRYPT_ROOT_HEADERDEV}" ] ) \
-			&& [ -z "${CRYPT_ROOT}" ] && sleep 6
+	# same for swap, but no need to sleep if root was unencrypted
 
-		[ -z "${CRYPT_SWAP_KEYDEV}" ] && bootstrapKey "SWAP"
-		[ -z "${CRYPT_SWAP_HEADERDEV}" ] && bootstrapHeader "SWAP"
+	if (
+		[ -n "${CRYPT_SWAP_KEY}" -a -z "${CRYPT_SWAP_KEYDEV}" ] ||
+		[ -n "${CRYPT_SWAP_HEADER}" -a -z "${CRYPT_SWAP_HEADERDEV}" ]
+	)
+	then
+		[ -z "${CRYPT_ROOT}" ] && sleep 6
 	fi
 
+	[ -n "${CRYPT_SWAP_KEY}" -a -z "${CRYPT_SWAP_KEYDEV}" ] \
+		&& bootstrapKey "SWAP"
+
+	[ -n "${CRYPT_SWAP_HEADER}" -a -z "${CRYPT_SWAP_HEADERDEV}" ] \
+		&& bootstrapHeader "SWAP"
+
 	if [ -n "${CRYPT_SWAP}" ]
 	then
 		openLUKS "swap"

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

[Robin H. Johnson]

commit:     08c60969a77ae7ce836691b3419429296810b6e8
Author:     Dmitry Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Tue May 24 23:42:30 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue May 24 23:51:47 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=08c60969

defaults/initrd.scripts: openLUKS(): remove extra bracket in conditional block

Signed-off-by: Dmitry Baranov <reagentoo <AT> gmail.com>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index eb556d6..7012356 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1848,7 +1848,7 @@ openLUKS() {
 			good_msg "The LUKS device ${LUKS_DEVICE} meanwhile was opened by someone else."
 			break
 		# if crypt_silent=1 and some error occurs, enter shell quietly
-		elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( \( ${DEV_ERROR} -eq 1 \) \) ]
+		elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( ${DEV_ERROR} -eq 1 \) \) ]
 		then
 			run_emergency_shell
 		elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( \( ${HEADER_ERROR} -eq 1 \) \) -o \( ${HEADERDEV_ERROR} -eq 1 \) \) ]

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

[Robin H. Johnson]

commit:     eba3381a9d7039cf0a1d066299b1d40e91d23226
Author:     FlyingWaffle <flyingwaffle <AT> pm <DOT> me>
AuthorDate: Sat May 28 20:32:49 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May 28 20:32:49 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=eba3381a

Additional test to allow for hibernation resume...

...on a broader range of system configurations, including LVM and swapfiles.

Signed-off-by: FlyingWaffle <flyingwaffle <AT> pm.me>

 defaults/linuxrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5ee7804..9daad4a 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -671,7 +671,8 @@ keyctl_keyadd
 if [ "${CDROOT}" != '1' ]
 then
 	if ( [ -n "${CRYPT_SWAP_KEY}" ] && [ -z "${CRYPT_SWAP_KEYDEV}" ] ) || \
-	   ( [ -n "${CRYPT_SWAP_HEADER}" ] && [ -z "${CRYPT_SWAP_HEADERDEV}" ] )
+	   ( [ -n "${CRYPT_SWAP_HEADER}" ] && [ -z "${CRYPT_SWAP_HEADERDEV}" ] ) || \
+	   ( [ "${REAL_ROOT}" = "${REAL_RESUME}" ] || [ ${USE_LVM_NORMAL} -eq 1 ] )
 	then
 		# the swap key or header might be on the root fs so start it first in this case
 		start_LUKS_root

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

[Robin H. Johnson]

commit:     2f5a7fc596bdf919f41ddc5df063abf109af6758
Author:     FlyingWaffle <flyingwaffle <AT> pm <DOT> me>
AuthorDate: Sat May 28 21:24:41 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May 28 21:24:41 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2f5a7fc5

Fixes a mistake with quotation usage when testing for LVM flag.

Signed-off-by: FlyingWaffle <flyingwaffle <AT> pm.me>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 9daad4a..2f94eb4 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -672,7 +672,7 @@ if [ "${CDROOT}" != '1' ]
 then
 	if ( [ -n "${CRYPT_SWAP_KEY}" ] && [ -z "${CRYPT_SWAP_KEYDEV}" ] ) || \
 	   ( [ -n "${CRYPT_SWAP_HEADER}" ] && [ -z "${CRYPT_SWAP_HEADERDEV}" ] ) || \
-	   ( [ "${REAL_ROOT}" = "${REAL_RESUME}" ] || [ ${USE_LVM_NORMAL} -eq 1 ] )
+	   ( [ "${REAL_ROOT}" = "${REAL_RESUME}" ] || [ "${USE_LVM_NORMAL}" = '1' ] )
 	then
 		# the swap key or header might be on the root fs so start it first in this case
 		start_LUKS_root

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

[Robin H. Johnson]

commit:     db1df8ea5a42ce058f12473ea79de3ac1f8afb4f
Author:     Maciej S. Szmigiero <mail <AT> maciej <DOT> szmigiero <DOT> name>
AuthorDate: Fri Jun 10 22:23:32 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 22:23:53 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=db1df8ea

Enable threaded XZ compression by default

With the current proliferation of multi-core CPUs enabling threaded XZ
compression brings very significant runtime improvement: on my 4-core
system the total genkernel runtime drops from 356 seconds to 166 seconds
(a reduction of more than 50%) - so let's enable this mode by default.

Signed-off-by: Maciej S. Szmigiero <mail <AT> maciej.szmigiero.name>

 defaults/compression_methods.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/compression_methods.sh b/defaults/compression_methods.sh
index b65f057..37abf46 100644
--- a/defaults/compression_methods.sh
+++ b/defaults/compression_methods.sh
@@ -32,7 +32,7 @@ GKICM_LZMA_EXT=".lzma"
 GKICM_LZMA_PKG="app-arch/xz-utils"
 
 GKICM_XZ_KOPTNAME="XZ"
-GKICM_XZ_CMD="xz -e --check=none -z -f -9"
+GKICM_XZ_CMD="xz -e --check=none -z -f -9 -T 0"
 GKICM_XZ_EXT=".xz"
 GKICM_XZ_PKG="app-arch/xz-utils"
 

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

[Ben Kohler]

commit:     1a279fb3c8dde317da95cb394477ea9a961f8302
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 15:09:22 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 15:09:22 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1a279fb3

defaults/kernel-generic-config: enable multi-gen LRU

Bug: https://bugs.gentoo.org/908512

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 defaults/kernel-generic-config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 927a44d..ac98e60 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -3315,6 +3315,8 @@ CONFIG_LPC_ICH=m
 CONFIG_LP_CONSOLE=y
 CONFIG_LPC_SCH=m
 CONFIG_LRU_CACHE=m
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"

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

[Sam James]

commit:     4d4cb613dfb61f079db30e4f70bbd9aeb56890d8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 10:50:25 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 10:50:25 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4d4cb613

defaults/software.sh: use dist tarball for libxcrypt

Signed-off-by: Sam James <sam <AT> gentoo.org>

 defaults/software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index 5c75a4e..b893f06 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -166,7 +166,7 @@ GKPKG_LIBGPG_ERROR_BINPKG="${GKPKG_LIBGPG_ERROR_BINPKG:-%%CACHE%%/libgpg-error-$
 GKPKG_LIBXCRYPT_PN="libxcrypt"
 GKPKG_LIBXCRYPT_PV="${GKPKG_LIBXCRYPT_PV:-VERSION_LIBXCRYPT}"
 GKPKG_LIBXCRYPT_DEPS=""
-GKPKG_LIBXCRYPT_SRCTAR="${GKPKG_LIBXCRYPT_SRCTAR:-${DISTDIR}/libxcrypt-${GKPKG_LIBXCRYPT_PV}.tar.gz}"
+GKPKG_LIBXCRYPT_SRCTAR="${GKPKG_LIBXCRYPT_SRCTAR:-${DISTDIR}/libxcrypt-${GKPKG_LIBXCRYPT_PV}.tar.xz}"
 GKPKG_LIBXCRYPT_SRCDIR="${GKPKG_LIBXCRYPT_SRCDIR:-libxcrypt-${GKPKG_LIBXCRYPT_PV}}"
 GKPKG_LIBXCRYPT_BINPKG="${GKPKG_LIBXCRYPT_BINPKG:-%%CACHE%%/libxcrypt-${GKPKG_LIBXCRYPT_PV}-%%ARCH%%.tar.xz}"
 

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

[Sam James]

commit:     b44b57129fc4a828e8bf36a34ffe3f078f861b2a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 10:58:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 10:58:24 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b44b5712

defaults/initrd.scripts: kill off some more `which` stragglers

Followup to 04225e090e9936df6c5a9ddd5a3926d13e0001df.

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f8cc861..3d00a55 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2791,16 +2791,16 @@ tuxonice_resume() {
 
 	if ! grep suspend_noui /proc/cmdline >/dev/null 2>&1
 	then
-		which suspend2ui_text >/dev/null 2>&1 && which suspend2ui_text > "${tuxonice_userui_program}"
-		which tuxoniceui_text >/dev/null 2>&1 && which tuxoniceui_text > "${tuxonice_userui_program}"
+		command -v suspend2ui_text >/dev/null 2>&1 && command -v suspend2ui_text > "${tuxonice_userui_program}"
+		command -v tuxoniceui_text >/dev/null 2>&1 && command -v tuxoniceui_text > "${tuxonice_userui_program}"
 
 		if [ -n "${splash_theme}" ]
 		then
 			ln -s /etc/splash/${splash_theme} /etc/splash/suspend2
 			ln -s /etc/splash/${splash_theme} /etc/splash/tuxonice
 
-			which suspend2ui_fbsplash >/dev/null 2>&1 && which suspend2ui_fbsplash > "${tuxonice_userui_program}"
-			which tuxoniceui_fbsplash >/dev/null 2>&1 && which tuxoniceui_fbsplash > "${tuxonice_userui_program}"
+			command -v suspend2ui_fbsplash >/dev/null 2>&1 && command -v suspend2ui_fbsplash > "${tuxonice_userui_program}"
+			command -v tuxoniceui_fbsplash >/dev/null 2>&1 && command -v tuxoniceui_fbsplash > "${tuxonice_userui_program}"
 		fi
 
 	fi

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

[Sam James]

commit:     eb778e05720d2721204231e457df6948446d9af5
Author:     Marat Buharov <marat.buharov <AT> gmail <DOT> com>
AuthorDate: Tue Jul 18 23:33:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 10:58:58 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=eb778e05

Enabling zstd multithreaded compression

Enabling zstd multithreaded compression gives same boost as enabling it for
XZ compression in previous commit.

Signed-off-by: Marat Buharov <marat.buharov <AT> gmail.com>
Closes: https://github.com/gentoo/genkernel/pull/47
Closes: https://github.com/gentoo/genkernel/pull/48
Signed-off-by: Sam James <sam <AT> gentoo.org>

 defaults/compression_methods.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/compression_methods.sh b/defaults/compression_methods.sh
index 37abf46..8cdc38c 100644
--- a/defaults/compression_methods.sh
+++ b/defaults/compression_methods.sh
@@ -37,6 +37,6 @@ GKICM_XZ_EXT=".xz"
 GKICM_XZ_PKG="app-arch/xz-utils"
 
 GKICM_ZSTD_KOPTNAME="ZSTD"
-GKICM_ZSTD_CMD="zstd -f -19 -q"
+GKICM_ZSTD_CMD="zstd -f -19 -q -T0"
 GKICM_ZSTD_EXT=".zst"
 GKICM_ZSTD_PKG="app-arch/zstd"

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

[Ben Kohler]

commit:     bd2f2e1ea079d1721d8fcf684c966d556b763d3e
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 19:38:28 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 19:38:28 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bd2f2e1e

initrd.scripts: create dir layout for overlayfs as well

These dirs like /mnt/gentoo are normally created during boot but
overlayfs usage bypasses that.  Let's create them for overlayfs users as
well.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 defaults/initrd.scripts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 01bfe07..506f8c6 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -855,6 +855,13 @@ setup_overlayfs() {
 		run mount --bind "${i}" "${NEW_ROOT}${i}"
 	done
 
+	# Setup the filesystem nodes and directories
+	# Copied from non-overlayfs logic earlier in this script
+	for i in ${CDROOT_PATH} /mnt/header /mnt/livecd /mnt/key /mnt/gentoo /tmp /tmp/.initrd /dev /proc /run /sys; do
+		run mkdir -p "${NEW_ROOT}${i}"
+		run chmod 755 "${NEW_ROOT}${i}"
+	done
+
 	# Did we populate the overlayfs modules path locations variable?
 	if [ -n "${mods}" ]
 	then

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

[Robin H. Johnson]

commit:     5efa00417c425043c393542011ab256f88488cbc
Author:     Timothy Kenno Handojo <timkenhan <AT> gmail <DOT> com>
AuthorDate: Tue Jan 30 06:45:19 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:11:26 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5efa0041

updated software.sh

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/software.sh | 68 ++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index b893f06..01c504b 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -10,14 +10,14 @@
 #   originate from user changes to /etc/genkernel.conf .
 
 GKPKG_BCACHE_TOOLS_PN="bcache-tools"
-GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-VERSION_BCACHE_TOOLS}"
+GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
 GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
 GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}"
 GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-399021549984ad27bf4a13ae85e458833fe003d7}"
 GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_BOOST_PN="boost"
-GKPKG_BOOST_PV="${GKPKG_BOOST_PV:-VERSION_BOOST}"
+GKPKG_BOOST_PV="${GKPKG_BOOST_PV:-${VERSION_BOOST}}"
 GKPKG_BOOST_DEPS="boost-build"
 GKPKG_BOOST_SRCTAR="${GKPKG_BOOST_SRCTAR:-${DISTDIR}/boost_${GKPKG_BOOST_PV//./_}.tar.bz2}"
 GKPKG_BOOST_SRCDIR="${GKPKG_BOOST_SRCDIR:-boost_${GKPKG_BOOST_PV//./_}}"
@@ -31,98 +31,98 @@ GKPKG_BOOST_BUILD_SRCDIR="${GKPKG_BOOST_SRCDIR}"
 GKPKG_BOOST_BUILD_BINPKG="${GKPKG_BOOST_BUILD_BINPKG:-%%CACHE%%/boost-build-${GKPKG_BOOST_BUILD_PV}.tar.xz}"
 
 GKPKG_BTRFS_PROGS_PN="btrfs-progs"
-GKPKG_BTRFS_PROGS_PV="${GKPKG_BTRFS_PROGS_PV:-VERSION_BTRFS_PROGS}"
+GKPKG_BTRFS_PROGS_PV="${GKPKG_BTRFS_PROGS_PV:-${VERSION_BTRFS_PROGS}}"
 GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo eudev"
 GKPKG_BTRFS_PROGS_SRCTAR="${GKPKG_BTRFS_PROGS_SRCTAR:-${DISTDIR}/btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}.tar.xz}"
 GKPKG_BTRFS_PROGS_SRCDIR="${GKPKG_BTRFS_PROGS_SRCDIR:-btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}}"
 GKPKG_BTRFS_PROGS_BINPKG="${GKPKG_BTRFS_PROGS_BINPKG:-%%CACHE%%/btrfs-progs-${GKPKG_BTRFS_PROGS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_BUSYBOX_PN="busybox"
-GKPKG_BUSYBOX_PV="${GKPKG_BUSYBOX_PV:-VERSION_BUSYBOX}"
+GKPKG_BUSYBOX_PV="${GKPKG_BUSYBOX_PV:-${VERSION_BUSYBOX}}"
 GKPKG_BUSYBOX_DEPS="libxcrypt"
 GKPKG_BUSYBOX_SRCTAR="${GKPKG_BUSYBOX_SRCTAR:-${DISTDIR}/busybox-${GKPKG_BUSYBOX_PV}.tar.bz2}"
 GKPKG_BUSYBOX_SRCDIR="${GKPKG_BUSYBOX_SRCDIR:-busybox-${GKPKG_BUSYBOX_PV}}"
 GKPKG_BUSYBOX_BINPKG="${GKPKG_BUSYBOX_BINPKG:-%%CACHE%%/busybox-${GKPKG_BUSYBOX_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_COREUTILS_PN="coreutils"
-GKPKG_COREUTILS_PV="${GKPKG_COREUTILS_PV:-VERSION_COREUTILS}"
+GKPKG_COREUTILS_PV="${GKPKG_COREUTILS_PV:-${VERSION_COREUTILS}}"
 GKPKG_COREUTILS_DEPS=""
 GKPKG_COREUTILS_SRCTAR="${GKPKG_COREUTILS_SRCTAR:-${DISTDIR}/coreutils-${GKPKG_COREUTILS_PV}.tar.xz}"
 GKPKG_COREUTILS_SRCDIR="${GKPKG_COREUTILS_SRCDIR:-coreutils-${GKPKG_COREUTILS_PV}}"
 GKPKG_COREUTILS_BINPKG="${GKPKG_COREUTILS_BINPKG:-%%CACHE%%/coreutils-${GKPKG_COREUTILS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_CRYPTSETUP_PN="cryptsetup"
-GKPKG_CRYPTSETUP_PV="${GKPKG_CRYPTSETUP_PV:-VERSION_CRYPTSETUP}"
+GKPKG_CRYPTSETUP_PV="${GKPKG_CRYPTSETUP_PV:-${VERSION_CRYPTSETUP}}"
 GKPKG_CRYPTSETUP_DEPS="util-linux eudev json-c popt libgpg-error libgcrypt lvm"
 GKPKG_CRYPTSETUP_SRCTAR="${GKPKG_CRYPTSETUP_SRCTAR:-${DISTDIR}/cryptsetup-${GKPKG_CRYPTSETUP_PV}.tar.xz}"
 GKPKG_CRYPTSETUP_SRCDIR="${GKPKG_CRYPTSETUP_SRCDIR:-cryptsetup-${GKPKG_CRYPTSETUP_PV}}"
 GKPKG_CRYPTSETUP_BINPKG="${GKPKG_CRYPTSETUP_BINPKG:-%%CACHE%%/cryptsetup-${GKPKG_CRYPTSETUP_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_DMRAID_PN="dmraid"
-GKPKG_DMRAID_PV="${GKPKG_DMRAID_PV:-VERSION_DMRAID}"
+GKPKG_DMRAID_PV="${GKPKG_DMRAID_PV:-${VERSION_DMRAID}}"
 GKPKG_DMRAID_DEPS="eudev lvm"
 GKPKG_DMRAID_SRCTAR="${GKPKG_DMRAID_SRCTAR:-${DISTDIR}/dmraid-${GKPKG_DMRAID_PV}.tar.bz2}"
 GKPKG_DMRAID_SRCDIR="${GKPKG_DMRAID_SRCDIR:-dmraid/${GKPKG_DMRAID_PV}/dmraid}"
 GKPKG_DMRAID_BINPKG="${GKPKG_DMRAID_BINPKG:-%%CACHE%%/dmraid-${GKPKG_DMRAID_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_DROPBEAR_PN="dropbear"
-GKPKG_DROPBEAR_PV="${GKPKG_DROPBEAR_PV:-VERSION_DROPBEAR}"
+GKPKG_DROPBEAR_PV="${GKPKG_DROPBEAR_PV:-${VERSION_DROPBEAR}}"
 GKPKG_DROPBEAR_DEPS="zlib libxcrypt"
 GKPKG_DROPBEAR_SRCTAR="${GKPKG_DROPBEAR_SRCTAR:-${DISTDIR}/dropbear-${GKPKG_DROPBEAR_PV}.tar.bz2}"
 GKPKG_DROPBEAR_SRCDIR="${GKPKG_DROPBEAR_SRCDIR:-dropbear-${GKPKG_DROPBEAR_PV}}"
 GKPKG_DROPBEAR_BINPKG="${GKPKG_DROPBEAR_BINPKG:-%%CACHE%%/dropbear-${GKPKG_DROPBEAR_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_EUDEV_PN="eudev"
-GKPKG_EUDEV_PV="${GKPKG_EUDEV_PV:-VERSION_EUDEV}"
+GKPKG_EUDEV_PV="${GKPKG_EUDEV_PV:-${VERSION_EUDEV}}"
 GKPKG_EUDEV_DEPS="util-linux zlib xz zstd kmod"
 GKPKG_EUDEV_SRCTAR="${GKPKG_EUDEV_SRCTAR:-${DISTDIR}/eudev-${GKPKG_EUDEV_PV}.tar.gz}"
 GKPKG_EUDEV_SRCDIR="${GKPKG_EUDEV_SRCDIR:-eudev-${GKPKG_EUDEV_PV}}"
 GKPKG_EUDEV_BINPKG="${GKPKG_EUDEV_BINPKG:-%%CACHE%%/eudev-${GKPKG_EUDEV_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_EXPAT_PN="expat"
-GKPKG_EXPAT_PV="${GKPKG_EXPAT_PV:-VERSION_EXPAT}"
+GKPKG_EXPAT_PV="${GKPKG_EXPAT_PV:-${VERSION_EXPAT}}"
 GKPKG_EXPAT_DEPS=""
 GKPKG_EXPAT_SRCTAR="${GKPKG_EXPAT_SRCTAR:-${DISTDIR}/expat-${GKPKG_EXPAT_PV}.tar.xz}"
 GKPKG_EXPAT_SRCDIR="${GKPKG_EXPAT_SRCDIR:-expat-${GKPKG_EXPAT_PV}}"
 GKPKG_EXPAT_BINPKG="${GKPKG_EXPAT_BINPKG:-%%CACHE%%/expat-${GKPKG_EXPAT_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_E2FSPROGS_PN="e2fsprogs"
-GKPKG_E2FSPROGS_PV="${GKPKG_E2FSPROGS_PV:-VERSION_E2FSPROGS}"
+GKPKG_E2FSPROGS_PV="${GKPKG_E2FSPROGS_PV:-${VERSION_E2FSPROGS}}"
 GKPKG_E2FSPROGS_DEPS="util-linux"
 GKPKG_E2FSPROGS_SRCTAR="${GKPKG_E2FSPROGS_SRCTAR:-${DISTDIR}/e2fsprogs-${GKPKG_E2FSPROGS_PV}.tar.xz}"
 GKPKG_E2FSPROGS_SRCDIR="${GKPKG_E2FSPROGS_SRCDIR:-e2fsprogs-${GKPKG_E2FSPROGS_PV}}"
 GKPKG_E2FSPROGS_BINPKG="${GKPKG_E2FSPROGS_BINPKG:-%%CACHE%%/e2fsprogs-${GKPKG_E2FSPROGS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_FUSE_PN="fuse"
-GKPKG_FUSE_PV="${GKPKG_FUSE_PV:-VERSION_FUSE}"
+GKPKG_FUSE_PV="${GKPKG_FUSE_PV:-${VERSION_FUSE}}"
 GKPKG_FUSE_DEPS=""
 GKPKG_FUSE_SRCTAR="${GKPKG_FUSE_SRCTAR:-${DISTDIR}/fuse-${GKPKG_FUSE_PV}.tar.gz}"
 GKPKG_FUSE_SRCDIR="${GKPKG_FUSE_SRCDIR:-fuse-${GKPKG_FUSE_PV}}"
 GKPKG_FUSE_BINPKG="${GKPKG_FUSE_BINPKG:-%%CACHE%%/fuse-${GKPKG_FUSE_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_GPG_PN="gnupg"
-GKPKG_GPG_PV="${GKPKG_GPG_PV:-VERSION_GPG}"
+GKPKG_GPG_PV="${GKPKG_GPG_PV:-${VERSION_GPG}}"
 GKPKG_GPG_DEPS=""
 GKPKG_GPG_SRCTAR="${GKPKG_GPG_SRCTAR:-${DISTDIR}/gnupg-${GKPKG_GPG_PV}.tar.bz2}"
 GKPKG_GPG_SRCDIR="${GKPKG_GPG_SRCDIR:-gnupg-${GKPKG_GPG_PV}}"
 GKPKG_GPG_BINPKG="${GKPKG_GPG_BINPKG:-%%CACHE%%/gnupg-${GKPKG_GPG_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_HWIDS_PN="hwids"
-GKPKG_HWIDS_PV="${GKPKG_HWIDS_PV:-VERSION_HWIDS}"
+GKPKG_HWIDS_PV="${GKPKG_HWIDS_PV:-${VERSION_HWIDS}}"
 GKPKG_HWIDS_DEPS="eudev"
 GKPKG_HWIDS_SRCTAR="${GKPKG_HWIDS_SRCTAR:-${DISTDIR}/hwids-${GKPKG_HWIDS_PV}.tar.gz}"
 GKPKG_HWIDS_SRCDIR="${GKPKG_HWIDS_SRCDIR:-hwids-${GKPKG_HWIDS_PV}}"
 GKPKG_HWIDS_BINPKG="${GKPKG_HWIDS_BINPKG:-%%CACHE%%/hwids-${GKPKG_HWIDS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_ISCSI_PN="open-iscsi"
-GKPKG_ISCSI_PV="${GKPKG_ISCSI_PV:-VERSION_ISCSI}"
+GKPKG_ISCSI_PV="${GKPKG_ISCSI_PV:-${VERSION_ISCSI}}"
 GKPKG_ISCSI_DEPS="util-linux zlib xz zstd kmod"
 GKPKG_ISCSI_SRCTAR="${GKPKG_ISCSI_SRCTAR:-${DISTDIR}/open-iscsi-${GKPKG_ISCSI_PV}.tar.gz}"
 GKPKG_ISCSI_SRCDIR="${GKPKG_ISCSI_SRCDIR:-open-iscsi-${GKPKG_ISCSI_PV}}"
 GKPKG_ISCSI_BINPKG="${GKPKG_ISCSI_BINPKG:-%%CACHE%%/iscsi-${GKPKG_ISCSI_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_JSON_C_PN="json-c"
-GKPKG_JSON_C_PV="${GKPKG_JSON_C_PV:-VERSION_JSON_C}"
+GKPKG_JSON_C_PV="${GKPKG_JSON_C_PV:-${VERSION_JSON_C}}"
 GKPKG_JSON_C_DEPS=""
 GKPKG_JSON_C_SRCTAR="${GKPKG_JSON_C_SRCTAR:-${DISTDIR}/json-c-${GKPKG_JSON_C_PV}.tar.gz}"
 GKPKG_JSON_C_SRCDIR="${GKPKG_JSON_C_SRCDIR:-json-c-${GKPKG_JSON_C_PV}}"
@@ -136,126 +136,126 @@ GKPKG_KEYUTILS_SRCDIR="${GKPKG_KEYUTILS_SRCDIR:-keyutils-${GKPKG_KEYUTILS_PV}}"
 GKPKG_KEYUTILS_BINPKG="${GKPKG_KEYUTILS_BINPKG:-%%CACHE%%/keyutils-${GKPKG_KEYUTILS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_KMOD_PN="kmod"
-GKPKG_KMOD_PV="${GKPKG_KMOD_PV:-VERSION_KMOD}"
+GKPKG_KMOD_PV="${GKPKG_KMOD_PV:-${VERSION_KMOD}}"
 GKPKG_KMOD_DEPS="zlib xz zstd"
 GKPKG_KMOD_SRCTAR="${GKPKG_KMOD_SRCTAR:-${DISTDIR}/kmod-${GKPKG_KMOD_PV}.tar.xz}"
 GKPKG_KMOD_SRCDIR="${GKPKG_KMOD_SRCDIR:-kmod-${GKPKG_KMOD_PV}}"
 GKPKG_KMOD_BINPKG="${GKPKG_KMOD_BINPKG:-%%CACHE%%/kmod-${GKPKG_KMOD_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LIBAIO_PN="libaio"
-GKPKG_LIBAIO_PV="${GKPKG_LIBAIO_PV:-VERSION_LIBAIO}"
+GKPKG_LIBAIO_PV="${GKPKG_LIBAIO_PV:-${VERSION_LIBAIO}}"
 GKPKG_LIBAIO_DEPS=""
 GKPKG_LIBAIO_SRCTAR="${GKPKG_LIBAIO_SRCTAR:-${DISTDIR}/libaio-${GKPKG_LIBAIO_PV}.tar.gz}"
 GKPKG_LIBAIO_SRCDIR="${GKPKG_LIBAIO_SRCDIR:-libaio-${GKPKG_LIBAIO_PV}}"
 GKPKG_LIBAIO_BINPKG="${GKPKG_LIBAIO_BINPKG:-%%CACHE%%/libaio-${GKPKG_LIBAIO_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LIBGCRYPT_PN="libgcrypt"
-GKPKG_LIBGCRYPT_PV="${GKPKG_LIBGCRYPT_PV:-VERSION_LIBGCRYPT}"
+GKPKG_LIBGCRYPT_PV="${GKPKG_LIBGCRYPT_PV:-${VERSION_LIBGCRYPT}}"
 GKPKG_LIBGCRYPT_DEPS="libgpg-error"
 GKPKG_LIBGCRYPT_SRCTAR="${GKPKG_LIBGCRYPT_SRCTAR:-${DISTDIR}/libgcrypt-${GKPKG_LIBGCRYPT_PV}.tar.bz2}"
 GKPKG_LIBGCRYPT_SRCDIR="${GKPKG_LIBGCRYPT_SRCDIR:-libgcrypt-${GKPKG_LIBGCRYPT_PV}}"
 GKPKG_LIBGCRYPT_BINPKG="${GKPKG_LIBGCRYPT_BINPKG:-%%CACHE%%/libgcrypt-${GKPKG_LIBGCRYPT_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LIBGPG_ERROR_PN="libgpg-error"
-GKPKG_LIBGPG_ERROR_PV="${GKPKG_LIBGPG_ERROR_PV:-VERSION_LIBGPGERROR}"
+GKPKG_LIBGPG_ERROR_PV="${GKPKG_LIBGPG_ERROR_PV:-${VERSION_LIBGPGERROR}}"
 GKPKG_LIBGPG_ERROR_DEPS=""
 GKPKG_LIBGPG_ERROR_SRCTAR="${GKPKG_LIBGPG_ERROR_SRCTAR:-${DISTDIR}/libgpg-error-${GKPKG_LIBGPG_ERROR_PV}.tar.bz2}"
 GKPKG_LIBGPG_ERROR_SRCDIR="${GKPKG_LIBGPG_ERROR_SRCDIR:-libgpg-error-${GKPKG_LIBGPG_ERROR_PV}}"
 GKPKG_LIBGPG_ERROR_BINPKG="${GKPKG_LIBGPG_ERROR_BINPKG:-%%CACHE%%/libgpg-error-${GKPKG_LIBGPG_ERROR_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LIBXCRYPT_PN="libxcrypt"
-GKPKG_LIBXCRYPT_PV="${GKPKG_LIBXCRYPT_PV:-VERSION_LIBXCRYPT}"
+GKPKG_LIBXCRYPT_PV="${GKPKG_LIBXCRYPT_PV:-${VERSION_LIBXCRYPT}}"
 GKPKG_LIBXCRYPT_DEPS=""
 GKPKG_LIBXCRYPT_SRCTAR="${GKPKG_LIBXCRYPT_SRCTAR:-${DISTDIR}/libxcrypt-${GKPKG_LIBXCRYPT_PV}.tar.xz}"
 GKPKG_LIBXCRYPT_SRCDIR="${GKPKG_LIBXCRYPT_SRCDIR:-libxcrypt-${GKPKG_LIBXCRYPT_PV}}"
 GKPKG_LIBXCRYPT_BINPKG="${GKPKG_LIBXCRYPT_BINPKG:-%%CACHE%%/libxcrypt-${GKPKG_LIBXCRYPT_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LVM_PN="lvm"
-GKPKG_LVM_PV="${GKPKG_LVM_PV:-VERSION_LVM}"
+GKPKG_LVM_PV="${GKPKG_LVM_PV:-${VERSION_LVM}}"
 GKPKG_LVM_DEPS="util-linux eudev libaio"
 GKPKG_LVM_SRCTAR="${GKPKG_LVM_SRCTAR:-${DISTDIR}/LVM2.${GKPKG_LVM_PV}.tgz}"
 GKPKG_LVM_SRCDIR="${GKPKG_LVM_SRCDIR:-LVM2.${GKPKG_LVM_PV}}"
 GKPKG_LVM_BINPKG="${GKPKG_LVM_BINPKG:-%%CACHE%%/LVM2.${GKPKG_LVM_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_LZO_PN="lzo"
-GKPKG_LZO_PV="${GKPKG_LZO_PV:-VERSION_LZO}"
+GKPKG_LZO_PV="${GKPKG_LZO_PV:-${VERSION_LZO}}"
 GKPKG_LZO_DEPS=""
 GKPKG_LZO_SRCTAR="${GKPKG_LZO_SRCTAR:-${DISTDIR}/lzo-${GKPKG_LZO_PV}.tar.gz}"
 GKPKG_LZO_SRCDIR="${GKPKG_LZO_SRCDIR:-lzo-${GKPKG_LZO_PV}}"
 GKPKG_LZO_BINPKG="${GKPKG_LZO_BINPKG:-%%CACHE%%/lzo-${GKPKG_LZO_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_MDADM_PN="mdadm"
-GKPKG_MDADM_PV="${GKPKG_MDADM_PV:-VERSION_MDADM}"
+GKPKG_MDADM_PV="${GKPKG_MDADM_PV:-${VERSION_MDADM}}"
 GKPKG_MDADM_DEPS="eudev"
 GKPKG_MDADM_SRCTAR="${GKPKG_MDADM_SRCTAR:-${DISTDIR}/mdadm-${GKPKG_MDADM_PV}.tar.xz}"
 GKPKG_MDADM_SRCDIR="${GKPKG_MDADM_SRCDIR:-mdadm-${GKPKG_MDADM_PV}}"
 GKPKG_MDADM_BINPKG="${GKPKG_MDADM_BINPKG:-%%CACHE%%/mdadm-${GKPKG_MDADM_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_POPT_PN="popt"
-GKPKG_POPT_PV="${GKPKG_POPT_PV:-VERSION_POPT}"
+GKPKG_POPT_PV="${GKPKG_POPT_PV:-${VERSION_POPT}}"
 GKPKG_POPT_DEPS=""
 GKPKG_POPT_SRCTAR="${GKPKG_POPT_SRCTAR:-${DISTDIR}/popt-${GKPKG_POPT_PV}.tar.gz}"
 GKPKG_POPT_SRCDIR="${GKPKG_POPT_SRCDIR:-popt-${GKPKG_POPT_PV}}"
 GKPKG_POPT_BINPKG="${GKPKG_POPT_BINPKG:-%%CACHE%%/popt-${GKPKG_POPT_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_STRACE_PN="strace"
-GKPKG_STRACE_PV="${GKPKG_STRACE_PV:-VERSION_STRACE}"
+GKPKG_STRACE_PV="${GKPKG_STRACE_PV:-${VERSION_STRACE}}"
 GKPKG_STRACE_DEPS="libaio"
 GKPKG_STRACE_SRCTAR="${GKPKG_STRACE_SRCTAR:-${DISTDIR}/strace-${GKPKG_STRACE_PV}.tar.xz}"
 GKPKG_STRACE_SRCDIR="${GKPKG_STRACE_SRCDIR:-strace-${GKPKG_STRACE_PV}}"
 GKPKG_STRACE_BINPKG="${GKPKG_STRACE_BINPKG:-%%CACHE%%/strace-${GKPKG_STRACE_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_THIN_PROVISIONING_TOOLS_PN="thin-provisioning-tools"
-GKPKG_THIN_PROVISIONING_TOOLS_PV="${GKPKG_THIN_PROVISIONING_TOOLS_PV:-VERSION_THIN_PROVISIONING_TOOLS}"
+GKPKG_THIN_PROVISIONING_TOOLS_PV="${GKPKG_THIN_PROVISIONING_TOOLS_PV:-${VERSION_THIN_PROVISIONING_TOOLS}}"
 GKPKG_THIN_PROVISIONING_TOOLS_DEPS="boost libaio expat"
 GKPKG_THIN_PROVISIONING_TOOLS_SRCTAR="${GKPKG_THIN_PROVISIONING_TOOLS_SRCTAR:-${DISTDIR}/thin-provisioning-tools-${GKPKG_THIN_PROVISIONING_TOOLS_PV}.tar.gz}"
 GKPKG_THIN_PROVISIONING_TOOLS_SRCDIR="${GKPKG_THIN_PROVISIONING_TOOLS_SRCDIR:-thin-provisioning-tools-${GKPKG_THIN_PROVISIONING_TOOLS_PV}}"
 GKPKG_THIN_PROVISIONING_TOOLS_BINPKG="${GKPKG_THIN_PROVISIONING_TOOLS_BINPKG:-%%CACHE%%/thin-provisioning-tools-${GKPKG_THIN_PROVISIONING_TOOLS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_UNIONFS_FUSE_PN="unionfs-fuse"
-GKPKG_UNIONFS_FUSE_PV="${GKPKG_UNIONFS_FUSE_PV:-VERSION_UNIONFS_FUSE}"
+GKPKG_UNIONFS_FUSE_PV="${GKPKG_UNIONFS_FUSE_PV:-${VERSION_UNIONFS_FUSE}}"
 GKPKG_UNIONFS_FUSE_DEPS="fuse"
 GKPKG_UNIONFS_FUSE_SRCTAR="${GKPKG_UNIONFS_FUSE_SRCTAR:-${DISTDIR}/unionfs-fuse-${GKPKG_UNIONFS_FUSE_PV}.tar.gz}"
 GKPKG_UNIONFS_FUSE_SRCDIR="${GKPKG_UNIONFS_FUSE_SRCDIR:-unionfs-fuse-${GKPKG_UNIONFS_FUSE_PV}}"
 GKPKG_UNIONFS_FUSE_BINPKG="${GKPKG_UNIONFS_FUSE_BINPKG:-%%CACHE%%/unionfs-fuse-${GKPKG_UNIONFS_FUSE_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_USERSPACE_RCU_PN="userspace-rcu"
-GKPKG_USERSPACE_RCU_PV="${GKPKG_USERSPACE_RCU_PV:-VERSION_USERSPACE_RCU}"
+GKPKG_USERSPACE_RCU_PV="${GKPKG_USERSPACE_RCU_PV:-${VERSION_USERSPACE_RCU}}"
 GKPKG_USERSPACE_RCU_DEPS=""
 GKPKG_USERSPACE_RCU_SRCTAR="${GKPKG_UTIL_LINUX_SRCTAR:-${DISTDIR}/userspace-rcu-${GKPKG_USERSPACE_RCU_PV}.tar.bz2}"
 GKPKG_USERSPACE_RCU_SRCDIR="${GKPKG_UTIL_LINUX_SRCDIR:-userspace-rcu-${GKPKG_USERSPACE_RCU_PV}}"
 GKPKG_USERSPACE_RCU_BINPKG="${GKPKG_UTIL_LINUX_BINPKG:-%%CACHE%%/userspace-rcu-${GKPKG_USERSPACE_RCU_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_UTIL_LINUX_PN="util-linux"
-GKPKG_UTIL_LINUX_PV="${GKPKG_UTIL_LINUX_PV:-VERSION_UTIL_LINUX}"
+GKPKG_UTIL_LINUX_PV="${GKPKG_UTIL_LINUX_PV:-${VERSION_UTIL_LINUX}}"
 GKPKG_UTIL_LINUX_DEPS=""
 GKPKG_UTIL_LINUX_SRCTAR="${GKPKG_UTIL_LINUX_SRCTAR:-${DISTDIR}/util-linux-${GKPKG_UTIL_LINUX_PV}.tar.xz}"
 GKPKG_UTIL_LINUX_SRCDIR="${GKPKG_UTIL_LINUX_SRCDIR:-util-linux-${GKPKG_UTIL_LINUX_PV}}"
 GKPKG_UTIL_LINUX_BINPKG="${GKPKG_UTIL_LINUX_BINPKG:-%%CACHE%%/util-linux-${GKPKG_UTIL_LINUX_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_XFSPROGS_PN="xfsprogs"
-GKPKG_XFSPROGS_PV="${GKPKG_XFSPROGS_PV:-VERSION_XFSPROGS}"
+GKPKG_XFSPROGS_PV="${GKPKG_XFSPROGS_PV:-${VERSION_XFSPROGS}}"
 GKPKG_XFSPROGS_DEPS="util-linux userspace-rcu"
 GKPKG_XFSPROGS_SRCTAR="${GKPKG_XFSPROGS_SRCTAR:-${DISTDIR}/xfsprogs-${GKPKG_XFSPROGS_PV}.tar.xz}"
 GKPKG_XFSPROGS_SRCDIR="${GKPKG_XFSPROGS_SRCDIR:-xfsprogs-${GKPKG_XFSPROGS_PV}}"
 GKPKG_XFSPROGS_BINPKG="${GKPKG_XFSPROGS_BINPKG:-%%CACHE%%/xfsprogs-${GKPKG_XFSPROGS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_XZ_PN="xz"
-GKPKG_XZ_PV="${GKPKG_XZ_PV:-VERSION_XZ}"
+GKPKG_XZ_PV="${GKPKG_XZ_PV:-${VERSION_XZ}}"
 GKPKG_XZ_DEPS=""
 GKPKG_XZ_SRCTAR="${GKPKG_XZ_SRCTAR:-${DISTDIR}/xz-${GKPKG_XZ_PV}.tar.gz}"
 GKPKG_XZ_SRCDIR="${GKPKG_XZ_SRCDIR:-xz-${GKPKG_XZ_PV}}"
 GKPKG_XZ_BINPKG="${GKPKG_XZ_BINPKG:-%%CACHE%%/xz-${GKPKG_XZ_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_ZLIB_PN="zlib"
-GKPKG_ZLIB_PV="${GKPKG_ZLIB_PV:-VERSION_ZLIB}"
+GKPKG_ZLIB_PV="${GKPKG_ZLIB_PV:-${VERSION_ZLIB}}"
 GKPKG_ZLIB_DEPS=""
 GKPKG_ZLIB_SRCTAR="${GKPKG_ZLIB_SRCTAR:-${DISTDIR}/zlib-${GKPKG_ZLIB_PV}.tar.gz}"
 GKPKG_ZLIB_SRCDIR="${GKPKG_ZLIB_SRCDIR:-zlib-${GKPKG_ZLIB_PV}}"
 GKPKG_ZLIB_BINPKG="${GKPKG_ZLIB_BINPKG:-%%CACHE%%/zlib-${GKPKG_ZLIB_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_ZSTD_PN="zstd"
-GKPKG_ZSTD_PV="${GKPKG_ZSTD_PV:-VERSION_ZSTD}"
+GKPKG_ZSTD_PV="${GKPKG_ZSTD_PV:-${VERSION_ZSTD}}"
 GKPKG_ZSTD_DEPS=""
 GKPKG_ZSTD_SRCTAR="${GKPKG_ZSTD_SRCTAR:-${DISTDIR}/zstd-${GKPKG_ZSTD_PV}.tar.gz}"
 GKPKG_ZSTD_SRCDIR="${GKPKG_ZSTD_SRCDIR:-zstd-${GKPKG_ZSTD_PV}}"

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

[Ben Kohler]

commit:     d34b15e5f24da59852c2aa6807712319c5fb51e9
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 18:00:13 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May  1 18:00:13 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d34b15e5

defaults/software.sh: still build for bcache-tools-1.0.8* for now

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 defaults/software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index 42004f3..01c504b 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -13,7 +13,7 @@ GKPKG_BCACHE_TOOLS_PN="bcache-tools"
 GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
 GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
 GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}"
-GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-a5e3753516bd39c431def86c8dfec8a9cea1ddd4}"
+GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-399021549984ad27bf4a13ae85e458833fe003d7}"
 GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_BOOST_PN="boost"

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

[Ben Kohler]

commit:     f973903cea8d161893b29b4fb4114561a6aa5674
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 15:14:32 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May 22 15:14:32 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f973903c

defaults/software.sh: fix srcdir for new bcache-tools

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 defaults/software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index 01c504b..42004f3 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -13,7 +13,7 @@ GKPKG_BCACHE_TOOLS_PN="bcache-tools"
 GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
 GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
 GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}"
-GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-399021549984ad27bf4a13ae85e458833fe003d7}"
+GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-a5e3753516bd39c431def86c8dfec8a9cea1ddd4}"
 GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_BOOST_PN="boost"