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

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

[Sebastian Pipping]

commit:     f84f42b4e22558f108484ba34a8d674f21a15d29
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jan 14 23:04:54 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 23:04:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f84f42b4

Re-activate mdstart in busybox config

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

diff --git a/ChangeLog b/ChangeLog
index 38a0e4b..7e99f39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/busy-config:
+  Re-activate mdstart in busybox config
+
   14 Jan 2012; Sebastian Pipping <sping@gentoo.org>
   +patches/busybox/1.19.3/busybox-1.19.3-mdstart.patch:
   Port mdstart patch to busybox 1.19.3

diff --git a/defaults/busy-config b/defaults/busy-config
index 6a84568..8d69369 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -567,6 +567,7 @@ CONFIG_MDEV=y
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 # CONFIG_FEATURE_MDEV_EXEC is not set
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 CONFIG_MORE=y

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

[Thomas Deutschmann]

commit:     73689f82a7ef090c4d8c22eced7a56471be14156
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 21:06:51 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 22:56:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=73689f82

ZFS: Enable UDEV support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 24 +++++++++++++++++-------
 gen_initramfs.sh        | 23 ++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d2db059..304d634 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1641,12 +1641,11 @@ 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}'"
+
 			eval "${zfs_cmd}"
-			if [ $? -eq 0 ]
+			if [ $? -ne 0 ]
 			then
-				good_msg "Importing ZFS pools succeeded!"
-			else
-				bad_msg "Imported ZFS pools failed!"
+				bad_msg "Importing ZFS pools failed!"
 			fi
 		else
 
@@ -1660,22 +1659,33 @@ 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}'"
+
 					eval "${zfs_cmd}"
+					if [ $? -ne 0 ]
+					then
+						bad_msg "Exporting ZFS pools failed!"
+					else
+						udevsettle
+					fi
 
 					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}'"
+
 					eval "${zfs_cmd}"
+					if [ $? -ne 0 ]
+					then
+						bad_msg "Re-importing ZFS pools failed!"
+					fi
 				fi
 			else
 				good_msg "Importing ZFS pool ${ZFS_POOL} ..."
 
 				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}'"
+
 				eval "${zfs_cmd}"
-				if [ $? -eq 0 ]
+				if [ $? -ne 0 ]
 				then
-					good_msg "Import of ${ZFS_POOL} succeeded!"
-				else
 					bad_msg "Import of ${ZFS_POOL} failed!"
 				fi
 			fi

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 24b23bb..570100e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -992,7 +992,6 @@ append_zfs() {
 	fi
 
 	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
-	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
 	mkdir -p "${TDIR}"/etc/zfs || gen_die "Failed to create '${TDIR}/etc/zfs'!"
 
@@ -1022,6 +1021,28 @@ append_zfs() {
 
 	copy_binaries "${TDIR}" /sbin/{mount.zfs,zdb,zfs,zpool}
 
+	local udevdir=$(get_udevdir)
+	local udevdir_initramfs="/usr/lib/udev"
+	local udev_files=( $(qlist -e sys-fs/zfs:0 \
+		| xargs --no-run-if-empty realpath \
+		| grep -E -- "^${udevdir}")
+	)
+
+	if [ ${#udev_files[@]} -eq 0 ]
+	then
+		gen_die "Something went wrong: Did not found any udev-related files for sys-fs/zfs!"
+	fi
+
+	mkdir -p "${TDIR}"/usr/lib/udev/rules.d || gen_die "Failed to create '${TDIR}/usr/lib/udev/rules.d'!"
+
+	local udev_files
+	for udev_file in "${udev_files[@]}"
+	do
+		local dest_file="${TDIR%/}${udev_file/${udevdir}/${udevdir_initramfs}}"
+		cp -aL "${udev_file}" "${dest_file}" \
+			|| gen_die "Failed to copy '${udev_file}' to '${dest_file}'"
+	done
+
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \

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

[Thomas Deutschmann]

commit:     b8bf4c4ae97f8d077a8e6b9cb23593e45d9ea966
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 13:36:31 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 13:47:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b8bf4c4a

gen_configkernel.sh: config_kernel(): Add virtiofs support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/modules_load |  2 +-
 gen_configkernel.sh   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/defaults/modules_load b/defaults/modules_load
index ed5e197..1b85842 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 msdos"
+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"

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 7dbcadd..7840491 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -790,6 +790,18 @@ config_kernel() {
 
 		[ ${KV_NUMERIC} -ge 4010 ] &&
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_DEV_VIRTIO" "${newvirtio_setting}"
+
+		if [ ${KV_NUMERIC} -ge 5004 ]
+		then
+			local cfg_CONFIG_FUSE_FS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FUSE_FS")
+			case "${cfg_CONFIG_FUSE_FS}" in
+				y|m) ;; # Do nothing
+				*) cfg_CONFIG_FUSE_FS=${newvirtio_setting}
+			esac
+
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FUSE_FS" "${cfg_CONFIG_FUSE_FS}"
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_FS" "${cfg_CONFIG_FUSE_FS}"
+		fi
 	fi
 
 	# Microcode setting, intended for early microcode loading, if --microcode

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

[Thomas Deutschmann]

commit:     cf851385321976893fc44c12cc0672ad6e8a9689
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 20:59:09 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cf851385

initramfs: Don't call mknod when --busybox is used

This will basically allow us to run genkernel as user.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc |  8 +++++++
 gen_initramfs.sh | 68 +++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 41a53fc..4113b63 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -9,6 +9,14 @@ splash() {
 
 [ -e /etc/initrd.splash ] && . /etc/initrd.splash
 
+# Basic /dev content, we need it as fast as possible.
+[ ! -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/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
 exec >${CONSOLE} <${CONSOLE} 2>&1
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 8419a20..55cf295 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -178,34 +178,52 @@ log_future_cpio_content() {
 }
 
 append_devices() {
-	local TFILE="${TEMP}/initramfs-base-temp.devices"
-	if [ -f "${TFILE}" ]
+	if isTrue "${BUSYBOX}"
 	then
-		rm "${TFILE}" || gen_die "Failed to clean out existing '${TFILE}'!"
-	fi
+		local TDIR="${TEMP}/initramfs-devices-temp"
+		if [ -d "${TDIR}" ]
+		then
+			rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!"
+		fi
 
-	if [[ ! -x "${KERNEL_OUTPUTDIR}/usr/gen_init_cpio" ]]; then
-		compile_gen_init_cpio
-	fi
+		mkdir -p "${TDIR}/dev" || gen_die "Failed to create '${TDIR}/dev'!"
+		cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
-	# WARNING, does NOT support appending to cpio!
-	cat >"${TFILE}" <<-EOF
-	dir /dev 0755 0 0
-	nod /dev/console 660 0 0 c 5 1
-	nod /dev/null 666 0 0 c 1 3
-	nod /dev/zero 666 0 0 c 1 5
-	nod /dev/tty0 600 0 0 c 4 0
-	nod /dev/tty1 600 0 0 c 4 1
-	nod /dev/ttyS0 600 0 0 c 4 64
-	EOF
+		chmod 0755 dev || gen_die "Failed to chmod of '${TDIR}/dev' to 0755!"
 
-	print_info 3 "=================================================================" 1 0 1
-	print_info 3 "Adding the following devices to cpio:" 1 0 1
-	print_info 3 "$(cat "${TFILE}")" 1 0 1
-	print_info 3 "=================================================================" 1 0 1
+		log_future_cpio_content
+		find . -print0 | cpio ${CPIO_ARGS} -F "${CPIO}" \
+			|| gen_die "Failed to append devices to cpio!"
+	else
+		local TFILE="${TEMP}/initramfs-base-temp.devices"
+		if [ -f "${TFILE}" ]
+		then
+			rm "${TFILE}" || gen_die "Failed to clean out existing '${TFILE}'!"
+		fi
+
+		if [[ ! -x "${KERNEL_OUTPUTDIR}/usr/gen_init_cpio" ]]; then
+			compile_gen_init_cpio
+		fi
 
-	"${KERNEL_OUTPUTDIR}"/usr/gen_init_cpio "${TFILE}" >"${CPIO}" \
-		|| gen_die "Failed to append devices to cpio!"
+		# WARNING, does NOT support appending to cpio!
+		cat >"${TFILE}" <<-EOF
+		dir /dev 0755 0 0
+		nod /dev/console 660 0 0 c 5 1
+		nod /dev/null 666 0 0 c 1 3
+		nod /dev/zero 666 0 0 c 1 5
+		nod /dev/tty0 600 0 0 c 4 0
+		nod /dev/tty1 600 0 0 c 4 1
+		nod /dev/ttyS0 600 0 0 c 4 64
+		EOF
+
+		print_info 3 "=================================================================" 1 0 1
+		print_info 3 "Adding the following devices to cpio:" 1 0 1
+		print_info 3 "$(cat "${TFILE}")" 1 0 1
+		print_info 3 "=================================================================" 1 0 1
+
+		"${KERNEL_OUTPUTDIR}"/usr/gen_init_cpio "${TFILE}" >"${CPIO}" \
+			|| gen_die "Failed to append devices to cpio!"
+	fi
 }
 
 append_base_layout() {
@@ -383,7 +401,7 @@ append_busybox() {
 	done
 
 	# Set up a few default symlinks
-	local required_applets='[ ash sh mount uname echo cut cat'
+	local required_applets='[ ash sh mknod mount uname echo cut cat'
 	local required_applet=
 	for required_applet in ${required_applets}
 	do
@@ -1576,7 +1594,7 @@ create_initramfs() {
 	# TODO: maybe replace this with:
 	# http://search.cpan.org/~pixel/Archive-Cpio-0.07/lib/Archive/Cpio.pm
 	# as then we can dedupe ourselves...
-	if [[ $UID -eq 0 ]]
+	if isTrue "${BUSYBOX}" || [[ ${UID} -eq 0 ]]
 	then
 		print_info 1 "$(get_indent 1)>> Deduping cpio ..."
 		local TDIR="${TEMP}/initramfs-final"

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

[Robin H. Johnson]

commit:     442d7f3e04037dbc233d355e225911e635229767
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  4 05:20:47 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Sep  4 05:20:47 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=442d7f3e

defaults/kernel-generic-config: more virtio options

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

 defaults/kernel-generic-config | 5 +++++
 gen_configkernel.sh            | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 8c2c343..50fa77d 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -467,6 +467,7 @@ CONFIG_BLK_DEV_VIA82CXXX=y
 
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_BLK_SCSI=m
 CONFIG_VIRTIO_RING=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
@@ -476,6 +477,10 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_DRM_VIRTIO_GPU=m
 
 
 #

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 0ca6a11..68c116f 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -207,13 +207,19 @@ config_kernel() {
 			CONFIG_VIRTIO \
 			CONFIG_VIRTIO_BALLOON \
 			CONFIG_VIRTIO_BLK \
+			CONFIG_VIRTIO_BLK_SCSI \
 			CONFIG_VIRTIO_CONSOLE \
 			CONFIG_VIRTIO_INPUT \
 			CONFIG_VIRTIO_MMIO \
 			CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES \
 			CONFIG_VIRTIO_NET \
 			CONFIG_VIRTIO_PCI \
+			CONFIG_VIRTIO_VSOCKETS \
 			\
+			CONFIG_BLK_MQ_VIRTIO \
+			CONFIG_CRYPTO_DEV_VIRTIO \
+			CONFIG_DRM_VIRTIO_GPU \
+			CONFIG_HW_RANDOM_VIRTIO \
 			CONFIG_PARAVIRT_GUEST \
 			CONFIG_SCSI_VIRTIO \
 			CONFIG_VHOST_NET \

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

[Robin H. Johnson]

commit:     054c583f4911bb014c4c0fefb4a5ae4b1be9e617
Author:     Tomasz Wasiak <tjwasiak <AT> poczta <DOT> onet <DOT> pl>
AuthorDate: Mon Dec 30 17:17:28 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=054c583f

Additional source file archive formats support

This patch mainly replaces tar xjf with tar xf as modern tar supports not only bzip2...

(minor tweaks to apply)

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

 defaults/linuxrc     |  2 +-
 gen_compile.sh       | 22 +++++++++++-----------
 gen_determineargs.sh |  2 +-
 gen_initramfs.sh     | 12 ++++++------
 gen_package.sh       | 20 ++++++++++----------
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 7133cd4..66f7bd9 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -851,7 +851,7 @@ FSTAB
 				do
 					tarname=$(basename ${targz})
 					good_msg "Adding additional package ${tarname}"
-					(cd ${NEW_ROOT} ; /bin/tar -xzf ${targz})
+					(cd ${NEW_ROOT} ; /bin/tar -xf ${targz})
 				done
 		fi
 	fi

diff --git a/gen_compile.sh b/gen_compile.sh
index ef72a23..7df0154 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -434,7 +434,7 @@ compile_busybox() {
 	# current .config.
 	if [ -f "${BUSYBOX_BINCACHE}" ]
 	then
-		oldconfig_md5="$(tar -xjf "${BUSYBOX_BINCACHE}" -O .config.gk_orig 2>/dev/null | md5sum)"
+		oldconfig_md5="$(tar -xf "${BUSYBOX_BINCACHE}" -O .config.gk_orig 2>/dev/null | md5sum)"
 		newconfig_md5="$(md5sum < "${TEMP}/busybox-config")"
 		if [ "${oldconfig_md5}" != "${newconfig_md5}" ]
 		then
@@ -452,7 +452,7 @@ compile_busybox() {
 	then
 		cd "${TEMP}"
 		rm -rf "${BUSYBOX_DIR}" > /dev/null
-		/bin/tar -jxpf ${BUSYBOX_SRCTAR} ||
+		/bin/tar -xpf ${BUSYBOX_SRCTAR} ||
 			gen_die 'Could not extract busybox source tarball!'
 		[ -d "${BUSYBOX_DIR}" ] ||
 			gen_die "Busybox directory ${BUSYBOX_DIR} is invalid!"
@@ -475,7 +475,7 @@ compile_busybox() {
 			gen_die 'Busybox executable does not exist!'
 		${UTILS_CROSS_COMPILE}strip "${TEMP}/${BUSYBOX_DIR}/busybox" ||
 			gen_die 'Could not strip busybox binary!'
-		tar -cj -C "${TEMP}/${BUSYBOX_DIR}" -f "${BUSYBOX_BINCACHE}" busybox .config .config.gk_orig ||
+		tar -C "${TEMP}/${BUSYBOX_DIR}" -cjf "${BUSYBOX_BINCACHE}" busybox .config .config.gk_orig ||
 			gen_die 'Could not create the busybox bincache!'
 
 		cd "${TEMP}"
@@ -493,7 +493,7 @@ compile_lvm() {
 			gen_die "Could not find LVM source tarball: ${LVM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"
 		rm -rf ${LVM_DIR} > /dev/null
-		/bin/tar -zxpf ${LVM_SRCTAR} ||
+		/bin/tar -xpf ${LVM_SRCTAR} ||
 			gen_die 'Could not extract LVM source tarball!'
 		[ -d "${LVM_DIR}" ] ||
 			gen_die "LVM directory ${LVM_DIR} is invalid!"
@@ -541,7 +541,7 @@ compile_mdadm() {
 			gen_die "Could not find MDADM source tarball: ${MDADM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"
 		rm -rf "${MDADM_DIR}" > /dev/null
-		/bin/tar -jxpf "${MDADM_SRCTAR}" ||
+		/bin/tar -xpf "${MDADM_SRCTAR}" ||
 			gen_die 'Could not extract MDADM source tarball!'
 		[ -d "${MDADM_DIR}" ] ||
 			gen_die "MDADM directory ${MDADM_DIR} is invalid!"
@@ -580,13 +580,13 @@ compile_dmraid() {
 			gen_die "Could not find DMRAID source tarball: ${DMRAID_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"
 		rm -rf ${DMRAID_DIR} > /dev/null
-		/bin/tar -jxpf ${DMRAID_SRCTAR} ||
+		/bin/tar -xpf ${DMRAID_SRCTAR} ||
 			gen_die 'Could not extract DMRAID source tarball!'
 		[ -d "${DMRAID_DIR}" ] ||
 			gen_die "DMRAID directory ${DMRAID_DIR} is invalid!"
 		rm -rf "${TEMP}/lvm" > /dev/null
 		mkdir -p "${TEMP}/lvm"
-		/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/lvm" ||
+		/bin/tar -xpf "${LVM_BINCACHE}" -C "${TEMP}/lvm" ||
 			gen_die "Could not extract LVM2 binary cache!";
 
 		cd "${DMRAID_DIR}"
@@ -637,7 +637,7 @@ compile_fuse() {
 			gen_die "Could not find fuse source tarball: ${FUSE_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"
 		rm -rf "${FUSE_DIR}"
-		tar -zxpf "${FUSE_SRCTAR}"
+		tar -xpf "${FUSE_SRCTAR}"
 		[ ! -d "${FUSE_DIR}" ] &&
 			gen_die "fuse directory ${FUSE_DIR} invalid"
 		cd "${FUSE_DIR}"
@@ -675,7 +675,7 @@ compile_unionfs_fuse() {
 			gen_die "Could not find unionfs-fuse source tarball: ${UNIONFS_FUSE_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"
 		rm -rf "${UNIONFS_FUSE_DIR}"
-		tar -jxpf "${UNIONFS_FUSE_SRCTAR}"
+		tar -xpf "${UNIONFS_FUSE_SRCTAR}"
 		[ ! -d "${UNIONFS_FUSE_DIR}" ] &&
 			gen_die "unionfs-fuse directory ${UNIONFS_FUSE_DIR} invalid"
 		cd "${UNIONFS_FUSE_DIR}"
@@ -707,7 +707,7 @@ compile_iscsi() {
 			gen_die "Could not find iSCSI source tarball: ${ISCSI_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"
 		rm -rf "${ISCSI_DIR}"
-		tar -zxpf "${ISCSI_SRCTAR}"
+		tar -xpf "${ISCSI_SRCTAR}"
 		[ ! -d "${ISCSI_DIR}" ] &&
 			gen_die "ISCSI directory ${ISCSI_DIR} invalid"
 				print_info 1 'iSCSI: >> Compiling...'
@@ -762,7 +762,7 @@ compile_gpg() {
 			gen_die "Could not find gnupg source tarball: ${GPG_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"
 		rm -rf "${GPG_DIR}"
-		tar -jxf "${GPG_SRCTAR}"
+		tar -xf "${GPG_SRCTAR}"
 		[ ! -d "${GPG_DIR}" ] &&
 			gen_die "gnupg directory ${GPG_DIR} invalid"
 		cd "${GPG_DIR}"

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index cae8c66..23084a1 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -4,7 +4,7 @@
 get_KV() {
 	if [ "${KERNEL_SOURCES}" = '0' -a -e "${KERNCACHE}" ]
 	then
-		/bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config
+		/bin/tar -x -C ${TEMP} -f ${KERNCACHE} kerncache.config
 		if [ -e ${TEMP}/kerncache.config ]
 		then
 			VER=`grep ^VERSION\ \= ${TEMP}/kerncache.config | awk '{ print $3 };'`

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 612ae86..8bbaa2c 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -143,7 +143,7 @@ append_busybox() {
 	fi
 
 	mkdir -p "${TEMP}/initramfs-busybox-temp/bin/"
-	tar -xjf "${BUSYBOX_BINCACHE}" -C "${TEMP}/initramfs-busybox-temp/bin" busybox ||
+	tar -xf "${BUSYBOX_BINCACHE}" -C "${TEMP}/initramfs-busybox-temp/bin" busybox ||
 		gen_die 'Could not extract busybox bincache!'
 	chmod +x "${TEMP}/initramfs-busybox-temp/bin/busybox"
 
@@ -224,7 +224,7 @@ append_blkid(){
 #	fi
 #	cd ${TEMP}
 #	mkdir -p "${TEMP}/initramfs-fuse-temp/lib/"
-#	tar -C "${TEMP}/initramfs-fuse-temp/lib/" -xjf "${FUSE_BINCACHE}"
+#	tar -C "${TEMP}/initramfs-fuse-temp/lib/" -xf "${FUSE_BINCACHE}"
 #	cd "${TEMP}/initramfs-fuse-temp/"
 #	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 #			|| gen_die "compressing fuse cpio"
@@ -257,7 +257,7 @@ append_unionfs_fuse() {
 #	print_info 1 'SUSPEND: Adding support (compiling binaries)...'
 #	compile_suspend
 #	mkdir -p "${TEMP}/initramfs-suspend-temp/"
-#	/bin/tar -jxpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initramfs-suspend-temp" ||
+#	/bin/tar -xpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initramfs-suspend-temp" ||
 #		gen_die "Could not extract suspend binary cache!"
 #	mkdir -p "${TEMP}/initramfs-suspend-temp/etc"
 #	cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" ||
@@ -316,7 +316,7 @@ append_dmraid(){
 	print_info 1 'DMRAID: Adding support (compiling binaries)...'
 	compile_dmraid
 	mkdir -p "${TEMP}/initramfs-dmraid-temp/"
-	/bin/tar -jxpf "${DMRAID_BINCACHE}" -C "${TEMP}/initramfs-dmraid-temp" ||
+	/bin/tar -xpf "${DMRAID_BINCACHE}" -C "${TEMP}/initramfs-dmraid-temp" ||
 		gen_die "Could not extract dmraid binary cache!";
 	[ -x /sbin/dmsetup -a -x /sbin/kpartx ] && copy_binaries \
 		"${TEMP}/initramfs-dmraid-temp/" \
@@ -390,7 +390,7 @@ append_lvm(){
 	else
 		print_info 1 '          LVM: Adding support (compiling binaries)...'
 		compile_lvm || gen_die "Could not compile LVM"
-		/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" ||
+		/bin/tar -xpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" ||
 			gen_die "Could not extract lvm binary cache!";
 		# Remove any dynamic binaries that exist, so the rest of the code will
 		# fail better if something is missing
@@ -462,7 +462,7 @@ append_mdadm(){
 		else
 			print_info 1 '		MDADM: Adding support (compiling binaries)...'
 			compile_mdadm
-			/bin/tar -jxpf "${MDADM_BINCACHE}" -C "${TEMP}/initramfs-mdadm-temp" ||
+			/bin/tar -xpf "${MDADM_BINCACHE}" -C "${TEMP}/initramfs-mdadm-temp" ||
 				gen_die "Could not extract mdadm binary cache!";
 		fi
 	fi

diff --git a/gen_package.sh b/gen_package.sh
index b08ff03..d82322f 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -7,13 +7,13 @@ gen_minkernpackage() {
 	mkdir "${TEMP}/minkernpackage" || gen_die 'Could not make a directory for the kernel package!'
 	if [ "${KERNCACHE}" != "" ]
 	then
-		/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} kernel-${ARCH}-${KV}
+		/bin/tar -x -C ${TEMP}/minkernpackage -f ${KERNCACHE} kernel-${ARCH}-${KV}
 		mv minkernpackage/{kernel-${ARCH}-${KV},kernel-${KNAME}-${ARCH}-${KV}}
-		/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} config-${ARCH}-${KV}
+		/bin/tar -x -C ${TEMP}/minkernpackage -f ${KERNCACHE} config-${ARCH}-${KV}
 		mv minkernpackage/{config-${ARCH}-${KV},config-${KNAME}-${ARCH}-${KV}}
 		if isTrue "${GENZIMAGE}"
 		then
-			/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} kernelz-${ARCH}-${KV}
+			/bin/tar -x -C ${TEMP}/minkernpackage -f ${KERNCACHE} kernelz-${ARCH}-${KV}
 			mv minkernpackage/{kernelz-${ARCH}-${KV},kernelz-${KNAME}-${ARCH}-${KV}}
 		fi
 		if [ ! -f minkernpackage/kernel-${KNAME}-${ARCH}-${KV} \
@@ -44,7 +44,7 @@ gen_minkernpackage() {
 
 	if [ "${KERNCACHE}" != "" ]
 	then
-		/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV}
+		/bin/tar -x -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV}
 		mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} ||
 			gen_die 'Could not copy System.map from kerncache for the kernel package!'
 	else
@@ -123,7 +123,7 @@ gen_kerncache()
 
 gen_kerncache_extract_kernel()
 {
-	/bin/tar -f ${KERNCACHE} -C ${TEMP} -xj
+	/bin/tar -xf ${KERNCACHE} -C ${TEMP}
 	copy_image_with_preserve "kernel" \
 		"${TEMP}/kernel-${ARCH}-${KV}" \
 		"kernel-${KNAME}-${ARCH}-${KV}"
@@ -147,9 +147,9 @@ gen_kerncache_extract_modules()
 		print_info 1 'Extracting kerncache kernel modules'
         	if [ "${INSTALL_MOD_PATH}" != '' ]
 		then
-			/bin/tar -xjf ${KERNCACHE} --strip-components 1 -C ${INSTALL_MOD_PATH}/lib
+			/bin/tar -xf ${KERNCACHE} --strip-components 1 -C ${INSTALL_MOD_PATH}/lib
 		else
-			/bin/tar -xjf ${KERNCACHE} --strip-components 1 -C /lib
+			/bin/tar -xf ${KERNCACHE} --strip-components 1 -C /lib
 		fi
 	fi
 }
@@ -160,7 +160,7 @@ gen_kerncache_extract_config()
 	then
 		print_info 1 'Extracting kerncache config to /etc/kernels'
 		mkdir -p /etc/kernels
-        	/bin/tar -xjf ${KERNCACHE} -C /etc/kernels config-${ARCH}-${KV}
+        	/bin/tar -xf ${KERNCACHE} -C /etc/kernels config-${ARCH}-${KV}
 		mv /etc/kernels/config-${ARCH}-${KV} /etc/kernels/kernel-config-${ARCH}-${KV}
 	fi
 }
@@ -174,7 +174,7 @@ gen_kerncache_is_valid()
 		BUILD_KERNEL=0
 		# Can make this more secure ....
 
-		/bin/tar -xj -f ${KERNCACHE} -C ${TEMP}
+		/bin/tar -xf ${KERNCACHE} -C ${TEMP}
 		if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${TEMP}/kernel-${ARCH}-${KV} ]
 		then
 			print_info 1 'Valid kernel cache found; no sources will be used'
@@ -189,7 +189,7 @@ gen_kerncache_is_valid()
 				KERNEL_CONFIG="${CMD_KERNEL_CONFIG}"
 			fi
 
-			/bin/tar -xj -f ${KERNCACHE} -C ${TEMP}
+			/bin/tar -xf ${KERNCACHE} -C ${TEMP}
 			if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${KERNEL_CONFIG} ]
 			then
 

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

[Robin H. Johnson]

commit:     11a3470508a6475a5fee00f26ccbd7a98b4f9e01
Author:     Sebastian Bauer <sebastian.j.bauer <AT> gmail <DOT> com>
AuthorDate: Thu Aug 21 21:19:16 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 23:49:45 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=11a34705

FL-1476: Add support for remote decryption of luks devices via dropbear

(cherry picked from commit 1886bbafecca1c225646e8d297bbb522caedfd9b)
Closes: https://bugs.gentoo.org/show_bug.cgi?id=440126
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts  |  42 ++++++++++++++--
 defaults/login-remote.sh | 127 +++++++++++++++++++++++++++++++++++++++++++++++
 gen_initramfs.sh         |  72 +++++++++++++++++++++++++++
 genkernel.conf           |   3 ++
 4 files changed, 241 insertions(+), 3 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 1ee1699..17166e4 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -752,7 +752,7 @@ prompt_user(){
 	bad_msg '- type "shell" for a shell'
 	bad_msg '- type "q" to skip...'
 	printf "%s" "${2}(${oldvalue}) :: "
-	read ${1}
+	read -t 10 ${1}
 	case `eval echo '$'${1}` in
 		'q')
 			eval ${1}'='${oldvalue}
@@ -1169,7 +1169,7 @@ openLUKS() {
 
 	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$1" 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=''
+	local mntkey="/mnt/key/" cryptsetup_options='' flag_opened="/${TYPE}.decrypted"
 
 	[ ! -e /sbin/cryptsetup ] && bad_msg "The ramdisk does not support LUKS" && exit 1
 	while [ 1 ]
@@ -1191,6 +1191,10 @@ 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}")
 
@@ -1284,6 +1288,8 @@ openLUKS() {
 				crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
 				crypt_filter_ret=$?
 
+				touch ${flag_opened}
+
 				[ -e /dev/tty.org ] \
 					&& rm -f /dev/tty \
 					&& mv /dev/tty.org /dev/tty
@@ -1307,7 +1313,12 @@ openLUKS() {
 
 startLUKS() {
 
-	# if key is set but key device isn't, find it
+	# if key is set but neither ssh enabled or key device is given, find
+	# the key device
+	
+	if [ -e "/usr/sbin/dropbear" ]; then
+		startdropbear
+	fi
 
 	[ -n "${CRYPT_ROOT_KEY}" ] && [ -z "${CRYPT_ROOT_KEYDEV}" ] \
 		&& sleep 6 && bootstrapKey "ROOT"
@@ -1335,6 +1346,31 @@ startLUKS() {
 			REAL_RESUME="/dev/mapper/swap"
 		fi
 	fi
+
+	if [ -e "/usr/sbin/dropbear" ]; then
+		/bin/kill $(cat /var/run/dropbear.pid)
+		/sbin/ifconfig $(echo "${IP}" | awk -F":" '{print $6}' ) 0.0.0.0
+	fi
+
+	if [ -e /root.decrypted ]; then
+		rm /root.decrypted
+	fi
+
+	if [ -e /swap.decrypted ]; then
+		rm /swap.decrypted
+	fi
+}
+
+startdropbear() {
+	if [ "${IP}" == '' ] ; then
+		busybox udhcpc -n -T 15 -q
+	fi
+
+	# setup environment variables for the ssh login shell
+	echo "CRYPT_ROOT=${CRYPT_ROOT}" >  /etc/login-remote.conf
+	echo "CRYPT_SWAP=${CRYPT_SWAP}" >> /etc/login-remote.conf
+	touch /var/log/lastlog
+	/usr/sbin/dropbear
 }
 
 sdelay() {

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
new file mode 100644
index 0000000..630d484
--- /dev/null
+++ b/defaults/login-remote.sh
@@ -0,0 +1,127 @@
+#!/bin/sh
+
+. /etc/login-remote.conf
+. /etc/initrd.defaults
+. /etc/initrd.scripts
+KEYFILE_ROOT="/tmp/root.key"
+KEYFILE_SWAP="/tmp/swap.key"
+
+splash() {
+	return 0
+}
+
+[ -e /etc/initrd.splash ] && . /etc/initrd.splash
+
+receivefile() {
+	case ${1} in
+		root)
+			file=${KEYFILE_ROOT}
+			;;
+		swap)
+			file=${KEYFILE_SWAP}
+			;;
+	esac
+	# limit maximum stored bytes to 1M to avoid killing the server
+	dd of=${file} count=1k bs=1k 2>/dev/null
+	exit $?
+}
+
+openLUKSremote() {
+	case $1 in
+		root)
+			local TYPE=ROOT
+			;;
+		swap)
+			local TYPE=SWAP
+			;;
+	esac
+	
+	[ ! -d /tmp/key ] && mkdir -p /tmp/key
+	
+	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$1" LUKS_KEY='"${KEYFILE_'${TYPE}'}"'
+	local DEV_ERROR=0 KEY_ERROR=0
+	local input="" cryptsetup_options="" flag_opened="/${TYPE}.decrypted"
+	while [ 1 ]
+	do
+		local gpg_cmd="" crypt_filter_ret=42
+		echo $-
+		sleep 1
+
+		if [ -e ${flag_opened} ]
+		then
+			good_msg "The LUKS device ${LUKS_DEVICE} meanwhile was opened by someone else."
+			break
+		elif [ ${DEV_ERROR} -eq 1 ]
+		then
+			prompt_user "LUKS_DEVICE" "${LUKS_NAME}"
+			DEV_ERROR=0
+		else
+			LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}")
+
+			setup_md_device ${LUKS_DEVICE}
+			cryptsetup isLuks ${LUKS_DEVICE}
+			if [ $? -ne 0 ]
+			then
+				bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" ${CRYPT_SILENT}
+				DEV_ERROR=1
+				continue
+			else
+				# Handle keys
+				if [ "x${LUKS_TRIM}" = "xyes" ]
+				then
+					good_msg "Enabling TRIM support for ${LUKS_NAME}." ${CRYPT_SILENT}
+					cryptsetup_options="${cryptsetup_options} --allow-discards"
+				fi
+
+				if [ ${crypt_filter_ret} -ne 0 ]
+				then
+					# 1st try: unencrypted keyfile
+					crypt_filter "cryptsetup ${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
+					crypt_filter_ret=$?
+
+					if [ ${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
+				fi
+
+				if [ ${crypt_filter_ret} -eq 0 ]
+				then
+					touch ${flag_opened}
+					good_msg "LUKS device ${LUKS_DEVICE} opened" ${CRYPT_SILENT}
+					break
+				else
+					bad_msg "Failed to open LUKS device ${LUKS_DEVICE}" ${CRYPT_SILENT}
+					DEV_ERROR=1
+				fi
+			fi
+		fi
+	done
+	rm -f ${LUKS_KEY}
+	cd /
+	rmdir -p tmp/key
+}
+
+if [ "x${1}" = "x-c" ]
+then
+	command=$(echo ${2} | awk -F" " '{print $1}')
+	type=$(echo ${2} | awk -F" " '{print $2}')
+
+	case ${command} in 
+		post)
+			receivefile ${type}
+			;;
+	esac
+else
+	[ -n "${CRYPT_ROOT}" ] && openLUKSremote root
+	[ -n "${CRYPT_SWAP}" ] && openLUKSremote swap
+fi

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 10108fb..e81b477 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -632,6 +632,77 @@ append_luks() {
 	rm -r "${TEMP}/initramfs-luks-temp/"
 }
 
+append_dropbear(){
+	if [ -d "${TEMP}"/initramfs-dropbear-temp ]
+	then
+		rm -r "${TEMP}"/initramfs-dropbear-temp
+	fi
+
+	if [ ! -d /etc/dropbear ]
+	then
+		mkdir /etc/dropbear
+	fi
+	if [ ! -e /etc/dropbear/dropbear_rsa_host_key ]
+	then
+		if [ -e /usr/bin/dropbearconvert -a /etc/ssh/ssh_host_rsa_key ]
+		then
+			/usr/bin/dropbearconvert openssh dropbear /etc/ssh/ssh_host_rsa_key /etc/dropbear/dropbear_rsa_host_key
+		else
+			/usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key -s 4096 > /dev/null
+		fi
+	fi
+	
+	if [ ! -e /etc/dropbear/dropbear_dss_host_key ]
+	then
+		/usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null
+	fi
+
+	cd "${TEMP}" \
+                || gen_die "cd '${TEMP}' failed"
+	mkdir -p ${TEMP}/initramfs-dropbear-temp/var/run
+	mkdir -p ${TEMP}/initramfs-dropbear-temp/var/log
+	mkdir -p ${TEMP}/initramfs-dropbear-temp/etc/dropbear
+	mkdir -p ${TEMP}/initramfs-dropbear-temp/bin
+	mkdir -p ${TEMP}/initramfs-dropbear-temp/root/.ssh
+
+	cp -L ${GK_SHARE}/defaults/login-remote.sh ${TEMP}/initramfs-dropbear-temp/bin/
+	cp -L /etc/dropbear/{dropbear_rsa_host_key,dropbear_dss_host_key} ${TEMP}/initramfs-dropbear-temp/etc/dropbear/
+	cp -L /etc/dropbear/authorized_keys ${TEMP}/initramfs-dropbear-temp/root/.ssh
+	cp -L /etc/localtime ${TEMP}/initramfs-dropbear-temp/etc/
+	if [ ${ARCH} = "x86_64" ]
+	then
+		mkdir -p ${TEMP}/initramfs-dropbear-temp/lib64
+		cp -L /lib64/libnss_files.so.2 ${TEMP}/initramfs-dropbear-temp/lib64/
+	else
+		mkdir -p ${TEMP}/initramfs-dropbear-temp/lib
+		cp -L /lib/libnss_files.so.2 ${TEMP}/initramfs-dropbear-temp/lib/
+	fi
+	
+	sed "s/compat/files/g" /etc/nsswitch.conf > ${TEMP}/initramfs-dropbear-temp/etc/nsswitch.conf
+	echo "root:x:0:0:root:/root:/bin/login-remote.sh" > ${TEMP}/initramfs-dropbear-temp/etc/passwd
+	echo "/bin/login-remote.sh" > ${TEMP}/initramfs-dropbear-temp/etc/shells
+	echo "root:!:0:0:99999:7:::" > ${TEMP}/initramfs-dropbear-temp/etc/shadow
+	echo "root:x:0:root" > ${TEMP}/initramfs-dropbear-temp/etc/group
+	echo "" > ${TEMP}/initramfs-dropbear-temp/var/log/lastlog
+
+	chmod 0755 ${TEMP}/initramfs-dropbear-temp/bin/login-remote.sh
+	chmod 0700 ${TEMP}/initramfs-dropbear-temp/root/.ssh
+	chmod 0640 ${TEMP}/initramfs-dropbear-temp/etc/shadow
+	chmod 0644 ${TEMP}/initramfs-dropbear-temp/etc/passwd
+	chmod 0644 ${TEMP}/initramfs-dropbear-temp/etc/group
+	mkfifo ${TEMP}/initramfs-dropbear-temp/etc/dropbear/fifo_root
+	mkfifo ${TEMP}/initramfs-dropbear-temp/etc/dropbear/fifo_swap
+	
+	copy_binaries "${TEMP}"/initramfs-dropbear-temp/ /usr/sbin/dropbear \
+		/bin/login /usr/bin/passwd
+	
+	log_future_cpio_content
+	cd "${TEMP}"/initramfs-dropbear-temp \
+		|| gen_die "cd '${TEMP}/initramfs-dropbear-temp' failed"
+	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+	rm -rf "${TEMP}"/initramfs-dropbear-temp > /dev/null
+}
+
 append_firmware() {
 	if [ -z "${FIRMWARE_FILES}" -a ! -d "${FIRMWARE_DIR}" ]
 	then
@@ -882,6 +953,7 @@ create_initramfs() {
 	append_data 'iscsi' "${ISCSI}"
 	append_data 'mdadm' "${MDADM}"
 	append_data 'luks' "${LUKS}"
+	append_data 'dropbear' "${SSH}"
 	append_data 'multipath' "${MULTIPATH}"
 	append_data 'gpg' "${GPG}"
 

diff --git a/genkernel.conf b/genkernel.conf
index a95978d..d8f4ede 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -83,6 +83,9 @@ USECOLOR="yes"
 # Add DMRAID support.
 #DMRAID="no"
 
+# Add SSH support.
+#SSH="no"
+
 # Include (or suppresses the inclusion of) busybox in the initrd or initramfs.
 # If included, busybox is rebuilt if the cached copy is out of date.
 #BUSYBOX="yes"

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

[Robin H. Johnson]

commit:     fcc197b3b552eacf3d4928ef9cb777ff3d411ddc
Author:     Markus Lidel <Markus.Lidel <AT> shadowconnect <DOT> com>
AuthorDate: Mon Jan  2 23:21:29 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 23:21:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fcc197b3

dmraid: fix booting from a GPT partition on a dmraid.

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

 defaults/initrd.scripts | 1 +
 gen_initramfs.sh        | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4b0bbad..31ebeec 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1002,6 +1002,7 @@ startVolumes() {
 			else
 				/sbin/dmraid -ay ${DMRAID_OPTS}
 			fi
+			[ -x '/sbin/kpartx' ] && /sbin/dmsetup ls --exec '/sbin/kpartx -a -s'
 		fi
 	fi
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index afbef92..10108fb 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -318,6 +318,9 @@ append_dmraid(){
 	mkdir -p "${TEMP}/initramfs-dmraid-temp/"
 	/bin/tar -jxpf "${DMRAID_BINCACHE}" -C "${TEMP}/initramfs-dmraid-temp" ||
 		gen_die "Could not extract dmraid binary cache!";
+	[ -x /sbin/dmsetup -a -x /sbin/kpartx ] && copy_binaries \
+		"${TEMP}/initramfs-dmraid-temp/" \
+		/sbin/{kpartx,dmsetup}
 	cd "${TEMP}/initramfs-dmraid-temp/"
 	module_ext=$(modules_kext)
 	RAID456=`find . -type f -name raid456${module_ext}`

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

[Robin H. Johnson]

commit:     c31abf34278eef8f68585aa6b458ad7a5b4b535c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 06:18:41 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 06:18:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c31abf34

gen_configkernel: bug #486366, fix virtio kconfig options.

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

 defaults/kernel-generic-config |  3 +++
 gen_configkernel.sh            | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 7b8826d..aa4f11b 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -474,6 +474,9 @@ CONFIG_VIRTIO_NET=m
 CONFIG_VMXNET3=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_VIRTIO_CONSOLE=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
 
 #
 # SCSI device support

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 7e74f32..390a6da 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -162,9 +162,20 @@ config_kernel() {
 	if isTrue ${CMD_VIRTIO}
 	then
 		for k in \
-			CONFIG_PARAVIRT_GUEST CONFIG_VIRTIO_PCI CONFIG_VIRTIO_BALLOON \
-			CONFIG_VIRTIO_MMIO CONFIG_VIRTIO_BLK CONFIG_SCSI_VIRTIO \
-			CONFIG_VIRTIO_NET CONFIG_VHOST_NET ; do
+			CONFIG_VIRTIO \
+			CONFIG_VIRTIO_BALLOON \
+			CONFIG_VIRTIO_BLK \
+			CONFIG_VIRTIO_CONSOLE \
+			CONFIG_VIRTIO_INPUT \
+			CONFIG_VIRTIO_MMIO \
+			CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES \
+			CONFIG_VIRTIO_NET \
+			CONFIG_VIRTIO_PCI \
+			\
+			CONFIG_PARAVIRT_GUEST \
+			CONFIG_SCSI_VIRTIO \
+			CONFIG_VHOST_NET \
+			; do
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "y"
 		done
 	fi

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

[Robin H. Johnson]

commit:     7316481040d27ac85c5663b51c74d5547671166f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 19:33:50 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 19:33:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=73164810

lvm: be more robust in build & init

Commit ed52f905b6 was a good start, but missed that the cleanup nuked
the moved file. Improve the unpacking as well as usage of the LVM binary
to be much safer, and give useful errors if something is not as it
should be.

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

 defaults/initrd.scripts | 17 ++++++++++-------
 gen_initramfs.sh        | 13 ++++++++++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 1bab361..94cb0cc 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -985,17 +985,22 @@ startVolumes() {
 
 	if [ "${USE_LVM_NORMAL}" = '1' ]
 	then
-		if [ -x '/sbin/lvm' ]
+		for lvm_path in /sbin/lvm /bin/lvm MISSING ; do
+			[ -x "$lvm_path" ] && break
+		fi
+		if [ "${lvm_path}" = "MISSING" ]
 		then
+			bad_msg "dolvm invoked, but LVM binary not available! skipping LVM volume group activation!"
+		else
 			for dev in ${RAID_DEVICES}
 			do
 				setup_md_device "${dev}"
 			done
 
-			# This is needed for /sbin/lvm to accept the following logic
-			lvm_commands="#! /sbin/lvm"
+			# This is needed for LVM to accept the following logic
+			lvm_commands="#! ${lvm_path}"
 
-			# If there is a cahe, update it. Unbreak at least dmcrypt
+			# If there is a cache, update it. Unbreak at least dmcrypt
 			[ -d /etc/lvm/cache ] && lvm_commands="${lvm_commands} \nvgscan"
 
 			# To activate volumegroups on all devices in the cache
@@ -1008,9 +1013,7 @@ startVolumes() {
 
 			# And finally execute it all (/proc/... needed if lvm is compiled without readline)
 			good_msg "Scanning for and activating Volume Groups"
-			printf "%b\n" "${lvm_commands}" | /sbin/lvm /proc/self/fd/0
-		else
-			bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
+			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0
 		fi
 	fi
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9c9dfec..7dce2cf 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -366,13 +366,24 @@ append_lvm(){
 		compile_lvm || gen_die "Could not compile LVM"
 		/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" ||
 			gen_die "Could not extract lvm binary cache!";
+		# Remove any dynamic binaries that exist, so the rest of the code will
+		# fail better if something is missing
+		for f in ${TEMP}/initramfs-lvm-temp/{bin,sbin}/* ; do
+			[ -x "$f" ] && LC_ALL="C" ldd $f | grep -sq '(' && rm -f "$f"
+		done
+		# Now move the static binaries into good places.
 		mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-temp/sbin/lvm ||
 			gen_die 'LVM error: Could not move lvm.static to lvm!'
 		# See bug 382555
 		mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup ||
 			gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
-		rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}
+		# Clean up other stuff we don't need
+		rm -rf ${TEMP}/initramfs-lvm-temp/{lib*,share,man,include,sbin/dmeventd.static}
 	fi
+	# Include a symlink in the old location, for people with other appended
+	# scripts that might look for it in the old location.
+	ln -s ../sbin/lvm "${TEMP}/initramfs-lvm-temp/bin/lvm"
+	# Include the LVM config now
 	if [ -x /sbin/lvm -o -x /bin/lvm ]
 	then
 #		lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'

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

[Robin H. Johnson]

commit:     19d8a784c9618926a4740c43fcc40ebb1bb5bf8b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 19:35:01 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 19:37:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=19d8a784

multipath: find the needed binaries and fail visibly

While making dolvm safer per commit 7316481040, I noticed that multipath
had the same issue: /sbin/dmsetup was called, but the binary was
actually at /bin/dmsetup. Prevent this by detecting the binary location
if possible, and failing gracefully if not found.

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

 defaults/initrd.scripts | 28 ++++++++++++++++++++++------
 gen_initramfs.sh        |  4 ++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 94cb0cc..763468a 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -961,12 +961,28 @@ startVolumes() {
 
 	if [ "${USE_MULTIPATH_NORMAL}" = '1' ] 
 	then 
-		good_msg "Scanning for multipath devices" 
-		/sbin/multipath -v 0
-		sleep 2
-		good_msg "Activating multipath devices" 
-		/sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -v" 
-		#for MULTIPATH_VOLUMES in /dev/mapper/*; do kpartx -a $MULTIPATH_VOLUMES; done
+		for multipath_path in /sbin/multipath /bin/multipath MISSING ; do
+			[ -x "$multipath_path " ] && break
+		fi
+		for dmsetup_path in /sbin/dmsetup /bin/dmsetup MISSING ; do
+			[ -x "$dmsetup_path " ] && break
+		fi
+		for kpartx_path in /sbin/kpartx /bin/kpartx MISSING ; do
+			[ -x "$kpartx_path " ] && break
+		fi
+		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"
+		["${kpartx_path}" = "MISSING" ] && fail=1 && bad_msg "domultipath called, but kpartx binary missing! Skipping multipath"
+		if [ "$fail" = "0" ]
+		then
+			good_msg "Scanning for multipath devices"
+			$multipath_path  -v 0
+			sleep 2
+			good_msg "Activating multipath devices"
+			$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 
 
 	if [ "${USE_DMRAID_NORMAL}" = '1' ]

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 7dce2cf..4420b0b 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -374,8 +374,8 @@ append_lvm(){
 		# Now move the static binaries into good places.
 		mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-temp/sbin/lvm ||
 			gen_die 'LVM error: Could not move lvm.static to lvm!'
-		# See bug 382555
-		mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup ||
+		# See bug 382555; use /sbin/dmsetup to match multipath code
+		mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/sbin/dmsetup ||
 			gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
 		# Clean up other stuff we don't need
 		rm -rf ${TEMP}/initramfs-lvm-temp/{lib*,share,man,include,sbin/dmeventd.static}

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

[Richard Yao]

commit:     ddf2c5b934da598d33f4db0457cc8806f86bba2d
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 23:40:28 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=ddf2c5b9

Fix /etc/modprobe.d regression

Commit 3a054014e880e5b1ff28e3d87767c45a073da6b5 replaced our modprobe
with busybox's modprobe, which broke the code responsible for making
options from /etc/modprobe.d work. We replace the old mechanism with a
new one that copies /etc/modprobe.d to correct that.

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

---
 defaults/linuxrc |  7 -------
 gen_initramfs.sh | 20 ++------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4bbe5e2..9ea305b 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -262,13 +262,6 @@ do
 		nounionfs)
 			USE_UNIONFS_NORMAL=0
 			;;
-		*=*)
-			case "${x%%=*}" in
-			*.*)
-				echo "${x#*.}" >> "/etc/module_options/${x%%.*}.conf"
-			;;
-			esac
-		;;
 	esac
 done
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 784c0cc..427ffad 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -625,24 +625,8 @@ append_modprobed() {
 		rm -r "${TDIR}"
 	fi
 
-	mkdir -p "${TDIR}/etc/module_options/"
-
-	# Load module parameters
-	for dir in $(find "${MODPROBEDIR}"/*)
-	do
-		while read x
-		do
-			case "${x}" in
-				options*)
-					module_name="$(echo "$x" | cut -d ' ' -f 2)"
-					[ "${module_name}" != "$(echo)" ] || continue
-					module_options="$(echo "$x" | cut -d ' ' -f 3-)"
-					[ "${module_options}" != "$(echo)" ] || continue
-					echo "${module_options}" >> "${TDIR}/etc/module_options/${module_name}.conf"
-				;;
-			esac
-		done < "${dir}"
-	done
+	mkdir -p "${TDIR}/etc"
+	cp -r "/etc/modprobe.d" "${TDIR}/etc/modprobe.d"
 
 	cd "${TDIR}"
 	log_future_cpio_content

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

[Richard Yao]

commit:     ddf2c5b934da598d33f4db0457cc8806f86bba2d
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 23:40:28 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=ddf2c5b9

Fix /etc/modprobe.d regression

Commit 3a054014e880e5b1ff28e3d87767c45a073da6b5 replaced our modprobe
with busybox's modprobe, which broke the code responsible for making
options from /etc/modprobe.d work. We replace the old mechanism with a
new one that copies /etc/modprobe.d to correct that.

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

---
 defaults/linuxrc |  7 -------
 gen_initramfs.sh | 20 ++------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4bbe5e2..9ea305b 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -262,13 +262,6 @@ do
 		nounionfs)
 			USE_UNIONFS_NORMAL=0
 			;;
-		*=*)
-			case "${x%%=*}" in
-			*.*)
-				echo "${x#*.}" >> "/etc/module_options/${x%%.*}.conf"
-			;;
-			esac
-		;;
 	esac
 done
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 784c0cc..427ffad 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -625,24 +625,8 @@ append_modprobed() {
 		rm -r "${TDIR}"
 	fi
 
-	mkdir -p "${TDIR}/etc/module_options/"
-
-	# Load module parameters
-	for dir in $(find "${MODPROBEDIR}"/*)
-	do
-		while read x
-		do
-			case "${x}" in
-				options*)
-					module_name="$(echo "$x" | cut -d ' ' -f 2)"
-					[ "${module_name}" != "$(echo)" ] || continue
-					module_options="$(echo "$x" | cut -d ' ' -f 3-)"
-					[ "${module_options}" != "$(echo)" ] || continue
-					echo "${module_options}" >> "${TDIR}/etc/module_options/${module_name}.conf"
-				;;
-			esac
-		done < "${dir}"
-	done
+	mkdir -p "${TDIR}/etc"
+	cp -r "/etc/modprobe.d" "${TDIR}/etc/modprobe.d"
 
 	cd "${TDIR}"
 	log_future_cpio_content

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

[Fabio Erculiani]

commit:     3a054014e880e5b1ff28e3d87767c45a073da6b5
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Apr 23 15:21:53 2013 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 07:19:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3a054014

Drop our own /sbin/modprobe and use busybox built-in applet instead

Our modprobe is an ancient heritage from the past, probably dating to
a time where busybox's modprobe features were limited. There is no reason
at all to keep using our own version instead of the busybox one.
This commit also makes modules_scan 15% faster.

---
 defaults/initrd.defaults |    8 +--
 defaults/initrd.scripts  |   35 ++++++-----
 defaults/modprobe        |  147 ----------------------------------------------
 gen_initramfs.sh         |   25 +++++---
 4 files changed, 36 insertions(+), 179 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 90f73f4..8ff5510 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -58,13 +58,7 @@ fi
 QUIET='1'
 ROOT_LINKS='bin sbin lib lib32 lib64 boot usr opt emul'
 ROOT_TREES='etc root home var'
-INSMOD='insmod'
-if [ "${KMAJOR}" -ge 3 ] || [ "${KMAJOR}" -eq 2 -a "${KMINOR}" -gt '4' ]
-then
-	KSUFF='.ko'
-else
-	KSUFF='.o'
-fi
+KSUFF='.ko'
 
 REAL_ROOT=''
 CONSOLE='/dev/console'

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2e8e744..7ec5c94 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2,10 +2,6 @@
 
 . /etc/initrd.defaults
 
-backup() {
-	echo -ne "\033[0G\033[0K"
-}
-
 modules_load() {
 	for module in $*
 	do
@@ -17,30 +13,37 @@ modules_load() {
 
 modules_scan() {
 	local MODS
-	[ -d "/etc/modules/${1}" ] || touch /etc/modules/${1}
+	local loaded
+
+	MODS=$(cat /etc/modules/${1} 2>/dev/null)
+	[ -n "${MODS}" ] && echo -ne "${BOLD}   ::${NORMAL} "
+	[ -n "${MODS}" ] && echo -ne "Loading from ${1}: "
 
-	[ -f "/etc/modules/${1}" ] && MODS=`cat /etc/modules/${1}`
 	for x in ${MODS}
 	do
-		MLOAD=`echo ${MLIST} | sed -e "s/.*${x}.*/${x}/"`
+		MLOAD=$(echo ${MLIST} | sed -e "s/.*${x}.*/${x}/")
 		if [ "${MLOAD}" = "${x}" ] # Only module to no-load
 		then
 			echo -e "${BOLD}   ::${NORMAL} Skipping ${x}..."
-		elif [ "${MLOAD}" = "${MLIST}" ] # == No change == No specified no-load
+		elif [ "${MLOAD}" = "${MLIST}" ]
 		then
-			[ -n "${DEBUG}" ] && echo -ne "${BOLD}   ::${NORMAL} Checking for ${x}..."
-			# find -name does not work since the return status is always zero
-			if find /lib/modules/${KV} | grep /"${x}${KSUFF}" >/dev/null 2>&1
-			then
-				echo -ne "${BOLD}   ::${NORMAL} Scanning for ${x}..."
-				modprobe ${x} -n
-				backup
-				echo -ne "${NORMAL}"
+			if [ -n "${DEBUG}" ]; then
+				echo -ne "${BOLD}   ::${NORMAL} "
+				echo -ne "Scanning for ${x}..."
 			fi
+			modprobe ${x} > /dev/null 2>&1
+			loaded=${?}
+			[ -n "${DEBUG}" -a "${loaded}" = "0" ] && \
+				echo "loaded"
+			[ -n "${DEBUG}" -a "${loaded}" != "0" ] && \
+				echo "not loaded"
+			[ -z "${DEBUG}" -a "${loaded}" = "0" ] && \
+				echo -en "${x} "
 		else
 			echo -e "${BOLD}   ::${NORMAL} Skipping ${x}..."
 		fi
 	done
+	[ -n "${MODS}" ] && echo
 }
 
 uppercase(){

diff --git a/defaults/modprobe b/defaults/modprobe
deleted file mode 100755
index 6bbe7e4..0000000
--- a/defaults/modprobe
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/ash
-# Apparently, this is required for proper functionality with busybox 1.1.3
-# Check out bug #197730 for more details.
-
-. /etc/initrd.defaults
-
-usage() {
-	echo 'Usage:'
-	echo '  modprobe moduleprefix'
-	echo
-	echo 'Example:'
-	echo '  modprobe eepro100'
-	echo
-	echo 'Note: Do not pass the suffix to modprobe!'
-	exit 1
-}
-
-# Pass module name to this function
-modules_dep_list() {
-	if [ "$#" -lt '1' ]
-	then
-		echo 'modules_dep_list(): Improper usage!'
-		exit 1
-	fi
-	cat /lib/modules/${KV}/modules.dep | grep /"${1}${KSUFF}:" | cut -d':'  -f2
-}
-
-
-# Pass module deps list
-strip_mod_paths() {
-	local x
-	local ret
-	local myret
-
-	[ "$#" -lt '1' ] && return
-
-	for x in ${*}
-	do
-		ret=`basename ${x} | cut -d. -f1`
-		myret="${myret} ${ret}"
-	done
-	echo "${myret}"
-}
-
-LOADED_MODULES=''
-is_module_already_loaded() {
-	local x
-	if [ "$#" != '1' ]
-	then
-		echo 'is_module_already_loaded(): Improper usage!'
-	fi
-
-	for x in ${LOADED_MODULES}
-	do
-		if [ "${x}" = "${1}" ]
-		then
-			# Yep, module is loaded
-			return 0
-		fi
-	done
-	return 1
-}
-
-real_mod_path() {
-	# Find -name is no good since the return status is always zero
-	find "/lib/modules/${KV}" | grep /"${1}${KSUFF}"
-}
-
-modprobe2() {
-	local x
-	local deps
-	local real_path
-	local modlist
-	local ret
-
-	local echoAppend
-	local echoFlags
-
-	if [ "$#" -lt '1' ]
-	then
-		usage
-		exit 1
-	fi
-	real_path=`real_mod_path ${1}`
-	if [ "${real_path}" = '' -o "${real_path}" = ' ' ]
-	then
-		[ "${2}" = '-n' ] && echo -n " -> $1"
-		echo ' module not found.'
-		exit 2
-	fi
-	modlist=`modules_dep_list ${1}`
-	if [ "${modlist}" != '' -a "${modlist}" != ' ' ]
-	then
-		deps=`strip_mod_paths ${modlist}`
-	else
-		deps=''
-	fi
-	# Make sure we don't do any endless loops!
-
-	LOADED_MODULES="${LOADED_MODULES} ${1}"
-	for x in ${deps}
-	do
-		if ! is_module_already_loaded ${x}
-		then
-			if [ "${x}" != '' -a "${x}" != ' ' ]
-			then
-				modprobe2 "${x}" -n
-			fi
-		else
-			filler=1
-		fi
-	done
-	# placing options into x
-	x="${real_path##*/}"
-	x="`cat "/etc/module_options/${x%.ko*}".* 2>/dev/null`"
-	${INSMOD} ${real_path} ${x} > /dev/null 2>&1
-	ret=$?
-	if [ ${ret} -eq 0 ]
-	then
-		echoAppend=' loaded.'
-		[ "${2}" = '-n' ] && echoFlags='-n' && echoAppend=', '
-		echo ${echoFlags} "${1}${echoAppend}"
-	fi
-	return $ret
-}
-
-if [ "$#" -lt '1' ]
-then
-	usage
-fi
-
-[ -f '/modules.cache' ] || touch /modules.cache
-for x in `cat /modules.cache`
-do
-	LOADED_MODULES="${LOADED_MODULES} ${x}"
-done
-
-modprobe2 ${1}
-modprobe_ret=$?
-
-[ -f '/modules.cache' ] && rm -f /modules.cache > /dev/null 2>&1
-for x in ${LOADED_MODULES}
-do
-	echo $x >> /modules.cache
-done
-
-exit $modprobe_ret

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index af6dff6..784c0cc 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -120,12 +120,26 @@ append_busybox() {
 	chmod +x "${TEMP}/initramfs-busybox-temp/usr/share/udhcpc/default.script"
 
 	# Set up a few default symlinks
-	for i in ${BUSYBOX_APPLETS:-[ ash sh mount uname echo cut cat}; do
-		rm -f ${TEMP}/initramfs-busybox-temp/bin/$i > /dev/null
+	local default_applets="[ ash sh mount uname echo cut cat"
+	for i in ${BUSYBOX_APPLETS:-${default_applets}}; do
+		rm -f ${TEMP}/initramfs-busybox-temp/bin/$i
 		ln -s busybox ${TEMP}/initramfs-busybox-temp/bin/$i ||
 			gen_die "Busybox error: could not link ${i}!"
 	done
 
+	local mod_applets="sbin/modprobe sbin/insmod sbin/rmmod bin/lsmod"
+	local dir=
+	local name=
+	for i in ${mod_applets}; do
+		dir=$(dirname $i)
+		name=$(basename $i)
+		rm -f ${TEMP}/initramfs-busybox-temp/$dir/$name
+		mkdir -p ${TEMP}/initramfs-busybox-temp/$dir ||
+			gen_die "Busybox error: could not create dir: $dir"
+		ln -s ../bin/busybox ${TEMP}/initramfs-busybox-temp/$dir/$name ||
+			gen_die "Busybox error: could not link ${i}!"
+	done
+
 	cd "${TEMP}/initramfs-busybox-temp/"
 	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
@@ -705,12 +719,6 @@ append_auxilary() {
 	done
 	echo '"' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
 
-	if [ -f "${GK_SHARE}/arch/${ARCH}/modprobe" ]
-	then
-		cp "${GK_SHARE}/arch/${ARCH}/modprobe" "${TEMP}/initramfs-aux-temp/sbin/modprobe"
-	else
-		cp "${GK_SHARE}/defaults/modprobe" "${TEMP}/initramfs-aux-temp/sbin/modprobe"
-	fi
 	if isTrue $CMD_DOKEYMAPAUTO
 	then
 		echo 'MY_HWOPTS="${MY_HWOPTS} keymap"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults
@@ -728,7 +736,6 @@ append_auxilary() {
 	chmod +x "${TEMP}/initramfs-aux-temp/init"
 	chmod +x "${TEMP}/initramfs-aux-temp/etc/initrd.scripts"
 	chmod +x "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
-	chmod +x "${TEMP}/initramfs-aux-temp/sbin/modprobe"
 
 	if isTrue ${NETBOOT}
 	then

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

[Robin H. Johnson]

commit:     7e224199ffbf67af99e57d4aa2cf3a7a625b87ac
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Mon Apr  9 18:03:01 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 00:02:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7e224199

Support using init= on the command line

We do not support ramdisk, only initramfs nowdays.
So init= is a dead command, and we may as well have it do the same as
it does for dracut and in the Linux kernel documentation.
(Use rdinit to choose the initramfs init file)

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

---
 ChangeLog        |    3 +++
 defaults/linuxrc |    8 ++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dfe39e2..023016b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  15 Oct 2012; Peter Hjalmarsson <xake@rymdraket.net> defaults/linuxrc:
+  Support using init= on the command line.
+
   15 Oct 2012; Peter Hjalmarsson <xake@rymdraket.net> README,
   doc/genkernel.8.txt, gen_bootloader.sh, genkernel:
   Update the documentation to reflect current status re real_root/init.

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 48446ba..1bc09a7 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -36,6 +36,7 @@ quiet_kmsg
 CMDLINE=$(cat /proc/cmdline)
 # Scan CMDLINE for any specified real_root= or cdroot arguments
 FAKE_ROOT=''
+FAKE_INIT=''
 REAL_ROOTFLAGS=''
 ROOTFSTYPE='auto'
 CRYPT_SILENT=0
@@ -56,6 +57,9 @@ do
 		real_init=*)
 			REAL_INIT=${x#*=}
 		;;
+		init=*)
+			FAKE_INIT=${x#*=}
+		;;
 		init_opts=*)
 			INIT_OPTS=${x#*=}
 		;;
@@ -263,6 +267,10 @@ if [ -z "${REAL_ROOT}" -a \( "${CDROOT}" = '0' \)  -a \( "${FAKE_ROOT}" != "/dev
 then
 	REAL_ROOT="${FAKE_ROOT}"
 fi
+if [ -z "${REAL_INIT}" -a \( "${CDROOT}" = '0' \)  -a \( "${FAKE_INIT}" != "/linuxrc" \) ]
+then
+	REAL_INIT="${FAKE_INIT}"
+fi
 
 # Set variables based on the value of REAL_ROOT
 case "${REAL_ROOT}" in

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

[Sebastian Pipping]

commit:     d89f3d59e8e0ee31b228d28888b302031838a672
Author:     Dustin Frisch <dustin.frisch <AT> gmail <DOT> com>
AuthorDate: Wed Oct  3 16:20:16 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Oct  3 16:21:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d89f3d59

Check for file from real_init=FILE rather than /sbin/init (bug #437080)

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

diff --git a/ChangeLog b/ChangeLog
index 47a81ea..d453080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  03 Oct 2012; Dustin Frisch <dustin.frisch@gmail.com> defaults/linuxrc:
+  With boot parameter real_init=/foo look for ${NEW_ROOT}/foo, not
+  ${NEW_ROOT}/sbin/init (bug #437080)
+
   23 Sep 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   Append e2fsck and mke2fs to initramfs. Original patch by Rick Farina
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4a12c21..d6766b8 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -623,7 +623,7 @@ do
 		# else not a good root and start over.
 		if [ "$?" = '0' ]
 		then
-			if [ -d ${NEW_ROOT}/dev -a -x ${NEW_ROOT}/sbin/init ] || [ "${REAL_ROOT}" = "/dev/nfs" ]
+			if [ -d ${NEW_ROOT}/dev -a -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ]
 			then
 				break
 			else

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

[Fabio Erculiani]

commit:     f15425841e586177b6f8ced6c91416a32cdf43a7
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Thu Aug 30 16:20:44 2012 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Thu Aug 30 16:20:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f1542584

mount /mnt/cdrom inside target chroot even when aufs/unionfs is disabled

---
 ChangeLog        |    3 +++
 defaults/linuxrc |    5 +++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dde71f6..a02ce76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  30 Aug 2012; Fabio Erculiani <lxnay@gentoo.org> defaults/linuxrc:
+  mount /mnt/cdrom inside target chroot even when aufs/unionfs is disabled
+
   14 Aug 2012; Richard Yao <ryao@gentoo.org> genkernel:
   Bump version to 3.4.41
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index f434339..4a12c21 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -822,6 +822,11 @@ then
 	mkdir initramfs proc tmp sys run 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
 
 	#UML=$(cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||')

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

[Sebastian Pipping]

commit:     6d35693a8b8c0baa95b20e4b41ef22eb981a5daa
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 18:58:11 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 19:03:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6d35693a

Move software version defaults for defaults/software.sh to ease the etc-update game

---
 ChangeLog            |    5 ++++
 defaults/software.sh |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 genkernel.conf       |   40 +--------------------------------------
 3 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bee9ecb..0e32e8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  12 Aug 2012; Sebastian Pipping <sping@gentoo.org> +defaults/software.sh,
+  genkernel.conf:
+  Move software version defaults for defaults/software.sh to ease the
+  etc-update game
+
   12 Aug 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Fix parsing of --config=... command line option
 

diff --git a/defaults/software.sh b/defaults/software.sh
new file mode 100644
index 0000000..e0d2537
--- /dev/null
+++ b/defaults/software.sh
@@ -0,0 +1,51 @@
+# NOTE:
+# - This file (software.sh) is sourced by /etc/genkernel.conf .
+#   Rather than changing this very file, please override specific versions/variables
+#   somewhere after the (existing) line
+#
+#     source "${GK_SHARE}/defaults/software.sh"
+#
+#   in /etc/genkernel.conf .
+#
+# - The *_VER variables below in here are/were filled with actual version strings
+#   by the genkernel ebuild.
+
+BUSYBOX_VER="VERSION_BUSYBOX"
+BUSYBOX_SRCTAR="${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2"
+BUSYBOX_DIR="busybox-${BUSYBOX_VER}"
+BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2"
+
+LVM_VER="VERSION_LVM"
+LVM_DIR="LVM2.${LVM_VER}"
+LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz"
+LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2"
+
+MDADM_VER="VERSION_MDADM"
+MDADM_DIR="mdadm-${MDADM_VER}"
+MDADM_SRCTAR="${DISTDIR}/mdadm-${MDADM_VER}.tar.bz2"
+MDADM_BINCACHE="%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2"
+
+DMRAID_VER="VERSION_DMRAID"
+DMRAID_DIR="dmraid/${DMRAID_VER}/dmraid"
+DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2"
+DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2"
+
+ISCSI_VER="VERSION_ISCSI"
+ISCSI_DIR="open-iscsi-${ISCSI_VER}"
+ISCSI_SRCTAR="${DISTDIR}/open-iscsi-${ISCSI_VER}.tar.gz"
+ISCSI_BINCACHE="%%CACHE%%/iscsi-${ISCSI_VER}-%%ARCH%%.bz2"
+
+FUSE_VER="VERSION_FUSE"
+FUSE_DIR="fuse-${FUSE_VER}"
+FUSE_SRCTAR="${DISTDIR}/fuse-${FUSE_VER}.tar.gz"
+FUSE_BINCACHE="%%CACHE%%/fuse-${FUSE_VER}-%%ARCH%%.tar.bz2"
+
+UNIONFS_FUSE_VER="VERSION_UNIONFS_FUSE"
+UNIONFS_FUSE_DIR="unionfs-fuse-${UNIONFS_FUSE_VER}"
+UNIONFS_FUSE_SRCTAR="${DISTDIR}/unionfs-fuse-${UNIONFS_FUSE_VER}.tar.bz2"
+UNIONFS_FUSE_BINCACHE="%%CACHE%%/unionfs-fuse-${UNIONFS_FUSE_VER}-%%ARCH%%.bz2"
+
+GPG_VER="VERSION_GPG"
+GPG_DIR="gnupg-${GPG_VER}"
+GPG_SRCTAR="${DISTDIR}/gnupg-${GPG_VER}.tar.bz2"
+GPG_BINCACHE="%%CACHE%%/gnupg-${GPG_VER}-%%ARCH%%.bz2"

diff --git a/genkernel.conf b/genkernel.conf
index f50dd5f..8e9e424 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -198,47 +198,9 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 
 # Specifies a user created busybox config
 #BUSYBOX_CONFIG="/path/to/file"
-
-BUSYBOX_VER="VERSION_BUSYBOX"
-BUSYBOX_SRCTAR="${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2"
-BUSYBOX_DIR="busybox-${BUSYBOX_VER}"
-BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2"
 #BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat"
 
-LVM_VER="VERSION_LVM"
-LVM_DIR="LVM2.${LVM_VER}"
-LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz"
-LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2"
-
-MDADM_VER="VERSION_MDADM"
-MDADM_DIR="mdadm-${MDADM_VER}"
-MDADM_SRCTAR="${DISTDIR}/mdadm-${MDADM_VER}.tar.bz2"
-MDADM_BINCACHE="%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2"
-
-DMRAID_VER="VERSION_DMRAID"
-DMRAID_DIR="dmraid/${DMRAID_VER}/dmraid"
-DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2"
-DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2"
-
-ISCSI_VER="VERSION_ISCSI"
-ISCSI_DIR="open-iscsi-${ISCSI_VER}"
-ISCSI_SRCTAR="${DISTDIR}/open-iscsi-${ISCSI_VER}.tar.gz"
-ISCSI_BINCACHE="%%CACHE%%/iscsi-${ISCSI_VER}-%%ARCH%%.bz2"
-
-FUSE_VER="VERSION_FUSE"
-FUSE_DIR="fuse-${FUSE_VER}"
-FUSE_SRCTAR="${DISTDIR}/fuse-${FUSE_VER}.tar.gz"
-FUSE_BINCACHE="%%CACHE%%/fuse-${FUSE_VER}-%%ARCH%%.tar.bz2"
-
-UNIONFS_FUSE_VER="VERSION_UNIONFS_FUSE"
-UNIONFS_FUSE_DIR="unionfs-fuse-${UNIONFS_FUSE_VER}"
-UNIONFS_FUSE_SRCTAR="${DISTDIR}/unionfs-fuse-${UNIONFS_FUSE_VER}.tar.bz2"
-UNIONFS_FUSE_BINCACHE="%%CACHE%%/unionfs-fuse-${UNIONFS_FUSE_VER}-%%ARCH%%.bz2"
-
-GPG_VER="VERSION_GPG"
-GPG_DIR="gnupg-${GPG_VER}"
-GPG_SRCTAR="${DISTDIR}/gnupg-${GPG_VER}.tar.bz2"
-GPG_BINCACHE="%%CACHE%%/gnupg-${GPG_VER}-%%ARCH%%.bz2"
+source "${GK_SHARE}/defaults/software.sh"
 
 
 # =========MISC KERNEL CONFIGURATION============

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

[Robin H. Johnson]

commit:     1486a0402c84f7e1a12f4bd07c5f42eb59171810
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 24 18:01:07 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 24 18:01:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1486a040

Flip awk return values.

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

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

diff --git a/ChangeLog b/ChangeLog
index 10f8cfa..1fae6f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 # $Id$
 
   24 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
+  Flip awk return values.
+
+  24 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
   Minor thinko in devpts check.
 
   24 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 814919b..ac32c8a 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 awk 'BEGIN{m=1;} /devtmpfs/{if($3 == "devtmpfs") {m=0;} } END { exit m;}' /proc/mounts; then
+	if awk 'BEGIN{m=0;} /devtmpfs/{if($3 == "devtmpfs") {m=1;} } END { exit m;}' /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 awk 'BEGIN{m=1;} /devpts/{if($3 == "devpts") {m=0;} } END { exit m;}' /proc/mounts; then
+	if awk 'BEGIN{m=0;} /devpts/{if($3 == "devpts") {m=1;} } END { exit m;}' /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/

[Robin H. Johnson]

commit:     c79d57926f31184c526989d0076b0649ad862039
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 24 17:28:57 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 24 17:29:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c79d5792

Minor thinko in devpts check.

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

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

diff --git a/ChangeLog b/ChangeLog
index de4fac8..10f8cfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,10 @@
 # - 2008-2011 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 # $Id$
-  
+
+  24 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
+  Minor thinko in devpts check.
+
   24 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
   Prior commit to only mount devtmpfs and devpts if they were not already
   mounted made assumptions about the device names they were mounted as. Check

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index fb64f84..814919b 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -313,7 +313,7 @@ mount_devfs () {
 	fi
 
 	# http://git.busybox.net/busybox/plain/docs/mdev.txt
-	if awk 'BEGIN{m=1;} /devtmpfs/{if($3 == "devpts") {m=0;} } END { exit m;}' /proc/mounts; then
+	if awk 'BEGIN{m=1;} /devpts/{if($3 == "devpts") {m=0;} } END { exit m;}' /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/

[Robin H. Johnson]

commit:     c924bde4b7accbe1cf3bdba666b615d412c869bf
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 24 08:26:43 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 24 08:28:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c924bde4

Prior commit to only mount devtmpfs and devpts if they were not already mounted made assumptions about the device names they were mounted as. Check the filesystem column of /proc/mounts instead.

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

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

diff --git a/ChangeLog b/ChangeLog
index bc9ab5b..de4fac8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
 # - 2008-2011 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 # $Id$
+  
+  24 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
+  Prior commit to only mount devtmpfs and devpts if they were not already
+  mounted made assumptions about the device names they were mounted as. Check
+  the filesystem column of /proc/mounts instead.
 
   21 Jul 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.39

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4f0ce1b..fb64f84 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 '^devtmpfs' /proc/mounts; then
+	if awk 'BEGIN{m=1;} /devtmpfs/{if($3 == "devtmpfs") {m=0;} } END { exit m;}' /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 '^devpts' /proc/mounts; then
+	if awk 'BEGIN{m=1;} /devtmpfs/{if($3 == "devpts") {m=0;} } END { exit m;}' /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:     84e2ab615bd81a902c9ce2cea9cf654205474b0f
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Thu Jul 19 19:59:03 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 20:06:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=84e2ab61

Support module options set in /etc/module.d, amend cmdline options patch

---
 defaults/linuxrc     |   12 +-----------
 defaults/modprobe    |    2 +-
 gen_cmdline.sh       |    5 +++++
 gen_determineargs.sh |    2 ++
 gen_initramfs.sh     |   37 +++++++++++++++++++++++++++++++++++++
 5 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 91a3396..6e9e9d8 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -241,23 +241,13 @@ 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"
+				echo "options ${x%%.*} ${x#*.}" >> "/etc/module_options/${x%%[=/]*}.conf"
 			;;
 			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 1f606bd..6bbe7e4 100755
--- a/defaults/modprobe
+++ b/defaults/modprobe
@@ -112,7 +112,7 @@ modprobe2() {
 	done
 	# placing options into x
 	x="${real_path##*/}"
-	x="`cat "/etc/cmdline/${x%.ko*}".* 2>/dev/null`"
+	x="`cat "/etc/module_options/${x%.ko*}".* 2>/dev/null`"
 	${INSMOD} ${real_path} ${x} > /dev/null 2>&1
 	ret=$?
 	if [ ${ret} -eq 0 ]

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 184db65..938b1a5 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -75,6 +75,7 @@ longusage() {
   echo "	--mountboot		Mount BOOTDIR automatically if mountable"
   echo "	--no-mountboot		Don't mount BOOTDIR automatically"  
   echo "	--bootdir=<dir>		Set the location of the boot-directory, default is /boot"
+  echo "	--modprobedir=<dir>	Set the location of the modprobe.d-directory, default is /etc/modprobe.d"
   echo "  Initialization"
   echo "	--splash=<theme>	Enable framebuffer splash using <theme>"
   echo "	--splash-res=<res>	Select splash theme resolutions to install"
@@ -248,6 +249,10 @@ parse_cmdline() {
 			CMD_BOOTDIR=`parse_opt "$*"`
 			print_info 2 "CMD_BOOTDIR: ${CMD_BOOTDIR}"
 			;;
+		--modprobedir=*)
+			CMD_MODPROBEDIR=`parse_opt "$*"`
+			print_info 2 "CMD_MODPROBEDIR: ${CMD_MODPROBEDIR}"
+			;;
 		--do-keymap-auto)
 			CMD_DOKEYMAPAUTO=1
 			CMD_KEYMAP=1

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index bbff166..3bc1b29 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -90,6 +90,7 @@ determine_real_args() {
 	set_config_with_override STRING KERNEL_CROSS_COMPILE CMD_KERNEL_CROSS_COMPILE
 	set_config_with_override STRING UTILS_CROSS_COMPILE  CMD_UTILS_CROSS_COMPILE
 	set_config_with_override STRING BOOTDIR              CMD_BOOTDIR              "/boot"
+	set_config_with_override STRING MODPROBEDIR          CMD_MODPROBEDIR              "/etc/modprobe.d"
 
 	set_config_with_override BOOL   SPLASH               CMD_SPLASH
 	set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR
@@ -135,6 +136,7 @@ determine_real_args() {
 
 	BOOTDIR=`arch_replace "${BOOTDIR}"`
 	BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash
+	MODPROBEDIR=${MODPROBEDIR%/}    # Remove any trailing slash
 
 	CACHE_DIR=`arch_replace "${CACHE_DIR}"`
 	BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"`

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 43ef155..ac90830 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -577,6 +577,41 @@ append_modules() {
 	rm -r "${TEMP}/initramfs-modules-${KV}-temp/"	
 }
 
+append_modprobed() {
+	local TDIR="${TEMP}/initramfs-modprobe.d-temp"
+	if [ -d "${TDIR}" ]
+	then
+		rm -r "${TDIR}"
+	fi
+
+	mkdir -p "${TDIR}/etc/module_options/"
+
+	# Load module parameters
+	for dir in $(find "${MODPROBEDIR}"/*)
+	do
+		while read x
+		do
+			case "${x}" in
+				options*)
+					module_name="$(echo "$x" | cut -d ' ' -f 2)"
+					[ "${module_name}" != "$(echo)" ] || continue
+					module_options="$(echo "$x" | cut -d ' ' -f 3-)"
+					[ "${module_options}" != "$(echo)" ] || continue
+					echo "${module_options}" >> "${TDIR}/etc/module_options/${module_name}.conf"
+				;;
+			esac
+		done < "${dir}"
+	done
+
+	cd "${TDIR}"
+	log_future_cpio_content
+	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+			|| gen_die "compressing modprobe.d cpio"
+
+	cd "${TEMP}"
+	rm -rf "${TDIR}" > /dev/null
+}
+
 # check for static linked file with objdump
 is_static() {
 	LANG="C" LC_ALL="C" objdump -T $1 2>&1 | grep "not a dynamic object" > /dev/null
@@ -729,6 +764,8 @@ create_initramfs() {
 
 	append_data 'splash' "${SPLASH}"
 
+	append_data 'modprobed'
+
 	if isTrue "${FIRMWARE}" && [ -n "${FIRMWARE_DIR}" ]
 	then
 		append_data 'firmware'

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

[Sebastian Pipping]

commit:     51dcb157423d660f652e44a795cfb9a51724ad1e
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jul  9 17:47:21 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 17:50:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=51dcb157

Restore previous handling of real_root due to report of regressions (bug #419965)

This reverts commit f95264added35c25fb557931116edd3cd0aec7ba.

Conflicts:
	defaults/initrd.scripts

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

diff --git a/ChangeLog b/ChangeLog
index 42b6f7c..21e7fdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  09 Jul 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+  Restore previous handling of real_root due to report of regressions (bug
+  #419965)
+
   08 Jul 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.37
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f05a746..258f2bd 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -751,19 +751,16 @@ 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="$LUKS_NAME" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
+	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$1" 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:     2413f1f2a334e1d464713dd8ce0eb8c0f711dc29
Author:     Kenny Cheng <kenny97821419 <AT> gmail <DOT> com>
AuthorDate: Sun Jul  8 17:04:25 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 17:04:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2413f1f2

Add /run to support openrc >=0.10

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

diff --git a/ChangeLog b/ChangeLog
index 7d5ad59..1340d09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Jul 2012; Kenny Cheng <kenny97821419@gmail.com> defaults/linuxrc:
+  Add /run to support openrc >=0.10
+
   11 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.36
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index b6ad58f..8a1bec9 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -806,7 +806,7 @@ then
 		fi
 	done
 
-	mkdir initramfs proc tmp sys 2>/dev/null
+	mkdir initramfs proc tmp sys run 2>/dev/null
 	chmod 1777 tmp
 
 	fi
@@ -876,7 +876,7 @@ verbose_kmsg
 echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}"
 
 cd "${CHROOT}"
-mkdir "${CHROOT}/proc" "${CHROOT}/sys" 2>/dev/null
+mkdir "${CHROOT}/proc" "${CHROOT}/sys" "${CHROOT}/run" 2>/dev/null
 echo -ne "${BOLD}.${NORMAL}"
 
 # If devtmpfs is mounted, try move it to the new root

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

[Sebastian Pipping]

commit:     0fa71ef46ce917be19833f15293af5253a04f9e1
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu May 17 18:22:02 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 17 18:27:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0fa71ef4

Fix call to blkid of util-linux

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

diff --git a/ChangeLog b/ChangeLog
index 83c2829..0173167 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  17 May 2012; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc:
+  Fix call to blkid as "blkid -l -t UUID=foo" (without -o device) does not seem
+  to work well with blkid of util-linux
+
   17 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.33
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c468ad4..258f2bd 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -801,7 +801,7 @@ openLUKS() {
 					fi
 
 					if [ "${retval}" -ne 0 ]; then
-						REAL_LUKS=`blkid -l -t "${LUKS_DEVICE}" | cut -d ":" -f 1 2>/dev/null`
+						REAL_LUKS=`blkid -o device -l -t "${LUKS_DEVICE}"`
 						retval=$?
 					fi
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6103e23..4ff5662 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -372,7 +372,7 @@ then
 				fi
 
 				if [ ${retval} -ne 0 ]; then
-					RESUME_DEV=$(blkid -l -t "${REAL_RESUME}" | cut -d ":" -f 1 2>/dev/null)
+					RESUME_DEV=$(blkid -o device -l -t "${REAL_RESUME}")
 					retval=$?
 				fi
 
@@ -480,7 +480,7 @@ do
 				fi
 
 				if [ ${retval} -ne 0 ]; then
-					ROOT_DEV=$(blkid -l -t "${REAL_ROOT}" | cut -d ":" -f 1 2>/dev/null)
+					ROOT_DEV=$(blkid -o device -l -t "${REAL_ROOT}")
 					retval=$?
 				fi
 

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

[Sebastian Pipping]

commit:     4ed04331a506926fde85d8a375e94039e368bdb7
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Mar 16 22:40:14 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 23:08:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4ed04331

Drop into debug shell when squashfs could not be mounted

---
 ChangeLog        |    4 ++++
 defaults/linuxrc |    9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d41a6f..c1f376d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 
   16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc:
+  Drop into debug shell when squashfs could not be mounted
+
+  16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc:
   Drop into debug shell when files could not be copied into tmpfs
 
   16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 226a903..5932024 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -627,7 +627,14 @@ then
 		then
 			if [ "${USE_AUFS_NORMAL}" != '1' ]; then
 				good_msg 'Mounting squashfs filesystem'
-				mount -t squashfs -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd"
+				mount -t squashfs -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd" || {
+					bad_msg "Squashfs filesystem could not be mounted, dropping into shell."
+					if [ -e /proc/filesystems ]; then
+						fgrep -q squashfs /proc/filesystems || \
+							bad_msg "HINT: Your kernel does not know filesystem \"squashfs\"."
+					fi
+					do_rundebugshell
+				}
 			else
 				good_msg 'Mounting squashfs & aufs filesystems'
 				setup_squashfs_aufs

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

[Sebastian Pipping]

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

Drop into debug shell when files could not be copied into tmpfs

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

diff --git a/ChangeLog b/ChangeLog
index 4a306ae..1d41a6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 
   16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc:
+  Drop into debug shell when files could not be copied into tmpfs
+
+  16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc:
   Improve handling of missing /etc/fstab
 
   16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 34f1d69..226a903 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -701,7 +701,10 @@ 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}")
+	(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}

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

[Sebastian Pipping]

commit:     38205c74b4bcf1cfd37037f72b89b3d0cdd750c0
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Mar 16 19:08:25 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 19:08:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=38205c74

No longer use parameter "-r" (for regex intervals) that busybox awk does not support

Error was:
awk: invalid option -- r

Note: regex intervals are supported by default so we can just omit "-r" here

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

diff --git a/ChangeLog b/ChangeLog
index 9e92448..55f5569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+  No longer use parameter "-r" (for regex intervals) that busybox awk does not
+  support
+
   10 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
   Bump version for release.
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 16e1d0d..0e1e5f9 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -149,7 +149,7 @@ devicelist(){
 	DEVICES="$DEVICES /dev/mmcblk* /dev/mmcblk*/*"
 	# fallback scanning, this might scan something twice, but it's better than
 	# failing to boot.
-	[ -e /proc/partitions ] && DEVICES="${DEVICES} $(awk -r '/([0-9]+[[:space:]]+)/{print "/dev/" $4}' /proc/partitions)"
+	[ -e /proc/partitions ] && DEVICES="${DEVICES} $(awk '/([0-9]+[[:space:]]+)/{print "/dev/" $4}' /proc/partitions)"
 	echo ${DEVICES}
 }
 

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

[Sebastian Pipping]

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

Improve handling of missing /etc/fstab

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

diff --git a/ChangeLog b/ChangeLog
index 55f5569..4a306ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc:
+  Improve handling of missing /etc/fstab
+
   16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
   No longer use parameter "-r" (for regex intervals) that busybox awk does not
   support

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f504c3f..296b150 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1205,6 +1205,7 @@ get_mounts_list()
 
 get_mount_fstype()
 {
+	[ -e "${NEW_ROOT}"/etc/fstab ] || return 1
 	awk -v fs="$1" '
 		/^[[:blank:]]*#/ { next }
 		$2 == fs { print $3 }
@@ -1213,6 +1214,7 @@ get_mount_fstype()
 
 get_mount_options()
 {
+	[ -e "${NEW_ROOT}"/etc/fstab ] || return 1
 	awk -v fs="$1" '
 		/^[[:blank:]]*#/ { next }
 		$2 == fs { print $4 }
@@ -1221,6 +1223,7 @@ get_mount_options()
 
 get_mount_device()
 {
+	[ -e "${NEW_ROOT}"/etc/fstab ] || return 1
 	awk -v fs="$1" '
 		/^[[:blank:]]*#/ { next }
 		$2 == fs { print $1 }

diff --git a/defaults/linuxrc b/defaults/linuxrc
index b883155..34f1d69 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -776,6 +776,7 @@ 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

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

[Robin H. Johnson]

commit:     995635a2c7fbc6cc6250f697c4977bd2e2f56762
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 06:58:10 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 06:58:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=995635a2

With the new /usr mounting, if the device path that ends up in /proc/mounts ends up being different than in /etc/fstab due to symlinks, mount -a will always exit 32. Avoid by resolving symlinks like util-linux does.

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

---
 ChangeLog        |    5 +++++
 defaults/linuxrc |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e5c391b..4d9f866 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  20 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/linuxrc:
+  With the new /usr mounting, if the device path that ends up in /proc/mounts
+  ends up being different than in /etc/fstab due to symlinks, mount -a will
+  always exit 32. Avoid by resolving symlinks like util-linux does.
+
   14 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh,
   gen_initramfs.sh:
   dmraid is entirely broken if you try to use the system static

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 693257f..528f58d 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -544,6 +544,9 @@ do
 		if [ "${REAL_ROOT}" = '/dev/nfs' ]; then
 			findnfsmount
 		else
+			# If $REAL_ROOT is a symlink
+			# Resolve it like util-linux mount does
+			[ -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}"
@@ -777,6 +780,8 @@ fi
 
 for fs in $fslist; do
 	dev=$(get_mount_device $fs)
+	# 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

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

[Robin H. Johnson]

commit:     1077359d86836accf26f9711f1fde74f8f92b88b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 07:40:51 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 07:41:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1077359d

linuxrc /usr mounting

Dogfooding of the /usr mount code with the matching OpenRC change to
make the mounts RW revealed some bugs and gotchas in our prior code, now
fixed and verified to work.

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

---
 ChangeLog               |    6 ++++++
 defaults/initrd.scripts |   19 ++++++++++++++++++-
 defaults/linuxrc        |   13 +++++++++----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f52685..f867f22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@
 # Distributed under the GPL v2
 # $Id$
 
+  09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc:
+  Dogfooding of the /usr mount code with the matching OpenRC change to make the
+  mounts RW revealed some bugs and gotchas in our prior code, now fixed and
+  verified to work.
+
   06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> arch/alpha/config.sh,
   arch/arm/config.sh, arch/ia64/config.sh, arch/mips/config.sh,
   arch/parisc/config.sh, arch/parisc64/config.sh, arch/ppc/config.sh,

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 54e7b80..16e1d0d 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1199,7 +1199,7 @@ get_mounts_list()
 		' ${NEW_ROOT}/etc/initramfs.mounts
 }
 
-get_mount_options()
+get_mount_fstype()
 {
 	awk -v fs="$1" '
 		/^[[:blank:]]*#/ { next }
@@ -1207,6 +1207,14 @@ get_mount_options()
 		' ${NEW_ROOT}/etc/fstab
 }
 
+get_mount_options()
+{
+	awk -v fs="$1" '
+		/^[[:blank:]]*#/ { next }
+		$2 == fs { print $4 }
+		' ${NEW_ROOT}/etc/fstab
+}
+
 get_mount_device()
 {
 	awk -v fs="$1" '
@@ -1215,3 +1223,12 @@ get_mount_device()
 		' ${NEW_ROOT}/etc/fstab
 }
 
+# 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.
+# To make like a little easier, busybox mount does not care about leading,
+# trailing or duplicate commas.
+strip_mount_options()
+{
+	sed -r 's/(,|^)(no)?auto(,|$)/,/g'
+}

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 0a69a6d..693257f 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -531,7 +531,7 @@ do
 		# there is no isofs filesystem to worry about
 		break
 	else
-		good_msg "Mounting root..."
+		good_msg "Mounting $REAL_ROOT as root..."
 
 		if [ "${ROOTFSTYPE}" = 'zfs' ]
 		then
@@ -780,9 +780,14 @@ for fs in $fslist; do
 	# In this case, it's probably part of the filesystem
 	# and not a mountpoint
 	[ -z "$dev" ] && continue
-	opts="ro,$(get_mount_options \"$fs\")"
-	if ! mount -o ${opts} $dev ${NEW_ROOT}${fs}; then
-		rescue_shell "Unable to mount $dev on $fs"
+	fstype=$(get_mount_fstype $fs)
+	# ro must be trailing, and the options will always contain at least 'defaults'
+	opts="$(get_mount_options $fs | strip_mount_options),ro"
+	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
 

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

[Robin H. Johnson]

commit:     94dc288487f2cb5c993ed471ed490a0031a65acc
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 08:33:10 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 09:31:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=94dc2884

Customizable initramfs compression based on Pentoo genkernel fork

This implements customizable initramfs compression, based on the Pentoo
genkernel fork (SVN revs r2142, r2145, by Jens Pranaitis
<jens <AT> chaox.net>).

New configuration option COMPRESS_INITRD_TYPE to allow manual selection,
whereas the Pentoo fork provided auto-selection based on what was
available in the kernel configuration. Auto-selection is used by
default, and is available with the argument of 'best' to the new option.

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

---
 ChangeLog            |    4 +++
 defaults/config.sh   |    3 +-
 gen_cmdline.sh       |    6 ++++-
 gen_determineargs.sh |    1 +
 gen_initramfs.sh     |   62 ++++++++++++++++++++++++++++++++++++++-----------
 genkernel.conf       |    3 ++
 6 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d6e4dcf..e2cc9ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/config.sh,
+  gen_cmdline.sh, gen_determineargs.sh, gen_initramfs.sh, genkernel.conf:
+  Import customizable compression for initramfs, based on Pentoo development.
+
   06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> arch/alpha/modules_load,
   arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load,
   arch/parisc/modules_load, arch/parisc64/modules_load, arch/ppc/modules_load,

diff --git a/defaults/config.sh b/defaults/config.sh
index d135e0e..7ee9ef2 100755
--- a/defaults/config.sh
+++ b/defaults/config.sh
@@ -12,7 +12,8 @@ KERNEL_MAKE_DIRECTIVE_2=""
 KERNEL_BINARY="arch/i386/boot/bzImage"
 KERNEL_BINARY_OVERRIDE=""
 
-COMPRESS_INITRD=yes
+DEFAULT_COMPRESS_INITRD=yes
+DEFAULT_COMPRESS_INITRD_TYPE=best
 
 #
 # Arch-specific defaults that can be overridden in the config file or on the

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index de56a25..aabaa7e 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -537,10 +537,14 @@ parse_cmdline() {
 			CMD_INTEGRATED_INITRAMFS=`parse_optbool "$*"`
 			print_info 2 "CMD_INTEGRATED_INITRAMFS=${CMD_INTEGRATED_INITRAMFS}"
 			;;
-		--compress-initramfs|--no-compress-initramfs)
+		--compress-initramfs|--no-compress-initramfs|--compress-initrd|--no-compress-initrd)
 			CMD_COMPRESS_INITRD=`parse_optbool "$*"`
 			print_info 2 "CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}"
 			;;
+		--compress-initramfs-type=*|--compress-initrd-type=*)
+			COMPRESS_INITRD_TYPE=`parse_opt "$*"`
+			print_info 2 "CMD_COMPRESS_INITRD_TYPE: ${CMD_LINUXRC}"
+			;;
 		--config=*)
 			print_info 2 "CMD_GK_CONFIG: `parse_opt "$*"`"
 			;;

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e6ed0a3..4a21530 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -76,6 +76,7 @@ determine_real_args() {
 	set_config_with_override STRING KNAME                CMD_KERNNAME             "genkernel"
 
 	set_config_with_override STRING COMPRESS_INITRD      CMD_COMPRESS_INITRD      "$DEFAULT_COMPRESS_INITRD"
+	set_config_with_override STRING COMPRESS_INITRD_TYPE CMD_COMPRESS_INITRD_TYPE "$DEFAULT_COMPRESS_INITRD_TYPE"
 	set_config_with_override STRING MAKEOPTS             CMD_MAKEOPTS             "$DEFAULT_MAKEOPTS"
 	set_config_with_override STRING KERNEL_MAKE          CMD_KERNEL_MAKE          "$DEFAULT_KERNEL_MAKE"
 	set_config_with_override STRING UTILS_MAKE           CMD_UTILS_MAKE           "$DEFAULT_UTILS_MAKE"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 170361b..3aab15d 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -686,23 +686,57 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
-	# Implement support for disabling compression
-	if isTrue "${COMPRESS_INITRD}"
-	then
-		compress_ext=".gz"
-		print_info 1 "        >> Compressing cpio data..."
-		gzip -9 "${CPIO}" || gen_die "Compression failed"
-		mv -f "${CPIO}.gz" "${CPIO}" || gen_die "Rename failed"
-	fi
-
-
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
-#		cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/usr/initramfs_data.cpio.gz
-		mv ${TMPDIR}/initramfs-${KV} ${TMPDIR}/initramfs-${KV}.cpio${compress_ext}
-#		sed -i "s|^.*CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"${TMPDIR}/initramfs-${KV}.cpio.gz\"|" ${KERNEL_DIR}/.config
+		# Explicitly do not compress if we are integrating into the kernel.
+		# The kernel will do a better job of it than us.
+		mv ${TMPDIR}/initramfs-${KV} ${TMPDIR}/initramfs-${KV}.cpio
 		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' ${KERNEL_DIR}/.config
-		echo -e "CONFIG_INITRAMFS_SOURCE=\"${TMPDIR}/initramfs-${KV}.cpio${compress_ext}\"\nCONFIG_INITRAMFS_ROOT_UID=0\nCONFIG_INITRAMFS_ROOT_GID=0" >> ${KERNEL_DIR}/.config
+		cat >>${KERNEL_DIR}/.config	<<-EOF
+		CONFIG_INITRAMFS_SOURCE="${TMPDIR}/initramfs-${KV}.cpio${compress_ext}"
+		CONFIG_INITRAMFS_ROOT_UID=0
+		CONFIG_INITRAMFS_ROOT_GID=0
+		EOF
+	else
+		if isTrue "${COMPRESS_INITRD}"
+		then
+			cmd_xz=$(type -p xz)
+			cmd_lzma=$(type -p lzma)
+			cmd_bzip2=$(type -p bzip2)
+			cmd_gzip=$(type -p gzip)
+			cmd_lzop=$(type -p lzop)
+			local compression
+			case ${COMPRESS_INITRD_TYPE} in
+				xz|lzma|bzip2|gzip2|lzo) compression=${COMPRESS_INITRD_TYPE} ;;
+				best)
+					if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ;
+						compression=xz
+					elif grep -sq '^CONFIG_RD_LZMA=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzma}" ;
+						compression=lzma
+					elif grep -sq '^CONFIG_RD_BZIP2=y' ${KERNEL_DIR}/.config  && test -n "${cmd_bzip2}" ;
+						compression=bzip2
+					elif grep -sq '^CONFIG_RD_GZIP=y' ${KERNEL_DIR}/.config && test -n "${cmd_gzip}" ;
+						compression=gzip
+					elif grep -sq '^CONFIG_RD_LZO=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzop}" ;
+						compression=lzo
+					fi ;;
+			esac
+			case $compression in
+				xz) compress_ext='.xz' compress_cmd="${cmd_xz} -e --check=none -z -f -9" ;;
+				lzma) compress_ext='.lzma' compress_cmd="${cmd_lzma} -z -f -9" ;;
+				bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9"
+				gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;;
+				lzo) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;;
+			esac
+	
+			if [ -n "${compression}" ]; then
+				print_info 1 "        >> Compressing cpio data (${compress_ext})..."
+				${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"
+				mv -f "${CPIO}${compress_ext}" "${CPIO}" || gen_die "Rename failed"
+			else
+				print_info 1 "        >> Not compressing cpio data ..."
+			fi
+		fi
 	fi
 
 	if isTrue "${CMD_INSTALL}"

diff --git a/genkernel.conf b/genkernel.conf
index 7032ac7..22b18d7 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -319,6 +319,9 @@ GPG_BINCACHE="%%CACHE%%/gnupg-${GPG_VER}-%%ARCH%%.bz2"
 
 # Compress generated initramfs
 #COMPRESS_INITRD="yes"
+# Types of compression: best, xz, lzma, bzip2, gzip, lzop
+# "best" selects the best available compression method
+#COMPRESS_INITRD_TYPE="best"
 
 
 # Create a self-contained env in the initramfs

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

[Robin H. Johnson]

commit:     af26e433cbe7b94ee699b4ecd14fe89efa46ecfe
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 07:50:17 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 08:19:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=af26e433

Support virtio devices, and provide fallback of all remaining devices.

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

---
 ChangeLog               |    3 +++
 defaults/initrd.scripts |    5 +++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c39b7b..bc8be73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
+  Support virtio devices, and provide fallback of all remaining devices.
+
   03 Feb 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
   Support SD card readers. Patch by Rick Farina
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4f71a88..609c52f 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -139,12 +139,17 @@ devicelist(){
 	DEVICES="$DEVICES /dev/sd*"
 	# IDE devices
 	DEVICES="$DEVICES /dev/hd*"
+	# virtio devices
+	DEVICES="$DEVICES /dev/vd*"
 	# USB using the USB Block Driver
 	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*/*"
+	# fallback scanning, this might scan something twice, but it's better than
+	# failing to boot.
+	[ -e /proc/partitions ] && DEVICES="${DEVICES} $(awk -r '/([0-9]+[[:space:]]+)/{print "/dev/" $4}' /proc/partitions)"
 	echo ${DEVICES}
 }
 

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

[Sebastian Pipping]

commit:     31c3c7ca88596cb27500a4655710f2b887ce6ae9
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Jan 13 23:04:33 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 23:04:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=31c3c7ca

Update busybox config using "yes '' | make oldconfig"

---
 ChangeLog            |    3 +
 defaults/busy-config |  576 ++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 424 insertions(+), 155 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d8b0ff..fdf8bf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/busy-config:
+  Update busybox config using "yes '' | make oldconfig"
+
   13 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.23
 

diff --git a/defaults/busy-config b/defaults/busy-config
index fe53990..17116dc 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.7.4
-# Tue Mar 11 13:29:47 2008
+# Busybox version: 1.19.3
+# Sat Jan 14 00:01:17 2012
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -12,19 +12,35 @@ CONFIG_HAVE_DOT_CONFIG=y
 #
 # General Configuration
 #
-# CONFIG_NITPICK is not set
 # CONFIG_DESKTOP is not set
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_SHOW_USAGE=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
 # CONFIG_LOCALE_SUPPORT is not set
-CONFIG_GETOPT_LONG=y
+CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_PIDFILE is not set
 # CONFIG_FEATURE_SUID is not set
 # CONFIG_FEATURE_SUID_CONFIG is not set
@@ -33,55 +49,70 @@ CONFIG_FEATURE_DEVPTS=y
 CONFIG_FEATURE_PREFER_APPLETS=y
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
+# CONFIG_FEATURE_HAVE_RPC is not set
 
 #
 # Build Options
 #
 CONFIG_STATIC=y
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
 # CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_LFS=y
-# CONFIG_BUILD_AT_ONCE is not set
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""
 
 #
 # Debugging Options
 #
 # CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
 # CONFIG_WERROR is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
-# CONFIG_INCLUDE_SUSv2 is not set
 
 #
-# Installation Options
+# Installation Options ("make install" behavior)
 #
-# CONFIG_INSTALL_NO_USR is not set
 CONFIG_INSTALL_APPLET_SYMLINKS=y
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
 # CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
 CONFIG_PREFIX="./_install"
 
 #
 # Busybox Library Tuning
 #
+CONFIG_FEATURE_SYSTEMD=y
+CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=2
 # CONFIG_FEATURE_FAST_TOP is not set
 # CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=15
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_MONOTONIC_SYSCALL=y
 CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
 
 #
 # Applets
@@ -90,64 +121,87 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 #
 # Archival Utilities
 #
+CONFIG_FEATURE_SEAMLESS_XZ=y
+CONFIG_FEATURE_SEAMLESS_LZMA=y
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+# CONFIG_FEATURE_SEAMLESS_Z is not set
 # CONFIG_AR is not set
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+# CONFIG_FEATURE_AR_CREATE is not set
 # CONFIG_BUNZIP2 is not set
+CONFIG_BZIP2=y
 # CONFIG_CPIO is not set
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
 CONFIG_GUNZIP=y
-# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
 CONFIG_GZIP=y
+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
+CONFIG_LZOP=y
+# CONFIG_LZOP_COMPR_HIGH is not set
 # CONFIG_RPM2CPIO is not set
 # CONFIG_RPM is not set
-# CONFIG_FEATURE_RPM_BZ2 is not set
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_AUTODETECT=y
 # CONFIG_FEATURE_TAR_FROM is not set
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
 # CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
 # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
 # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_FEATURE_TAR_TO_COMMAND is not set
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+# CONFIG_FEATURE_TAR_SELINUX is not set
 # CONFIG_UNCOMPRESS is not set
 # CONFIG_UNLZMA is not set
 # CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_LZMA is not set
+CONFIG_UNXZ=y
+CONFIG_XZ=y
 # CONFIG_UNZIP is not set
 
 #
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-# CONFIG_FEATURE_DEB_TAR_LZMA is not set
-
-#
 # Coreutils
 #
 CONFIG_BASENAME=y
-# CONFIG_CAL is not set
 CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_ID=y
+CONFIG_GROUPS=y
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+# CONFIG_TR is not set
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_BASE64=y
+# CONFIG_WHO is not set
+# CONFIG_USERS is not set
+# CONFIG_CAL is not set
 # CONFIG_CATV is not set
 CONFIG_CHGRP=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
 CONFIG_CHROOT=y
 # CONFIG_CKSUM is not set
 # CONFIG_COMM is not set
 CONFIG_CP=y
+CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_CUT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
 # CONFIG_FEATURE_DD_IBS_OBS is not set
 CONFIG_DF=y
+CONFIG_FEATURE_DF_FANCY=y
 CONFIG_DIRNAME=y
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
@@ -163,13 +217,12 @@ CONFIG_ENV=y
 # CONFIG_EXPR_MATH_SUPPORT_64 is not set
 CONFIG_FALSE=y
 # CONFIG_FOLD is not set
+CONFIG_FSYNC=y
 CONFIG_HEAD=y
 # CONFIG_FEATURE_FANCY_HEAD is not set
 # CONFIG_HOSTID is not set
-CONFIG_ID=y
 # CONFIG_INSTALL is not set
 # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-# CONFIG_LENGTH is not set
 CONFIG_LN=y
 # CONFIG_LOGNAME is not set
 CONFIG_LS=y
@@ -199,10 +252,14 @@ CONFIG_READLINK=y
 # CONFIG_REALPATH is not set
 CONFIG_RM=y
 CONFIG_RMDIR=y
+CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
 # CONFIG_SEQ is not set
 # CONFIG_SHA1SUM is not set
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
 CONFIG_SLEEP=y
 # CONFIG_FEATURE_FANCY_SLEEP is not set
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
 CONFIG_SORT=y
 CONFIG_FEATURE_SORT_BIG=y
 # CONFIG_SPLIT is not set
@@ -212,16 +269,11 @@ CONFIG_FEATURE_SORT_BIG=y
 CONFIG_STTY=y
 # CONFIG_SUM is not set
 CONFIG_SYNC=y
+CONFIG_TAC=y
 CONFIG_TAIL=y
 # CONFIG_FEATURE_FANCY_TAIL is not set
 # CONFIG_TEE is not set
 # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TEST=y
-# CONFIG_FEATURE_TEST_64 is not set
-CONFIG_TOUCH=y
-# CONFIG_TR is not set
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
@@ -233,7 +285,6 @@ CONFIG_UNIQ=y
 # CONFIG_UUENCODE is not set
 # CONFIG_WC is not set
 # CONFIG_FEATURE_WC_LARGE is not set
-# CONFIG_WHO is not set
 CONFIG_WHOAMI=y
 CONFIG_YES=y
 
@@ -251,15 +302,21 @@ CONFIG_FEATURE_AUTOWIDTH=y
 # Common options for df, du, ls
 #
 CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
 # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
 
 #
 # Console Utilities
 #
 CONFIG_CHVT=y
+CONFIG_FGCONSOLE=y
 CONFIG_CLEAR=y
 # CONFIG_DEALLOCVT is not set
 CONFIG_DUMPKMAP=y
+CONFIG_KBD_MODE=y
 CONFIG_LOADFONT=y
 CONFIG_LOADKMAP=y
 # CONFIG_OPENVT is not set
@@ -268,8 +325,18 @@ CONFIG_RESET=y
 # CONFIG_FEATURE_RESIZE_PRINT is not set
 # CONFIG_SETCONSOLE is not set
 # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+CONFIG_SETFONT=y
+CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
+CONFIG_DEFAULT_SETFONT_DIR=""
 # CONFIG_SETKEYCODES is not set
 # CONFIG_SETLOGCONS is not set
+CONFIG_SHOWKEY=y
+
+#
+# Common options for loadfont and setfont
+#
+CONFIG_FEATURE_LOADFONT_PSF2=y
+CONFIG_FEATURE_LOADFONT_RAW=y
 
 #
 # Debian Utilities
@@ -287,28 +354,30 @@ CONFIG_WHICH=y
 #
 # Editors
 #
-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
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_FEATURE_DIFF_MINIMAL is not set
-# CONFIG_ED is not set
 # CONFIG_PATCH is not set
-CONFIG_SED=y
 # CONFIG_VI is not set
-CONFIG_FEATURE_VI_MAX_LEN=
+CONFIG_FEATURE_VI_MAX_LEN=0
+# CONFIG_FEATURE_VI_8BIT is not set
 # CONFIG_FEATURE_VI_COLON is not set
 # CONFIG_FEATURE_VI_YANKMARK is not set
 # CONFIG_FEATURE_VI_SEARCH is not set
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
 # CONFIG_FEATURE_VI_USE_SIGNALS is not set
 # CONFIG_FEATURE_VI_DOT_CMD is not set
 # CONFIG_FEATURE_VI_READONLY is not set
 # CONFIG_FEATURE_VI_SETOPTS is not set
 # CONFIG_FEATURE_VI_SET is not set
 # CONFIG_FEATURE_VI_WIN_RESIZE is not set
+# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
 # CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+# CONFIG_CMP is not set
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
+CONFIG_SED=y
 # CONFIG_FEATURE_ALLOW_EXEC is not set
 
 #
@@ -336,6 +405,7 @@ CONFIG_FEATURE_FIND_SIZE=y
 # CONFIG_FEATURE_FIND_PATH is not set
 # CONFIG_FEATURE_FIND_REGEX is not set
 # CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_FEATURE_FIND_LINKS=y
 CONFIG_GREP=y
 # CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
@@ -349,32 +419,47 @@ CONFIG_XARGS=y
 #
 # Init Utilities
 #
+CONFIG_BOOTCHARTD=y
+CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y
+CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
 CONFIG_INIT=y
-# CONFIG_DEBUG_INIT is not set
 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_SYSLOG is not set
 # CONFIG_FEATURE_EXTRA_QUIET is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 CONFIG_FEATURE_INITRD=y
-CONFIG_HALT=y
+CONFIG_INIT_TERMINAL_TYPE="linux"
 CONFIG_MESG=y
+CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
 
 #
 # Login/Password Management Utilities
 #
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
 # CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_SHADOW is not set
 # CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+CONFIG_USE_BB_CRYPT_SHA=y
+# CONFIG_ADDUSER is not set
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=0
+CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_ADDGROUP is not set
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
 # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+# CONFIG_DELUSER is not set
 # CONFIG_DELGROUP is not set
 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_DELUSER is not set
 # CONFIG_GETTY is not set
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
 # CONFIG_LOGIN is not set
 # CONFIG_PAM is not set
 # CONFIG_LOGIN_SCRIPTS is not set
@@ -396,34 +481,48 @@ CONFIG_CHPASSWD=y
 # CONFIG_CHATTR is not set
 # CONFIG_FSCK is not set
 # CONFIG_LSATTR is not set
+# CONFIG_TUNE2FS is not set
 
 #
 # Linux Module Utilities
 #
-CONFIG_INSMOD=y
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# 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_RMMOD=y
-CONFIG_LSMOD=y
+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_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
-CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+# CONFIG_MODPROBE is not set
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
 
 #
 # Options common to multiple modutils
 #
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_2_4_MODULES=y
-CONFIG_FEATURE_2_6_MODULES=y
-# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# 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_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 
 #
 # Linux System Utilities
 #
+CONFIG_BLOCKDEV=y
+CONFIG_REV=y
+CONFIG_ACPID=y
+CONFIG_FEATURE_ACPID_COMPAT=y
+CONFIG_BLKID=y
+# CONFIG_FEATURE_BLKID_TYPE is not set
 CONFIG_DMESG=y
 CONFIG_FEATURE_DMESG_PRETTY=y
 # CONFIG_FBSET is not set
@@ -432,45 +531,64 @@ CONFIG_FEATURE_DMESG_PRETTY=y
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDFORMAT is not set
 # CONFIG_FDISK is not set
-CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
 # CONFIG_FEATURE_FDISK_WRITABLE is not set
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
 # CONFIG_FEATURE_SUN_LABEL is not set
 # CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
 # CONFIG_FEATURE_FDISK_ADVANCED is not set
+CONFIG_FINDFS=y
+CONFIG_FLOCK=y
 CONFIG_FREERAMDISK=y
 # CONFIG_FSCK_MINIX is not set
+CONFIG_MKFS_EXT2=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_REISER is not set
+CONFIG_MKFS_VFAT=y
 # CONFIG_GETOPT is not set
+# CONFIG_FEATURE_GETOPT_LONG is not set
 CONFIG_HEXDUMP=y
+CONFIG_FEATURE_HEXDUMP_REVERSE=y
+CONFIG_HD=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
 # CONFIG_IPCRM is not set
 # CONFIG_IPCS is not set
 CONFIG_LOSETUP=y
-CONFIG_MDADM=y
+CONFIG_LSPCI=y
+CONFIG_LSUSB=y
 CONFIG_MDEV=y
 # CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 # CONFIG_FEATURE_MDEV_EXEC is not set
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
-CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
-# CONFIG_FEATURE_MKSWAP_V0 is not set
+# CONFIG_FEATURE_MKSWAP_UUID is not set
 CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_NFS=n
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+CONFIG_FEATURE_MOUNT_LABEL=y
+# CONFIG_FEATURE_MOUNT_NFS is not set
 # CONFIG_FEATURE_MOUNT_CIFS is not set
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
 CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
+CONFIG_RDEV=y
 # CONFIG_READPROFILE is not set
+CONFIG_RTCWAKE=y
+CONFIG_SCRIPT=y
+CONFIG_SCRIPTREPLAY=y
 # CONFIG_SETARCH is not set
 CONFIG_SWAPONOFF=y
+CONFIG_FEATURE_SWAPON_PRI=y
 CONFIG_SWITCH_ROOT=y
 CONFIG_UMOUNT=y
 # CONFIG_FEATURE_UMOUNT_ALL is not set
@@ -479,33 +597,94 @@ CONFIG_UMOUNT=y
 # Common options for mount/umount
 #
 CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 CONFIG_FEATURE_MTAB_SUPPORT=y
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_BTRFS=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_HFS=y
+CONFIG_FEATURE_VOLUMEID_JFS=y
+CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_ROMFS=y
+CONFIG_FEATURE_VOLUMEID_SYSV=y
+CONFIG_FEATURE_VOLUMEID_OCFS2=y
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
 
 #
 # Miscellaneous Utilities
 #
+# CONFIG_CONSPY is not set
+# CONFIG_LESS is not set
+CONFIG_FEATURE_LESS_MAXLINES=0
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# 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_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+CONFIG_SETSERIAL=y
+CONFIG_UBIATTACH=y
+CONFIG_UBIDETACH=y
+CONFIG_UBIMKVOL=y
+CONFIG_UBIRMVOL=y
+CONFIG_UBIRSVOL=y
+CONFIG_UBIUPDATEVOL=y
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+CONFIG_BEEP=y
+CONFIG_FEATURE_BEEP_FREQ=4000
+CONFIG_FEATURE_BEEP_LENGTH_MS=30
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+# 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_CHRT is not set
 # CONFIG_CROND is not set
-# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_D is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
+# CONFIG_FEATURE_DC_LIBM is not set
 # CONFIG_DEVFSD is not set
 # CONFIG_DEVFSD_MODLOAD is not set
 # CONFIG_DEVFSD_FG_NP is not set
 # CONFIG_DEVFSD_VERBOSE is not set
 # CONFIG_FEATURE_DEVFS is not set
+CONFIG_DEVMEM=y
 # CONFIG_EJECT is not set
+# CONFIG_FEATURE_EJECT_SCSI is not set
+CONFIG_FBSPLASH=y
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+CONFIG_IONICE=y
+# CONFIG_INOTIFYD is not set
 # CONFIG_LAST is not set
-# CONFIG_LESS is not set
-CONFIG_FEATURE_LESS_MAXLINES=
-# CONFIG_FEATURE_LESS_BRACKETS is not set
-# CONFIG_FEATURE_LESS_FLAGS is not set
-# CONFIG_FEATURE_LESS_FLAGCS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LAST_SMALL is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
 # CONFIG_HDPARM is not set
 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -516,54 +695,82 @@ CONFIG_FEATURE_LESS_MAXLINES=
 CONFIG_MAKEDEVS=y
 CONFIG_FEATURE_MAKEDEVS_LEAF=y
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+CONFIG_MAN=y
+CONFIG_MICROCOM=y
 # CONFIG_MOUNTPOINT is not set
 # CONFIG_MT is not set
 # CONFIG_RAIDAUTORUN is not set
 # CONFIG_READAHEAD is not set
+# CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
-# CONFIG_STRINGS is not set
 # CONFIG_SETSID is not set
+# CONFIG_STRINGS is not set
 # CONFIG_TASKSET is not set
 # CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_TIME is not set
+CONFIG_TIMEOUT=y
 # CONFIG_TTYSIZE is not set
+CONFIG_VOLNAME=y
+# CONFIG_WALL is not set
 # CONFIG_WATCHDOG is not set
 
 #
 # Networking Utilities
 #
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NBDCLIENT=y
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+# CONFIG_NC_110_COMPAT is not set
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_WHOIS=y
 # CONFIG_FEATURE_IPV6 is not set
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
 # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
 # CONFIG_ARP is not set
 # CONFIG_ARPING is not set
+CONFIG_BRCTL=y
+CONFIG_FEATURE_BRCTL_FANCY=y
+CONFIG_FEATURE_BRCTL_SHOW=y
 # CONFIG_DNSD is not set
 # CONFIG_ETHER_WAKE is not set
 # CONFIG_FAKEIDENTD is not set
+CONFIG_FTPD=y
+CONFIG_FEATURE_FTP_WRITE=y
+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
 # CONFIG_FTPGET is not set
 # CONFIG_FTPPUT is not set
 # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
 CONFIG_HOSTNAME=y
 # CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
 # CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
 # CONFIG_FEATURE_HTTPD_CGI is not set
 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
 # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
 CONFIG_FEATURE_IFCONFIG_HW=y
 # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFENSLAVE=y
+CONFIG_IFPLUGD=y
 # CONFIG_IFUPDOWN is not set
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_FEATURE_IFUPDOWN_IP is not set
 # CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
 # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
@@ -585,6 +792,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
 # CONFIG_FEATURE_IP_TUNNEL is not set
 # CONFIG_FEATURE_IP_RULE is not set
 # CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
 # CONFIG_IPADDR is not set
 # CONFIG_IPLINK is not set
 # CONFIG_IPROUTE is not set
@@ -593,113 +801,199 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-# CONFIG_NC is not set
-# CONFIG_NC_SERVER is not set
-# CONFIG_NC_EXTRA is not set
 # CONFIG_NETSTAT is not set
 # CONFIG_FEATURE_NETSTAT_WIDE is not set
+# CONFIG_FEATURE_NETSTAT_PRG is not set
 # CONFIG_NSLOOKUP is not set
-CONFIG_PING=y
-# CONFIG_PING6 is not set
+CONFIG_NTPD=y
+CONFIG_FEATURE_NTPD_SERVER=y
 # CONFIG_PSCAN is not set
-CONFIG_FEATURE_FANCY_PING=y
 CONFIG_ROUTE=y
 # CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
 # CONFIG_TELNET is not set
 # CONFIG_FEATURE_TELNET_TTYPE is not set
 # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
 # CONFIG_TELNETD is not set
 # CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 # CONFIG_TFTP is not set
+CONFIG_TFTPD=y
+
+#
+# Common options for tftp/tftpd
+#
 # CONFIG_FEATURE_TFTP_GET is not set
 # CONFIG_FEATURE_TFTP_PUT is not set
 # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_DEBUG_TFTP is not set
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_TFTP_DEBUG is not set
 # CONFIG_TRACEROUTE is not set
+# CONFIG_TRACEROUTE6 is not set
 # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
 # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_APP_UDHCPD is not set
-# CONFIG_APP_DHCPRELAY is not set
-# CONFIG_APP_DUMPLEASES is not set
+CONFIG_TUNCTL=y
+CONFIG_FEATURE_TUNCTL_UG=y
+CONFIG_UDHCPD=y
+CONFIG_DHCPRELAY=y
+CONFIG_DUMPLEASES=y
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-CONFIG_APP_UDHCPC=y
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_FEATURE_RFC3397 is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=9
+CONFIG_FEATURE_UDHCP_RFC3397=y
+CONFIG_FEATURE_UDHCP_8021Q=y
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+# CONFIG_UDPSVD is not set
 # CONFIG_VCONFIG is not set
 CONFIG_WGET=y
 # CONFIG_FEATURE_WGET_STATUSBAR is not set
 # CONFIG_FEATURE_WGET_AUTHENTICATION is not set
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_FEATURE_WGET_TIMEOUT=y
 # CONFIG_ZCIP is not set
 
 #
+# Print Utilities
+#
+CONFIG_LPD=y
+CONFIG_LPR=y
+CONFIG_LPQ=y
+
+#
+# Mail Utilities
+#
+CONFIG_MAKEMIME=y
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
+CONFIG_POPMAILDIR=y
+CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
+CONFIG_REFORMIME=y
+CONFIG_FEATURE_REFORMIME_COMPAT=y
+CONFIG_SENDMAIL=y
+
+#
 # Process Utilities
 #
+CONFIG_IOSTAT=y
+CONFIG_MPSTAT=y
+# CONFIG_NMETER is not set
+CONFIG_PMAP=y
+CONFIG_POWERTOP=y
+CONFIG_PSTREE=y
+CONFIG_PWDX=y
+CONFIG_SMEMCAP=y
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 CONFIG_FREE=y
 # CONFIG_FUSER is not set
 CONFIG_KILL=y
 CONFIG_KILLALL=y
 # CONFIG_KILLALL5 is not set
-# CONFIG_NMETER is not set
+CONFIG_PGREP=y
 # CONFIG_PIDOF is not set
 # CONFIG_FEATURE_PIDOF_SINGLE is not set
 # CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_PKILL=y
 CONFIG_PS=y
 # CONFIG_FEATURE_PS_WIDE is not set
+# CONFIG_FEATURE_PS_TIME is not set
+# 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_TOP is not set
 # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
 # CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
 # CONFIG_FEATURE_TOP_DECIMALS is not set
-CONFIG_UPTIME=y
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+CONFIG_FEATURE_SHOW_THREADS=y
 # CONFIG_WATCH is not set
 
 #
-# Shells
+# Runit Utilities
 #
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
 
 #
-# Ash Shell Options
+# Shells
 #
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+# CONFIG_ASH_IDLE_TIMEOUT is not set
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-# CONFIG_ASH_MATH_SUPPORT_64 is not set
 # CONFIG_ASH_GETOPTS is not set
 # CONFIG_ASH_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_PRINTF=y
 CONFIG_ASH_BUILTIN_TEST=y
 # CONFIG_ASH_CMDCMD is not set
 CONFIG_ASH_MAIL=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_ASH_RANDOM_SUPPORT is not set
 # CONFIG_ASH_EXPAND_PRMT is not set
+# CONFIG_CTTYHACK is not set
 # CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
 # CONFIG_HUSH_HELP is not set
 # CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set
 # CONFIG_HUSH_TICK is not set
 # CONFIG_HUSH_IF is not set
 # CONFIG_HUSH_LOOPS is not set
-# CONFIG_LASH is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
 # CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+CONFIG_SH_MATH_SUPPORT=y
+CONFIG_SH_MATH_SUPPORT_64=y
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 # CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_CTTYHACK is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_FEATURE_SH_HISTFILESIZE=y
 
 #
 # System Logging Utilities
@@ -707,41 +1001,13 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_SYSLOGD is not set
 # CONFIG_FEATURE_ROTATE_LOGFILE is not set
 # CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 # CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
 # CONFIG_LOGREAD is not set
 # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
 # CONFIG_KLOGD is not set
+# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
 # CONFIG_LOGGER is not set
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_SV is not set
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-
-#
-# ipsvd utilities
-#
-# CONFIG_TCPSVD is not set
-# CONFIG_UDPSVD is not set

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

[Sebastian Pipping]

commit:     5feb521988d2c8fd31a8276198a13ac67afc02dd
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Jan 13 23:11:13 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 23:11:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5feb5219

Busybox config: Enable verbose usage

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

diff --git a/ChangeLog b/ChangeLog
index fdf8bf0..417c26c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 # $Id$
 
   13 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/busy-config:
+  Busybox config: Enable verbose usage
+
+  13 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/busy-config:
   Update busybox config using "yes '' | make oldconfig"
 
   13 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel:

diff --git a/defaults/busy-config b/defaults/busy-config
index 17116dc..6a84568 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -21,7 +21,7 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
+CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_FEATURE_INSTALLER=y
 # CONFIG_INSTALL_NO_USR is not set

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

[Robin H. Johnson]

commit:     603a1978393aaf4e872dbcf0691a8272e0a3dc5d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 04:18:37 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 06:27:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=603a1978

Code to mount /usr and other filesystems as needed for new udev and systemd.

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

---
 ChangeLog               |    4 ++++
 defaults/initrd.scripts |   25 +++++++++++++++++++++++++
 defaults/linuxrc        |   23 +++++++++++++++++++++--
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 48843ec..01598db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc:
+  Code to mount /usr and other filesystems as needed for new udev and systemd.
+
   06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
   Bump version to 3.4.21.2. Stock configuration of 3.4.21.1 generates
   unbootable initramfs!

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b7b42ab..89629e9 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1178,3 +1178,28 @@ setup_unionfs() {
 		USE_UNIONFS_NORMAL=0
 	fi
 }
+
+get_mounts_list()
+{
+	awk '
+		/^[[:blank:]]*#/ { next }
+		{ print $1 }
+		' ${NEW_ROOT}/etc/initramfs.mounts
+}
+
+get_mount_options()
+{
+	awk -v fs="$1" '
+		/^[[:blank:]]*#/ { next }
+		$2 == fs { print $3 }
+		' ${NEW_ROOT}/etc/fstab
+}
+
+get_mount_device()
+{
+	awk -v fs="$1" '
+		/^[[:blank:]]*#/ { next }
+		$2 == fs { print $1 }
+		' ${NEW_ROOT}/etc/fstab
+}
+

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 28d204e..599c0d1 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -701,6 +701,24 @@ else
 	fi
 fi
 
+# Mount the additional things as required by udev & systemd
+if [ ! -f ${NEW_ROOT}/etc/initramfs.mounts ]; then
+	fslist="/usr"
+else
+	fslist=$(get_mounts_list)
+fi
+
+for fs in $fslist; do
+	dev=$(get_mount_device $fs)
+	# In this case, it's probably part of the filesystem
+	# and not a mountpoint
+	[ -z "$dev" ] && continue
+	opts="ro,$(get_mount_options \"$fs\")"
+	if ! mount -o ${opts} $dev ${NEW_ROOT}${fs}; then
+		rescue_shell "Unable to mount $dev on $fs"
+	fi
+done
+
 # Execute script on the cdrom just before boot to update things if necessary
 cdupdate
 
@@ -746,10 +764,11 @@ exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}"
 # If we get here, something bad has happened
 splash 'verbose'
 
-echo 'A fatal error has probably occured since /sbin/init did not'
-echo 'boot correctly. Trying to open a shell...'
+echo "A fatal error has probably occured since ${REAL_INIT:-/sbin/init} did not"
+echo "boot correctly. Trying to open a shell..."
 echo
 exec /bin/bash
 exec /bin/sh
 exec /bin/ash
+exec /bin/dash
 exec sh

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

[Sebastian Pipping]

commit:     8f8676adbd41e22b67174e14cc5f0dd45e7c2657
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Oct 31 21:55:15 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 21:55:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=8f8676ad

Fix return value of crypt_filter() which caused bogus LUKS opening errors (bug #383545)

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

diff --git a/ChangeLog b/ChangeLog
index 361d351..abdcbd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  31 Oct 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+  Fix return value of crypt_filter() which caused bogus LUKS opening errors
+  (bug #383545)
+
   30 Oct 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.19
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d706c1a..89c6d8b 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -356,10 +356,12 @@ crypt_filter() {
 	else
 		splash 'verbose' > /dev/null &
 		eval $1
-		if [ $? -eq 0 ]
+		res=$?
+		if [ ${res} -eq 0 ]
 		then
 			splash set_msg 'Disk unlocked.'
 		fi
+		return ${res}
 	fi
 }
 

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

[Fabio Erculiani]

commit:     84cc7ccdfba1bde785c6d6116c42dda2c58d9ca7
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Sat Oct  8 21:26:51 2011 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 21:26:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=84cc7ccd

Do not hardcode /mnt/cdrom path across the whole code, use CDROOT_PATH
instead. At the same time, mount cdrom into /mnt/cdrom instead of
/newroot/mnt/cdrom (which is now just a bind mount), this avoids
losetup to expose unavailable paths inside the live system, breaking
mkfs.btrfs (next upstream version, which does silly things with
/proc/mounts).

---
 ChangeLog                |    9 +++++++++
 defaults/initrd.defaults |    1 +
 defaults/initrd.scripts  |   39 +++++++++++++++++----------------------
 defaults/linuxrc         |   23 ++++++++++++-----------
 4 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3bf74d0..78a722f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,15 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> defaults/initrd.defaults,
+  defaults/initrd.scripts, defaults/linuxrc:
+  Do not hardcode /mnt/cdrom path across the whole code, use CDROOT_PATH
+  instead. At the same time, mount cdrom into /mnt/cdrom instead of
+  /newroot/mnt/cdrom (which is now just a bind mount), this avoids
+  losetup to expose unavailable paths inside the live system, breaking
+  mkfs.btrfs (next upstream version, which does silly things with
+  /proc/mounts).
+
   07 Oct 2011; Robin H. Johnson <robbat2@gentoo.org>
   patches/busybox/1.18.1/1.18.1-mdstart.diff:
   Fix patch typo that broke compile.

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 76d72a7..8be54a9 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -71,6 +71,7 @@ CDROOT='0'
 CDROOT_DEV=''
 CDROOT_TYPE='auto'
 NEW_ROOT='/newroot'
+CDROOT_PATH='/mnt/cdrom'
 CONSOLE='/dev/console'
 
 LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop'

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b6b01ca..d706c1a 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -53,11 +53,10 @@ findmediamount() {
 	# $1 = mount dir name / media name
 	# $2 = recognition file
 	# $3 = variable to have the device path
-	# $4 = directory before /mnt, like NEW_ROOT
+	# $4 = actual mount dir path (full path)
 	# args remaining are possible devices 
 
-	local media=$1 recon=$2 vrbl=$3
-	local mntdir="${4}/mnt/${media}"
+	local media=$1 recon=$2 vrbl=$3 mntdir=$4
 	shift 4
 
 	good_msg "Looking for the ${media}" ${CRYPT_SILENT}
@@ -100,11 +99,6 @@ findmediamount() {
 				fi
 				good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT}
 
-#				if [ "${media}" = "cdrom" ]; then
-#					mount -r -t iso9660 ${x} ${mntdir} &>/dev/null
-#				else
-#					mount -r -t auto ${x} ${mntdir} &>/dev/null
-#				fi
 				mount -r -t ${CDROOT_TYPE} ${x} ${mntcddir} >/dev/null 2>&1
 				if [ "$?" = '0' ]
 				then
@@ -158,7 +152,7 @@ bootstrapCD() {
 	# a bunch of extra devices
 	[ -n "${CDROOT_DEV}" ] && DEVICES="${CDROOT_DEV}"
 
-	findmediamount "cdrom" "${SUBDIR}/livecd" "REAL_ROOT" "${NEW_ROOT}" ${DEVICES}
+	findmediamount "cdrom" "${SUBDIR}/livecd" "REAL_ROOT" "${CDROOT_PATH}" ${DEVICES}
 }
 
 bootstrapKey() {
@@ -166,7 +160,7 @@ bootstrapKey() {
 	local KEYDEVS=`devicelist`
 	eval local keyloc='"${CRYPT_'${1}'_KEY}"'
 
-	findmediamount "key" "${keyloc}" "CRYPT_${1}_KEYDEV" "" ${KEYDEVS}
+	findmediamount "key" "${keyloc}" "CRYPT_${1}_KEYDEV" "/mnt/key" ${KEYDEVS}
 }
 
 cache_cd_contents() {
@@ -187,7 +181,7 @@ cache_cd_contents() {
 			good_msg "Copying loop file for caching..."
 			# Verify that the needed directory exists
 			mkdir -p "$(dirname ${NEW_ROOT}/mnt/${LOOP})"
-			cp -a ${NEW_ROOT}/mnt/cdrom/${LOOP} ${NEW_ROOT}/mnt/${LOOP}
+			cp -a ${CDROOT_PATH}/${LOOP} ${NEW_ROOT}/mnt/${LOOP}
 			if [ $? -ne 0 ]
 			then
 				bad_msg "Failed to cache the loop file! Lack of space?"
@@ -258,7 +252,7 @@ findnfsmount() {
 			if [ "${CDROOT}" != '0' ]
 			then
 				good_msg "Attempting to mount NFS CD image on ${NFSROOT} with options ${NFSOPTIONS}"
-				mount -t nfs -o ${NFSOPTIONS} ${NFSROOT} ${NEW_ROOT}/mnt/cdrom
+				mount -t nfs -o ${NFSOPTIONS} ${NFSROOT} ${CDROOT_PATH}
 				if [ "$?" = '0' ]
 				then
 					REAL_ROOT="/dev/nfs"
@@ -283,7 +277,7 @@ findnfsmount() {
 }
 
 check_loop() {
-	if [ "${LOOP}" = '' -o ! -e "mnt/cdrom/${LOOP}" ]
+	if [ "${LOOP}" = '' -o ! -e "${CDROOT_PATH}/${LOOP}" ]
 	then
 	
 		bad_msg "Invalid loop location: ${LOOP}"
@@ -947,10 +941,10 @@ verbose_kmsg() {
 cdupdate() {
 	if [ "${CDROOT}" = '1' ]
 	then
-		if [ -x /${NEW_ROOT}/mnt/cdrom/cdupdate.sh ]
+		if [ -x /${CDROOT_PATH}/cdupdate.sh ]
 		then
 			good_msg "Running cdupdate.sh"
-			${NEW_ROOT}/mnt/cdrom/cdupdate.sh
+			${CDROOT_PATH}/cdupdate.sh
 			if [ "$?" != '0' ]
 			then
 				bad_msg "Executing cdupdate.sh failed!"
@@ -1065,10 +1059,9 @@ tuxonice_resume() {
 }
 
 find_loop() {
-	CDROM="${NEW_ROOT}/mnt/cdrom"
 	for loop in ${LOOPS}
 	do
-		if [ -e "${CDROM}""${loop}" ]
+		if [ -e "${CDROOT_PATH}""${loop}" ]
 		then
 			LOOP="${loop}"
 		fi
@@ -1098,8 +1091,7 @@ setup_squashfs_aufs() {
 	good_msg "Loading aufs"
 	modprobe aufs > /dev/null 2>&1
 
-	cd "${NEW_ROOT}"
-	mount -t squashfs -o loop,ro "mnt/cdrom${LOOPEXT}${LOOP}" "${static}"
+	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}"
 
@@ -1108,9 +1100,10 @@ setup_squashfs_aufs() {
 	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 as well
-	[ ! -d "${NEW_ROOT}/mnt/cdrom" ] && mkdir -p "${NEW_ROOT}/mnt/cdrom"
-	mount --bind mnt/cdrom "${NEW_ROOT}/mnt/cdrom"
+	# 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}"
 	)
 }
 
@@ -1171,6 +1164,8 @@ setup_unionfs() {
 			bad_msg "Can't setup union mount!"
 			USE_UNIONFS_NORMAL=0
 		fi
+		[ ! -d "${NEW_ROOT}${CDROOT_PATH}" ] && mkdir -p "${NEW_ROOT}${CDROOT_PATH}"
+		mount --bind "${CDROOT_PATH}" "${NEW_ROOT}${CDROOT_PATH}"
 	else
 		USE_UNIONFS_NORMAL=0
 	fi

diff --git a/defaults/linuxrc b/defaults/linuxrc
index f58bbb5..63366bd 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -345,11 +345,12 @@ then
 	good_msg "Making tmpfs for ${NEW_ROOT}"
 	mount -n -t tmpfs tmpfs "${NEW_ROOT}"
 
-	for i in dev mnt mnt/cdrom mnt/livecd mnt/key tmp tmp/.initrd mnt/gentoo sys
+	for i in dev mnt 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 "${NEW_ROOT}"/dev/null c 1 3
 	[ ! -e "${NEW_ROOT}/dev/console" ] && mknod "${NEW_ROOT}"/dev/console c 5 1
 
@@ -524,11 +525,11 @@ then
 	# If encrypted, find key and mount, otherwise mount as usual
 	if [ -n "${CRYPT_ROOT}" ]
 	then
-		CRYPT_ROOT_KEY="$(head -n 1 ${NEW_ROOT}/mnt/cdrom/livecd)"
+		CRYPT_ROOT_KEY="$(head -n 1 "${CDROOT_PATH}"/livecd)"
 		CRYPT_ROOT='/dev/loop0'
 		good_msg 'You booted an encrypted livecd' "${CRYPT_SILENT}"
 
-		losetup /dev/loop0 "${NEW_ROOT}/mnt/cdrom/${LOOPEXT}${LOOP}"
+		losetup /dev/loop0 "${CDROOT_PATH}/${LOOPEXT}${LOOP}"
 		test_success 'Preparing loop filesystem'
 
 		startLUKS
@@ -549,14 +550,14 @@ then
 		if [ "${LOOPTYPE}" = 'normal' ]
 		then
 			good_msg 'Mounting loop filesystem'
-			mount -t ext2 -o loop,ro "${NEW_ROOT}/mnt/cdrom/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd"
+			mount -t ext2 -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd"
 			test_success 'Mount filesystem'
 			FS_LOCATION='mnt/livecd'
 		elif [ "${LOOPTYPE}" = 'squashfs' ]
 		then
 			if [ "${USE_AUFS_NORMAL}" != '1' ]; then
 				good_msg 'Mounting squashfs filesystem'
-				mount -t squashfs -o loop,ro "${NEW_ROOT}/mnt/cdrom/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd"
+				mount -t squashfs -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd"
 			else
 				good_msg 'Mounting squashfs & aufs filesystems'
 				setup_squashfs_aufs
@@ -566,7 +567,7 @@ then
 		elif [ "${LOOPTYPE}" = 'gcloop' ]
 		then
 			good_msg 'Mounting gcloop filesystem'
-			echo ' ' | losetup -E 19 -e ucl-0 -p0 "${NEW_ROOT}/dev/loop0" "${NEW_ROOT}/mnt/cdrom/${LOOPEXT}${LOOP}"
+			echo ' ' | losetup -E 19 -e ucl-0 -p0 "${NEW_ROOT}/dev/loop0" "${CDROOT_PATH}/${LOOPEXT}${LOOP}"
 			test_success 'losetup the loop device'
 
 			mount -t ext2 -o ro "${NEW_ROOT}/dev/loop0" "${NEW_ROOT}/mnt/livecd"
@@ -574,10 +575,10 @@ then
 			FS_LOCATION='mnt/livecd'
 		elif [ "${LOOPTYPE}" = 'zisofs' ]
 		then
-			FS_LOCATION="mnt/cdrom/${LOOPEXT}${LOOP}"
+			FS_LOCATION="${CDROOT_PATH/\/}/${LOOPEXT}${LOOP}"
 		elif [ "${LOOPTYPE}" = 'noloop' ]
 		then
-			FS_LOCATION='mnt/cdrom'
+			FS_LOCATION="${CDROOT_PATH/\/}"
 		elif [ "${LOOPTYPE}" = 'sgimips' ]
 		then
 			# getdvhoff finds the starting offset (in bytes) of the squashfs
@@ -610,9 +611,9 @@ then
 	# We do this now, so that additional packages can add whereever they want.
 	if [ "${REAL_ROOT}" = '/dev/nfs' ]
 	then
-		if [ -e "${NEW_ROOT}/mnt/cdrom/add" ]
+		if [ -e "${CDROOT_PATH}/add" ]
 		then
-				for targz in $(ls ${NEW_ROOT}/mnt/cdrom/add/*.tar.gz)
+				for targz in $(ls ${CDROOT_PATH}/add/*.tar.gz)
 				do
 					tarname=$(basename ${targz})
 					good_msg "Adding additional package ${tarname}"
@@ -624,7 +625,7 @@ then
 
 	if [ "${USE_UNIONFS_NORMAL}" = '1' ]
 	then
-		setup_unionfs ${NEW_ROOT} ${NEW_ROOT}/${FS_LOCATION}
+		setup_unionfs ${NEW_ROOT} /${FS_LOCATION}
 		CHROOT=/union
 	elif [ "${USE_AUFS_NORMAL}" != '1' ]; then
 

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

[Fabio Erculiani]

commit:     1e50bd01d27fbc3c3be29753f59f6e9608a19312
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Sep 13 09:58:30 2011 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 09:58:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1e50bd01

trivial: cleanup code, drop whitespaces and some more cruft

---
 defaults/linuxrc     |   60 +++++++++++++++++--------------------------------
 gen_arch.sh          |    2 +-
 gen_bootloader.sh    |    4 +-
 gen_cmdline.sh       |    4 +-
 gen_compile.sh       |    4 +-
 gen_configkernel.sh  |    2 +-
 gen_determineargs.sh |   14 +++++-----
 gen_funcs.sh         |   10 ++++----
 gen_initramfs.sh     |   32 +++++++++++++-------------
 gen_moddeps.sh       |    4 +-
 gen_package.sh       |   33 +++++++++++++--------------
 11 files changed, 75 insertions(+), 94 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ee74d76..01d5cf9 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -78,7 +78,7 @@ do
 		isoboot=*)
 			ISOBOOT=${x#*=}
 		;;
-		# Start Volume manager options 
+		# Start Volume manager options
 		dolvm)
 			USE_LVM_NORMAL=1
 		;;
@@ -100,7 +100,7 @@ do
 		debug)
 			DEBUG='yes'
 		;;
-		# Scan delay options 
+		# Scan delay options
 		scandelay=*)
 			SDELAY=${x#*=}
 		;;
@@ -228,30 +228,12 @@ do
 		nounionfs)
 			USE_UNIONFS_NORMAL=0
 			;;
-#                 unionfs=*) 	 
-#                         if [ ! -x /sbin/unionfs ] 	 
-#                         then 	 
-#                                 USE_UNIONFS_NORMAL=0 	 
-#                                 bad_msg 'unionfs binary not found: aborting use of unionfs!'
-#                         else 	 
-#                                 USE_UNIONFS_NORMAL=1 	 
-#                                 CMD_UNIONFS=${x#*=} 	 
-#                                 echo ${CMD_UNIONFS}|grep , >/dev/null 2>&1 	 
-#                                 if [ $? -eq 0 ]
-#                                 then 	 
-#                                         UID=$(echo ${CMD_UNIONFS#*,}) 	 
-#                                         UNIONFS=$(echo ${CMD_UNIONFS%,*}) 
-#                                 else 	 
-#                                         UNIONFS=${CMD_UNIONFS} 	 
-#                                 fi 	 
-#                         fi 	 
-#                 ;;
 	esac
 done
 
 if [ -z "${REAL_ROOT}" -a \( "${CDROOT}" = '0' \)  -a \( "${FAKE_ROOT}" != "/dev/ram0" \) ]
 then
-	REAL_ROOT="${FAKE_ROOT}"	
+	REAL_ROOT="${FAKE_ROOT}"
 fi
 
 splash 'init'
@@ -325,22 +307,22 @@ then
 
 				RESUME_DEV=""
 				retval=1
-				
+
 				if [ ${retval} -ne 0 ]; then
 					RESUME_DEV=$(findfs "${REAL_RESUME}" 2>/dev/null)
 					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 -l -t "${REAL_RESUME}" | cut -d ":" -f 1 2>/dev/null)
 					retval=$?
 				fi
-				
+
 				if [ ${retval} -eq 0 ] && [ -n "${RESUME_DEV}" ]; then
 					good_msg "Detected real_resume=${RESUME_DEV}"
 					REAL_RESUME="${RESUME_DEV}"
@@ -362,7 +344,7 @@ if [ "${CDROOT}" = '1' ]
 then
 	good_msg "Making tmpfs for ${NEW_ROOT}"
 	mount -n -t tmpfs tmpfs "${NEW_ROOT}"
-	
+
 	for i in dev mnt mnt/cdrom mnt/livecd mnt/key tmp tmp/.initrd mnt/gentoo sys
 	do
 		mkdir -p "${NEW_ROOT}/${i}"
@@ -393,7 +375,7 @@ then
 	if [ "${REAL_ROOT}" = '' ]
 	then
 		echo -n -e "${WARN}>>${NORMAL}${BOLD} No bootable medium found. Waiting for new devices"
-		
+
 		COUNTER=0
 		while [ ${COUNTER} -lt 3 ]; do
 			sleep 3
@@ -428,26 +410,26 @@ do
 	while [ "${got_good_root}" != '1' ]
 	do
 		case "${REAL_ROOT}" in
-			LABEL\=*|UUID\=*)
-			
+			LABEL=*|UUID=*)
+
 				ROOT_DEV=""
 				retval=1
-				
+
 				if [ ${retval} -ne 0 ]; then
 					ROOT_DEV=$(findfs "${REAL_ROOT}" 2>/dev/null)
 					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 -l -t "${REAL_ROOT}" | cut -d ":" -f 1 2>/dev/null)
 					retval=$?
 				fi
-				
+
 				if [ ${retval} -eq 0 ] && [ -n "${ROOT_DEV}" ]; then
 					good_msg "Detected real_root=${ROOT_DEV}"
 					REAL_ROOT="${ROOT_DEV}"
@@ -458,7 +440,7 @@ do
 				fi
 				;;
 		esac
-				
+
 		if [ "${REAL_ROOT}" = '' ]
 		then
 			# No REAL_ROOT determined/specified. Prompt user for root block device.
@@ -503,8 +485,8 @@ do
 				mount -t ${ROOTFSTYPE} -o ro,${REAL_ROOTFLAGS} ${REAL_ROOT} ${NEW_ROOT}
 			fi
 		fi
-		
-		# If mount is successful break out of the loop 
+
+		# If mount is successful break out of the loop
 		# else not a good root and start over.
 		if [ "$?" = '0' ]
 		then
@@ -613,7 +595,7 @@ then
 					"${NEW_ROOT}${CDROOT_DEV}" \
 					"${NEW_ROOT}${REAL_ROOT}"
 			test_success 'losetup /dev/sr0 /dev/loop0'
-	
+
 			good_msg 'Mounting the Root Partition'
 			mount -t squashfs -o ro "${NEW_ROOT}${CDROOT_DEV}" "${NEW_ROOT}/mnt/livecd"
 			test_success 'mount /dev/loop0 /'
@@ -631,7 +613,7 @@ then
 		if [ -e "${NEW_ROOT}/mnt/cdrom/add" ]
 		then
 				for targz in $(ls ${NEW_ROOT}/mnt/cdrom/add/*.tar.gz)
-				do	
+				do
 					tarname=$(basename ${targz})
 					good_msg "Adding additional package ${tarname}"
 					(cd ${NEW_ROOT} ; /bin/tar -xzf ${targz})
@@ -645,7 +627,7 @@ then
 		setup_unionfs ${NEW_ROOT} ${NEW_ROOT}/${FS_LOCATION}
 		CHROOT=/union
 	elif [ "${USE_AUFS_NORMAL}" != '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}")

diff --git a/gen_arch.sh b/gen_arch.sh
index c7bd3cc..866a40f 100755
--- a/gen_arch.sh
+++ b/gen_arch.sh
@@ -42,7 +42,7 @@ get_official_arch() {
 	then
 		UTILS_ARCH='sparc'
 	fi
-	
+
 	ARCH_CONFIG="${GK_SHARE}/arch/${ARCH}/config.sh"
 	[ -f "${ARCH_CONFIG}" ] || gen_die "${ARCH} not yet supported by genkernel. Please add the arch-specific config file, ${ARCH_CONFIG}"
 }

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 3e6f98b..79531d4 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -60,7 +60,7 @@ set_bootloader_grub() {
 			echo "root (${GRUB_BOOT_DISK},${GRUB_BOOT_PARTITION})" >> ${GRUB_CONF}
 			echo >> ${GRUB_CONF}
 
-			# Add grub configuration to grub.conf	
+			# Add grub configuration to grub.conf
 			echo "# Genkernel generated entry, see GRUB documentation for details" >> ${GRUB_CONF}
 			echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF}
 			if [ "${BUILD_INITRD}" = '0' ]
@@ -109,7 +109,7 @@ set_bootloader_grub_check_for_existing_entry() {
 set_bootloader_grub_duplicate_default() {
 	local GRUB_CONF=$1
 	local GRUB_CONF_TMP="${GRUB_CONF}.tmp"
-	
+
 	line_count=$(wc -l < "${GRUB_CONF}")
 	line_nums="$(grep -n "^title" "${GRUB_CONF}" | cut -d: -f1)"
 	if [ -z "${line_nums}" ]; then

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index b3e451d..f048b28 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -422,11 +422,11 @@ parse_cmdline() {
 			TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
 			print_info 2 "TMPDIR: ${TMPDIR}"
 			print_info 2 "TEMP: ${TEMP}"
-			;; 
+			;;
 		--postclear)
 			CMD_POSTCLEAR=1
 			print_info 2 "CMD_POSTCLEAR: ${CMD_POSTCLEAR}"
-			;; 
+			;;
 		--arch-override=*)
 			CMD_ARCHOVERRIDE=`parse_opt "$*"`
 			print_info 2 "CMD_ARCHOVERRIDE: ${CMD_ARCHOVERRIDE}"

diff --git a/gen_compile.sh b/gen_compile.sh
index 045ca8f..fce0750 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -517,10 +517,10 @@ compile_dmraid() {
 		rm -rf "${TEMP}/device-mapper" > /dev/null
 		/bin/tar -jxpf "${DEVICE_MAPPER_BINCACHE}" -C "${TEMP}" ||
 			gen_die "Could not extract device-mapper binary cache!";
-		
+
 		cd "${DMRAID_DIR}"
 		print_info 1 'dmraid: >> Configuring...'
-		
+
 		LDFLAGS="-L${TEMP}/device-mapper/lib" \
 		CFLAGS="-I${TEMP}/device-mapper/include" \
 		CPPFLAGS="-I${TEMP}/device-mapper/include" \

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index faf1874..5d619fa 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -73,7 +73,7 @@ config_kernel() {
 	else
 		print_info 1 "kernel: --clean is disabled; not running 'make clean'."
 	fi
-	
+
 	if isTrue ${MENUCONFIG}
 	then
 		print_info 1 'kernel: >> Invoking menuconfig...'

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index ce479cb..8244269 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -30,7 +30,7 @@ get_KV() {
 		SUB=`grep ^SUBLEVEL\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'`
 		EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g" -e 's/\$([a-z]*)//gi'`
 
-		if [ -z "${SUB}" ]; 
+		if [ -z "${SUB}" ]
 		then
 			# Handle O= build directories
 			KERNEL_SOURCE_DIR=`grep ^MAKEARGS\ \:\=  ${KERNEL_DIR}/Makefile | awk '{ print $4 };'`
@@ -143,7 +143,7 @@ determine_real_args() {
 	FUSE_BINCACHE=`cache_replace "${FUSE_BINCACHE}"`
 	UNIONFS_FUSE_BINCACHE=`cache_replace "${UNIONFS_FUSE_BINCACHE}"`
 	GPG_BINCACHE=`cache_replace "${GPG_BINCACHE}"`
-  
+
 	DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"`
 	BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"`
 	BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`
@@ -166,7 +166,7 @@ determine_real_args() {
 			BOOTLOADER=`echo "${CMD_BOOTLOADER}" | cut -f1 -d:`
 		fi
 	fi
-	
+
 	if [ "${NO_KERNEL_SOURCES}" != "1" ]
 	then
 		if [ ! -d ${KERNEL_DIR} ]
@@ -192,7 +192,7 @@ determine_real_args() {
 		fi
 	fi
 
-	# Special case:  If --no-clean is specified on the command line, 
+	# Special case:  If --no-clean is specified on the command line,
 	# imply --no-mrproper.
 	if [ "${CMD_CLEAN}" != '' ]
 	then
@@ -201,12 +201,12 @@ determine_real_args() {
 			MRPROPER=0
 		fi
 	fi
-	
+
 	if [ -n "${MINKERNPACKAGE}" ]
 	then
 		mkdir -p `dirname ${MINKERNPACKAGE}`
 	fi
-	
+
 	if [ -n "${MODULESPACKAGE}" ]
 	then
 		mkdir -p `dirname ${MODULESPACKAGE}`
@@ -221,6 +221,6 @@ determine_real_args() {
 	then
 		INTEGRATED_INITRAMFS=0
 	fi
-	
+
 	get_KV
 }

diff --git a/gen_funcs.sh b/gen_funcs.sh
index a5cd5df..13e57c7 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -22,7 +22,7 @@ isTrue() {
 	return 1
 }
 
-setColorVars() { 
+setColorVars() {
 if isTrue ${USECOLOR}
 then
 	GOOD=$'\e[32;01m'
@@ -144,7 +144,7 @@ print_info() {
 				DEBUGCACHE="${DEBUGCACHE}${STR}"
 			else
 				echo -ne "${STR}" >> ${LOGFILE}
-			fi	
+			fi
 		else
 			if [ "${TODEBUGCACHE}" = '1' ]; then
 				DEBUGCACHE="${DEBUGCACHE}${STR}"$'\n'
@@ -178,7 +178,7 @@ var_replace()
   # in the later sed expression
   local SAFE_VAR
   SAFE_VAR=`echo "${2}" | sed -e 's/\([\/\.]\)/\\\\\\1/g'`
-  
+
   echo "${3}" | sed -e "s/%%${1}%%/${SAFE_VAR}/g" -
 }
 
@@ -194,7 +194,7 @@ clear_log() {
     if [ -f "${LOGFILE}" ]
     then
 	(echo > "${LOGFILE}") 2>/dev/null || small_die "Genkernel: Could not write to ${LOGFILE}."
-    fi   
+    fi
 }
 
 gen_die() {
@@ -267,7 +267,7 @@ then
 		rm ${TMPDIR}/${i}
 	done
 fi
-}	
+}
 
 #
 # Function to copy various kernel boot image products to the boot directory,

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 50ddbe5..41c07a6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -25,7 +25,7 @@ append_base_layout() {
 
 	echo "/dev/ram0     /           ext2    defaults	0 0" > ${TEMP}/initramfs-base-temp/etc/fstab
 	echo "proc          /proc       proc    defaults    0 0" >> ${TEMP}/initramfs-base-temp/etc/fstab
-	
+
 	cd ${TEMP}/initramfs-base-temp/dev
 	mknod -m 660 console c 5 1
 	mknod -m 660 null c 1 3
@@ -61,7 +61,7 @@ append_busybox() {
 		ln -s busybox ${TEMP}/initramfs-busybox-temp/bin/$i ||
 			gen_die "Busybox error: could not link ${i}!"
 	done
-	
+
 	cd "${TEMP}/initramfs-busybox-temp/"
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing busybox cpio"
@@ -174,7 +174,7 @@ append_multipath(){
 			|| gen_die "Could not copy file ${i} for MULTIPATH"
 	done
 
-	if [ -x /sbin/multipath ] 
+	if [ -x /sbin/multipath ]
 	then
 		cp /etc/multipath.conf "${TEMP}/initramfs-multipath-temp/etc/" || gen_die 'could not copy /etc/multipath.conf please check this'
 	fi
@@ -475,12 +475,12 @@ append_modules() {
 	else
 	  cd /
 	fi
-	
+
 	if [ -d "${TEMP}/initramfs-modules-${KV}-temp" ]
 	then
 		rm -r "${TEMP}/initramfs-modules-${KV}-temp/"
 	fi
-	mkdir -p "${TEMP}/initramfs-modules-${KV}-temp/lib/modules/${KV}"	
+	mkdir -p "${TEMP}/initramfs-modules-${KV}-temp/lib/modules/${KV}"
 	for i in `gen_dep_list`
 	do
 		mymod=`find ./lib/modules/${KV} -name "${i}${MOD_EXT}" 2>/dev/null| head -n 1 `
@@ -489,11 +489,11 @@ append_modules() {
 			print_warning 2 "Warning :: ${i}${MOD_EXT} not found; skipping..."
 			continue;
 		fi
-		
+
 		print_info 2 "initramfs: >> Copying ${i}${MOD_EXT}..."
 		cp -ax --parents "${mymod}" "${TEMP}/initramfs-modules-${KV}-temp"
 	done
-	
+
 	cp -ax --parents ./lib/modules/${KV}/modules* ${TEMP}/initramfs-modules-${KV}-temp 2>/dev/null
 
 	mkdir -p "${TEMP}/initramfs-modules-${KV}-temp/etc/modules"
@@ -519,13 +519,13 @@ append_auxilary() {
 	then
 		rm -r "${TEMP}/initramfs-aux-temp/"
 	fi
-	mkdir -p "${TEMP}/initramfs-aux-temp/etc"	
-	mkdir -p "${TEMP}/initramfs-aux-temp/sbin"	
+	mkdir -p "${TEMP}/initramfs-aux-temp/etc"
+	mkdir -p "${TEMP}/initramfs-aux-temp/sbin"
 	if [ -f "${CMD_LINUXRC}" ]
 	then
 		cp "${CMD_LINUXRC}" "${TEMP}/initramfs-aux-temp/init"
 		print_info 2 "        >> Copying user specified linuxrc: ${CMD_LINUXRC} to init"
-	else	
+	else
 		if isTrue ${NETBOOT}
 		then
 			cp "${GK_SHARE}/netboot/linuxrc.x" "${TEMP}/initramfs-aux-temp/init"
@@ -546,12 +546,12 @@ append_auxilary() {
 	# big cpio.
 	cd ${TEMP}/initramfs-aux-temp
 	ln -s init linuxrc
-#	ln ${TEMP}/initramfs-aux-temp/init ${TEMP}/initramfs-aux-temp/linuxrc 
+#	ln ${TEMP}/initramfs-aux-temp/init ${TEMP}/initramfs-aux-temp/linuxrc
 
 	if [ -f "${GK_SHARE}/arch/${ARCH}/initrd.scripts" ]
 	then
 		cp "${GK_SHARE}/arch/${ARCH}/initrd.scripts" "${TEMP}/initramfs-aux-temp/etc/initrd.scripts"
-	else	
+	else
 		cp "${GK_SHARE}/defaults/initrd.scripts" "${TEMP}/initramfs-aux-temp/etc/initrd.scripts"
 	fi
 
@@ -566,13 +566,13 @@ append_auxilary() {
 	then
 		sed -i "s:^REAL_ROOT=.*$:REAL_ROOT='${REAL_ROOT}':" "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
 	fi
-	
-	echo -n 'HWOPTS="$HWOPTS ' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"	
+
+	echo -n 'HWOPTS="$HWOPTS ' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
 	for group_modules in ${!MODULES_*}; do
 		group="$(echo $group_modules | cut -d_ -f2 | tr "[:upper:]" "[:lower:]")"
 		echo -n "${group} " >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
 	done
-	echo '"' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"	
+	echo '"' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
 
 	if [ -f "${GK_SHARE}/arch/${ARCH}/modprobe" ]
 	then
@@ -607,7 +607,7 @@ append_auxilary() {
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing auxilary cpio"
 	cd "${TEMP}"
-	rm -r "${TEMP}/initramfs-aux-temp/"	
+	rm -r "${TEMP}/initramfs-aux-temp/"
 }
 
 append_data() {

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 5aeb84f..0867b56 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -59,9 +59,9 @@ gen_dep_list()
 	if [ "${ALLRAMDISKMODULES}" = "1" ]; then
 		strip_mod_paths $(find "${INSTALL_MOD_PATH}/lib/modules/${KV}" -name "*$(modules_kext)") | sort
 	else
-		local group_modules	
+		local group_modules
 		rm -f ${TEMP}/moddeps > /dev/null
-	
+
 		for group_modules in ${!MODULES_*}; do
 			gen_deps ${!group_modules}
 		done

diff --git a/gen_package.sh b/gen_package.sh
index a0a6bd0..e7c6142 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -28,7 +28,7 @@ gen_minkernpackage() {
 			cp "${tmp_kernel_binary2}" "${TEMP}/minkernpackage/kernelz-${KV}" || gen_die "Could not copy the kernelz for the min kernel package"
 		fi
 	fi
-	
+
 	if ! isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		[ "${BUILD_RAMDISK}" != '0' ] && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; }
@@ -40,8 +40,8 @@ gen_minkernpackage() {
 	else
 		cp "${KERNEL_DIR}/System.map" "${TEMP}/minkernpackage/System.map-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!';
 	fi
-	
-	cd "${TEMP}/minkernpackage" 
+
+	cd "${TEMP}/minkernpackage"
 	/bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the kernel package!'
 	cd "${TEMP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1
 }
@@ -84,27 +84,27 @@ gen_kerncache()
 	then
 		cp "${tmp_kernel_binary2}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the kernel package"
 	fi
-	
+
 	echo "VERSION = ${VER}" > "${TEMP}/kerncache/kerncache.config"
 	echo "PATCHLEVEL = ${PAT}" >> "${TEMP}/kerncache/kerncache.config"
 	echo "SUBLEVEL = ${SUB}" >> "${TEMP}/kerncache/kerncache.config"
 	echo "EXTRAVERSION = ${EXV}" >> "${TEMP}/kerncache/kerncache.config"
-	
+
 	mkdir -p "${TEMP}/kerncache/lib/modules/"
-	
+
 	if [ -d ${INSTALL_MOD_PATH}/lib/modules/${KV} ]
 	then
 	    cp -r "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/kerncache/lib/modules"
 	fi
-	
-	cd "${TEMP}/kerncache" 
+
+	cd "${TEMP}/kerncache"
 	/bin/tar -jcpf ${KERNCACHE} * || gen_die 'Could not compress the kernel package!'
 	cd "${TEMP}" && rm -rf "${TEMP}/kerncache" > /dev/null 2>&1
 }
 
 gen_kerncache_extract_kernel()
 {
-	/bin/tar -f ${KERNCACHE} -C ${TEMP} -xj 
+	/bin/tar -f ${KERNCACHE} -C ${TEMP} -xj
 	copy_image_with_preserve "kernel" \
 		"${TEMP}/kernel-${ARCH}-${KV}" \
 		"kernel-${KNAME}-${ARCH}-${KV}"
@@ -115,7 +115,7 @@ gen_kerncache_extract_kernel()
 			"${TEMP}/kernelz-${ARCH}-${KV}" \
 			"kernelz-${KNAME}-${ARCH}-${KV}"
 	fi
-    
+
 	copy_image_with_preserve "System.map" \
 		"${TEMP}/System.map-${ARCH}-${KV}" \
 		"System.map-${KNAME}-${ARCH}-${KV}"
@@ -123,7 +123,7 @@ gen_kerncache_extract_kernel()
 
 gen_kerncache_extract_modules()
 {
-        if [ -e "${KERNCACHE}" ] 
+        if [ -e "${KERNCACHE}" ]
 	then
 		print_info 1 'Extracting kerncache kernel modules'
         	if [ "${INSTALL_MOD_PATH}" != '' ]
@@ -137,7 +137,7 @@ gen_kerncache_extract_modules()
 
 gen_kerncache_extract_config()
 {
-	if [ -e "${KERNCACHE}" ] 
+	if [ -e "${KERNCACHE}" ]
 	then
 		print_info 1 'Extracting kerncache config to /etc/kernels'
 		mkdir -p /etc/kernels
@@ -156,13 +156,13 @@ gen_kerncache_is_valid()
 		# Can make this more secure ....
 
 		/bin/tar -xj -f ${KERNCACHE} -C ${TEMP}
-		if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${TEMP}/kernel-${ARCH}-${KV} ] 
-		then 
+		if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${TEMP}/kernel-${ARCH}-${KV} ]
+		then
 			print_info 1 'Valid kernel cache found; no sources will be used'
 			KERNCACHE_IS_VALID=1
 		fi
 	else
-		if [ -e "${KERNCACHE}" ] 
+		if [ -e "${KERNCACHE}" ]
 		then
 			KERNEL_CONFIG="/${KERNEL_DIR}/.config"
 			if [ "${CMD_KERNEL_CONFIG}" != '' ]
@@ -183,7 +183,6 @@ gen_kerncache_is_valid()
 				test2=$(grep -v "^#" ${KERNEL_CONFIG} | md5sum | cut -d " " -f 1)
 				if [ "${test1}" == "${test2}" ]
 				then
-	
 					echo
 					print_info 1 "No kernel configuration change, skipping kernel build..."
 					echo
@@ -192,6 +191,6 @@ gen_kerncache_is_valid()
 			fi
 		fi
 	fi
-	export KERNCACHE_IS_VALID	
+	export KERNCACHE_IS_VALID
 	return 1
 }

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

[Fabio Erculiani]

commit:     d6696d0df6e1b31bf169fc34e2a9b0579f2af72d
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Sun Sep 11 07:42:30 2011 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 07:44:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d6696d0d

syntax: drop parse_opt usage and crufty, deprecated subshelling through ``

These changes have been ported from official Gentoo LiveDVD

---
 ChangeLog               |    4 +
 defaults/initrd.scripts |    8 --
 defaults/linuxrc        |  200 +++++++++++++++++++++++-----------------------
 3 files changed, 104 insertions(+), 108 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd11f8e..fbc1418 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  11 Sep 2011; Fabio Erculiani <lxnay@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc:
+  drop parse_opt usage and crufty, deprecated subshelling through 
+
   30 Aug 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
   Fix quoting issue (bug #380729).
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index bf31042..da8cb01 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -6,14 +6,6 @@ backup() {
 	echo -ne "\033[0G\033[0K"
 }
 
-parse_opt() {
-	case "$1" in
-		*\=*)
-			echo "$1" | cut -d= -f2-
-		;;
-	esac
-}
-
 modules_load() {
 	for module in $*
 	do

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 7aa11e3..ee74d76 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -33,7 +33,7 @@ fi
 
 quiet_kmsg
 
-CMDLINE=`cat /proc/cmdline`
+CMDLINE=$(cat /proc/cmdline)
 # Scan CMDLINE for any specified real_root= or cdroot arguments
 FAKE_ROOT=''
 REAL_ROOTFLAGS=''
@@ -42,41 +42,41 @@ CRYPT_SILENT=0
 for x in ${CMDLINE}
 do
 	case "${x}" in
-		real_root\=*)
-			REAL_ROOT=`parse_opt "${x}"`
+		real_root=*)
+			REAL_ROOT=${x#*=}
 		;;
-		root\=*)
-			FAKE_ROOT=`parse_opt "${x}"`
+		root=*)
+			FAKE_ROOT=${x#*=}
 		;;
-		subdir\=*)
-			SUBDIR=`parse_opt "${x}"`
+		subdir=*)
+			SUBDIR=${x#*=}
 		;;
-		real_init\=*)
-			REAL_INIT=`parse_opt "${x}"`
+		real_init=*)
+			REAL_INIT=${x#*=}
 		;;
-		init_opts\=*)
-			INIT_OPTS=`parse_opt "${x}"`
+		init_opts=*)
+			INIT_OPTS=${x#*=}
 		;;
 		# Livecd options
 		cdroot)
 			CDROOT=1
 		;;
-		cdroot\=*)
+		cdroot=*)
 			CDROOT=1
-			CDROOT_DEV=`parse_opt "${x}"`
+			CDROOT_DEV=${x#*=}
 		;;
-		cdroot_type\=*)
-			CDROOT_TYPE=`parse_opt "${x}"`
+		cdroot_type=*)
+			CDROOT_TYPE=${x#*=}
 		;;
 		# Start livecd loop, looptype options
-		loop\=*)
-			LOOP=`parse_opt "${x}"`
+		loop=*)
+			LOOP=${x#*=}
 		;;
-		looptype\=*)
-			LOOPTYPE=`parse_opt "${x}"`
+		looptype=*)
+			LOOPTYPE=${x#*=}
 		;;
-		isoboot\=*)
-			ISOBOOT=`parse_opt "${x}"`
+		isoboot=*)
+			ISOBOOT=${x#*=}
 		;;
 		# Start Volume manager options 
 		dolvm)
@@ -92,8 +92,8 @@ do
 		dodmraid)
 			USE_DMRAID_NORMAL=1
 		;;
-		dodmraid\=*)
-			DMRAID_OPTS=`parse_opt "${x}"`
+		dodmraid=*)
+			DMRAID_OPTS=${x#*=}
 			USE_DMRAID_NORMAL=1
 		;;
 		# Debug Options
@@ -101,102 +101,102 @@ do
 			DEBUG='yes'
 		;;
 		# Scan delay options 
-		scandelay\=*)
-			SDELAY=`parse_opt "${x}"`
+		scandelay=*)
+			SDELAY=${x#*=}
 		;;
 		scandelay)
 			SDELAY=3
 		;;
 		# Module no-loads
-		doload\=*)
-			MDOLIST=`parse_opt "${x}"`
-			MDOLIST="`echo ${MDOLIST} | sed -e 's/,/ /g'`"
+		doload=*)
+			MDOLIST=${x#*=}
+			MDOLIST=$(echo ${MDOLIST} | sed -e 's/,/ /g'`)
 		;;
 		nodetect)
 			NODETECT=1
 		;;
-		noload\=*)
-			MLIST=`parse_opt "${x}"`
-			MLIST="`echo ${MLIST} | sed -e 's/,/ /g'`"
+		noload=*)
+			MLIST=${x#*=}
+			MLIST="$(echo ${MLIST} | sed -e 's/,/ /g')"
 			export MLIST
 		;;
 		# Redirect output to a specific tty
-		CONSOLE\=*|console\=*)
-			CONSOLE=`parse_opt "${x}"`
-			CONSOLE=`basename ${CONSOLE}`
+		CONSOLE=*|console=*)
+			CONSOLE=${x#*=}
+			CONSOLE=$(basename ${CONSOLE})
 #			exec >${CONSOLE} <${CONSOLE} 2>&1
 		;;
 		# /dev/md
-		lvmraid\=*)
-			RAID_DEVICES="`parse_opt ${x}`"
-			RAID_DEVICES="`echo ${RAID_DEVICES} | sed -e 's/,/ /g'`"
+		lvmraid=*)
+			RAID_DEVICES="${x#*=}"
+			RAID_DEVICES="$(echo ${RAID_DEVICES} | sed -e 's/,/ /g')"
 			USE_LVM_NORMAL=1
 		;;
-		part\=*)
-			MDPART=`parse_opt "${x}"`
+		part=*)
+			MDPART=${x#*=}
 		;;
 		# NFS
-		ip\=*)
-			IP=`parse_opt "${x}"`
+		ip=*)
+			IP=${x#*=}
 		;;
-		nfsroot\=*)
-			NFSROOT=`parse_opt "${x}"`
+		nfsroot=*)
+			NFSROOT=${x#*=}
 		;;
 		# iSCSI
-		iscsi_initiatorname\=*)
-			ISCSI_INITIATORNAME=`parse_opt "${x}"`
+		iscsi_initiatorname=*)
+			ISCSI_INITIATORNAME=${x#*=}
 		;;
-		iscsi_target\=*)
-			ISCSI_TARGET=`parse_opt "${x}"`
+		iscsi_target=*)
+			ISCSI_TARGET=${x#*=}
 		;;
-		iscsi_tgpt\=*)
-			ISCSI_TGPT=`parse_opt "${x}"`
+		iscsi_tgpt=*)
+			ISCSI_TGPT=${x#*=}
 		;;
-		iscsi_address\=*)
-			ISCSI_ADDRESS=`parse_opt "${x}"`
+		iscsi_address=*)
+			ISCSI_ADDRESS=${x#*=}
 		;;
-		iscsi_port\=*)
-			ISCSI_PORT=`parse_opt "${x}"`
+		iscsi_port=*)
+			ISCSI_PORT=${x#*=}
 		;;
-		iscsi_username\=*)
-			ISCSI_USERNAME=`parse_opt "${x}"`
+		iscsi_username=*)
+			ISCSI_USERNAME=${x#*=}
 		;;
-		iscsi_password\=*)
-			ISCSI_PASSWORD=`parse_opt "${x}"`
+		iscsi_password=*)
+			ISCSI_PASSWORD=${x#*=}
 		;;
-		iscsi_username_in\=*)
-			ISCSI_USERNAME_IN=`parse_opt "${x}"`
+		iscsi_username_in=*)
+			ISCSI_USERNAME_IN=${x#*=}
 		;;
-		iscsi_password_in\=*)
-			ISCSI_PASSWORD_IN=`parse_opt "${x}"`
+		iscsi_password_in=*)
+			ISCSI_PASSWORD_IN=${x#*=}
 		;;
-		iscsi_debug\=*)
-			ISCSI_DEBUG=`parse_opt "${x}"`
+		iscsi_debug=*)
+			ISCSI_DEBUG=${x#*=}
 		;;
 		iscsi_noibft)
 			ISCSI_NOIBFT=1
 		;;
 		# Crypto
-		crypt_root\=*)
-			CRYPT_ROOT=`parse_opt "${x}"`
+		crypt_root=*)
+			CRYPT_ROOT=${x#*=}
 		;;
-		crypt_swap\=*)
-			CRYPT_SWAP=`parse_opt "${x}"`
+		crypt_swap=*)
+			CRYPT_SWAP=${x#*=}
 		;;
-		root_key\=*)
-			CRYPT_ROOT_KEY=`parse_opt "${x}"`
+		root_key=*)
+			CRYPT_ROOT_KEY=${x#*=}
 		;;
-		root_keydev\=*)
-			CRYPT_ROOT_KEYDEV=`parse_opt "${x}"`
+		root_keydev=*)
+			CRYPT_ROOT_KEYDEV=${x#*=}
 		;;
-		swap_key\=*)
-			CRYPT_SWAP_KEY=`parse_opt "${x}"`
+		swap_key=*)
+			CRYPT_SWAP_KEY=${x#*=}
 		;;
-		swap_keydev\=*)
-			CRYPT_SWAP_KEYDEV=`parse_opt "${x}"`
+		swap_keydev=*)
+			CRYPT_SWAP_KEYDEV=${x#*=}
 		;;
-		real_resume\=*|resume\=*)
-			REAL_RESUME=`parse_opt "${x}"`
+		real_resume=*|resume=*)
+			REAL_RESUME=${x#*=}
 		;;
 		noresume)
 			NORESUME=1
@@ -204,14 +204,14 @@ do
 		crypt_silent)
 			CRYPT_SILENT=1
 		;;
-		real_rootflags\=*)
-			REAL_ROOTFLAGS=`parse_opt "${x}"`
+		real_rootflags=*)
+			REAL_ROOTFLAGS=${x#*=}
 		;;
-		rootfstype\=*)
-			ROOTFSTYPE=`parse_opt "${x}"`
+		rootfstype=*)
+			ROOTFSTYPE=${x#*=}
 		;;
-		keymap\=*)
-			keymap=`parse_opt "${x}"`
+		keymap=*)
+			keymap=${x#*=}
 		;;
 		aufs)
 			USE_AUFS_NORMAL=1
@@ -228,19 +228,19 @@ do
 		nounionfs)
 			USE_UNIONFS_NORMAL=0
 			;;
-#                 unionfs\=*) 	 
+#                 unionfs=*) 	 
 #                         if [ ! -x /sbin/unionfs ] 	 
 #                         then 	 
 #                                 USE_UNIONFS_NORMAL=0 	 
 #                                 bad_msg 'unionfs binary not found: aborting use of unionfs!'
 #                         else 	 
 #                                 USE_UNIONFS_NORMAL=1 	 
-#                                 CMD_UNIONFS=`parse_opt "${x}"` 	 
+#                                 CMD_UNIONFS=${x#*=} 	 
 #                                 echo ${CMD_UNIONFS}|grep , >/dev/null 2>&1 	 
 #                                 if [ $? -eq 0 ]
 #                                 then 	 
-#                                         UID=`echo ${CMD_UNIONFS#*,}` 	 
-#                                         UNIONFS=`echo ${CMD_UNIONFS%,*}` 	 
+#                                         UID=$(echo ${CMD_UNIONFS#*,}) 	 
+#                                         UNIONFS=$(echo ${CMD_UNIONFS%,*}) 
 #                                 else 	 
 #                                         UNIONFS=${CMD_UNIONFS} 	 
 #                                 fi 	 
@@ -321,23 +321,23 @@ then
 	if [ "${NORESUME}" != '1' ] && [ -n "${REAL_RESUME}" ]
 	then
 		case "${REAL_RESUME}" in
-			LABEL\=*|UUID\=*)
+			LABEL=*|UUID=*)
 
 				RESUME_DEV=""
 				retval=1
 				
 				if [ ${retval} -ne 0 ]; then
-					RESUME_DEV=`findfs "${REAL_RESUME}" 2>/dev/null`
+					RESUME_DEV=$(findfs "${REAL_RESUME}" 2>/dev/null)
 					retval=$?
 				fi
 				
 				if [ ${retval} -ne 0 ]; then
-					RESUME_DEV=`busybox findfs "${REAL_RESUME}" 2>/dev/null`
+					RESUME_DEV=$(busybox findfs "${REAL_RESUME}" 2>/dev/null)
 					retval=$?
 				fi
 				
 				if [ ${retval} -ne 0 ]; then
-					RESUME_DEV=`blkid -l -t "${REAL_RESUME}" | cut -d ":" -f 1 2>/dev/null`
+					RESUME_DEV=$(blkid -l -t "${REAL_RESUME}" | cut -d ":" -f 1 2>/dev/null)
 					retval=$?
 				fi
 				
@@ -434,17 +434,17 @@ do
 				retval=1
 				
 				if [ ${retval} -ne 0 ]; then
-					ROOT_DEV=`findfs "${REAL_ROOT}" 2>/dev/null`
+					ROOT_DEV=$(findfs "${REAL_ROOT}" 2>/dev/null)
 					retval=$?
 				fi
 				
 				if [ ${retval} -ne 0 ]; then
-					ROOT_DEV=`busybox findfs "${REAL_ROOT}" 2>/dev/null`
+					ROOT_DEV=$(busybox findfs "${REAL_ROOT}" 2>/dev/null)
 					retval=$?
 				fi
 				
 				if [ ${retval} -ne 0 ]; then
-					ROOT_DEV=`blkid -l -t "${REAL_ROOT}" | cut -d ":" -f 1 2>/dev/null`
+					ROOT_DEV=$(blkid -l -t "${REAL_ROOT}" | cut -d ":" -f 1 2>/dev/null)
 					retval=$?
 				fi
 				
@@ -630,9 +630,9 @@ then
 	then
 		if [ -e "${NEW_ROOT}/mnt/cdrom/add" ]
 		then
-				for targz in `ls ${NEW_ROOT}/mnt/cdrom/add/*.tar.gz`
+				for targz in $(ls ${NEW_ROOT}/mnt/cdrom/add/*.tar.gz)
 				do	
-					tarname=`basename ${targz}`
+					tarname=$(basename ${targz})
 					good_msg "Adding additional package ${tarname}"
 					(cd ${NEW_ROOT} ; /bin/tar -xzf ${targz})
 				done
@@ -655,7 +655,7 @@ then
 	do
 		if [ -L "${NEW_ROOT}/${FS_LOCATION}/${x}" ]
 		then
-			ln -s "`readlink ${NEW_ROOT}/${FS_LOCATION}/${x}`" "${x}" 2>/dev/null
+			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
@@ -665,7 +665,7 @@ then
 
 				# Skip this directory if we already linked a parent directory
 				if [ "${current_parent}" != '' ]; then
-					var=`echo "${directory}" | grep "^${current_parent}"`
+					var=$(echo "${directory}" | grep "^${current_parent}")
 					if [ "${var}" != '' ]; then
 						continue
 					fi
@@ -674,7 +674,7 @@ then
 				if [ -e "/${NEW_ROOT}/${directory}" ]
 				then
 					# It does exist, link all the individual files
-					for file in `ls /${NEW_ROOT}/${FS_LOCATION}/${directory}`
+					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
@@ -694,7 +694,7 @@ then
 
 	fi
 
-	#UML=`cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||'`
+	#UML=$(cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||')
 	#if [ "${UML}" = 'UML' ]
 	#then
 	#	# UML Fixes

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

[Sebastian Pipping]

commit:     3453a0621c20576f9b3249215187f34ed55014f0
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Aug 30 15:33:27 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:33:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3453a062

Fix quoting issue (bug #380729)

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

diff --git a/ChangeLog b/ChangeLog
index 6b00bda..fd11f8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@
 # Distributed under the GPL v2
 # $Id$
 
+  30 Aug 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+  Fix quoting issue (bug #380729).
+
+  Thanks to:
+  - Axel Bringenberg
+
   30 Aug 2011; Sebastian Pipping <sping@gentoo.org>
   +patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch, gen_compile.sh:
   Enable patch application for mdadm, add patch to fix compilation (bug

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 32e3417..bf31042 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -858,7 +858,7 @@ openLUKS() {
 					fi
 					# At this point a candidate key exists (either mounted before or not)
 					good_msg "${LUKS_KEY} on device ${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" ] && [ -e /sbin/gpg ] ; then
 						[ -e /dev/tty ] && mv /dev/tty /dev/tty.org
 						mknod /dev/tty c 5 1
 						cryptsetup_options="-d -"

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

[Sebastian Pipping]

commit:     02b72c6515a7772228ec5ab59bd0e470df326826
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Jul 27 17:38:15 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 17:38:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=02b72c65

Fix display of seconds waiting (bug #376575)

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

diff --git a/ChangeLog b/ChangeLog
index 4c24c6e..31e9aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  27 Jul 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+  Fix display of seconds waiting (bug #376575)
+
+  Thanks to Richard Scott
+
   26 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> gen_arch.sh:
   Bug #376467: fix kernel version checks for 3.0 kernel.
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b71d30a..51ebcce 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -922,7 +922,7 @@ sdelay() {
 	# Sleep a specific number of seconds if SDELAY is set
 	if [ "${SDELAY}" ]
 	then
-		good_msg 'Waiting ${SDELAY} seconds...'
+		good_msg "Waiting ${SDELAY} seconds..."
 		sleep ${SDELAY}
 	else
 		good_msg 'Hint: Use parameter scandelay[=seconds] if you need waiting here'

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

[Sebastian Pipping]

commit:     6b92c54c1ecc90735f101fafab65d993938d8ee6
Author:     Nelson Batalha <nelson.batalha <AT> gmail <DOT> com>
AuthorDate: Tue May 31 10:57:09 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue May 31 10:57:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6b92c54c

Add Kernel 3.0.0 support (bug #369481)

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

diff --git a/ChangeLog b/ChangeLog
index 6c402d6..03f20db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  31 May 2011; Nelson Batalha <nelson.batalha@gmail.com> defaults/initrd.defaults:
+  Add Kernel 3.0.0 support (bug #369481)
+
   31 May 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Output warning in warning color
 

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index fd6d9fc..72e8376 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -50,7 +50,7 @@ KMINOR=`echo $KV | cut -f2 -d.`
 KVER="${KMAJOR}.${KMINOR}"
 MISCOPTS='debug detect'
 
-if [ "${KMAJOR}" -eq 2 -a "${KMINOR}" -ge '6' ]
+if [ "${KMAJOR}" -ge 3 ] || [ "${KMAJOR}" -eq 2 -a "${KMINOR}" -eq '6' ]
 then
 	KV_2_6_OR_GREATER="yes"
 fi
@@ -59,7 +59,7 @@ QUIET='1'
 ROOT_LINKS='bin sbin lib lib32 lib64 boot usr opt emul'
 ROOT_TREES='etc root home var'
 INSMOD='insmod'
-if [ "${KMINOR}" -gt '4' ]
+if [ "${KMAJOR}" -ge 3 ] || [ "${KMAJOR}" -eq 2 -a "${KMINOR}" -gt '4' ]
 then
 	KSUFF='.ko'
 else