* [gentoo-commits] proj/genkernel:ryao commit in: /, doc/
@ 2012-08-25 0:58 Richard Yao
0 siblings, 0 replies; 8+ messages in thread
From: Richard Yao @ 2012-08-25 0:58 UTC (permalink / raw
To: gentoo-commits
commit: 3b0ee15525a97e1ae48d7696af2b3af498ce0a69
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 00:55:13 2012 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 00:57:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3b0ee155
Add support for e2fsprogs back in
Add support for e2fsprogs, specifically mke2fs and e2fsck, back into
genkernel.
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
---
doc/genkernel.8.txt | 3 +++
gen_cmdline.sh | 6 ++++++
gen_determineargs.sh | 1 +
gen_initramfs.sh | 24 ++++++++++++++++++++++++
genkernel.conf | 3 +++
5 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 9a96f32..912f899 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -263,6 +263,9 @@ INITIALIZATION
*--*[*no-*]*dmraid*::
Includes or excludes DMRAID support.
+*--*[*no-*]*e2fsprogs*::
+ Includes or excludes e2fsprogs.
+
*--*[*no-*]*zfs*::
Includes or excludes ZFS support.
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 938b1a5..741d298 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -91,6 +91,8 @@ longusage() {
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs"
echo " --dmraid Include DMRAID support"
echo " --no-dmraid Exclude DMRAID support"
+ echo " --e2fsprogs Include e2fsprogs"
+ echo " --no-e2fsprogs Exclude e2fsprogs"
echo " --zfs Include ZFS support"
echo " --no-zfs Exclude ZFS support"
echo " --multipath Include Multipath support"
@@ -306,6 +308,10 @@ parse_cmdline() {
fi
print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
;;
+ --e2fsprogs|--no-e2fsprogs)
+ CMD_ZFS=`parse_optbool "$*"`
+ print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}"
+ ;;
--zfs|--no-zfs)
CMD_ZFS=`parse_optbool "$*"`
print_info 2 "CMD_ZFS: ${CMD_ZFS}"
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 7f352f8..92a6458 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -122,6 +122,7 @@ determine_real_args() {
set_config_with_override BOOL GPG CMD_GPG
set_config_with_override BOOL MDADM CMD_MDADM
set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG
+ set_config_with_override BOOL E2FSPROGS CMD_E2FSPROGS "no"
set_config_with_override BOOL ZFS CMD_ZFS
set_config_with_override BOOL MULTIPATH CMD_MULTIPATH
set_config_with_override BOOL FIRMWARE CMD_FIRMWARE
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ac90830..5de95a1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -127,6 +127,29 @@ append_busybox() {
rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
}
+append_e2fstools(){
+ if [ -d "${TEMP}/initramfs-e2fsprogs-temp" ]
+ then
+ rm -r "${TEMP}/initramfs-e2fsprogs-temp/"
+ fi
+
+ # Using different name for blkid compatibility
+ cd ${TEMP}
+ mkdir -p "${TEMP}/initramfs-e2fsprogs-temp/"
+
+ copy_binaries "${TEMP}"/initramfs-e2fsprogs-temp/ /sbin/{e2fsck,mke2fs}
+
+ for i in /etc/{mke2fs,e2fsck}.conf; do
+ cp "$i" "${TEMP}/initramfs-e2fsprogs-temp/$(basename $i)" \
+ || gen_die "Could not copy over $(basename $i)";
+ done
+
+ cd "${TEMP}/initramfs-e2fsprogs-temp/"
+ log_future_cpio_content
+ find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+ rm -rf "${TEMP}/initramfs-e2fsprogs-temp" > /dev/null
+}
+
append_blkid(){
if [ -d "${TEMP}/initramfs-blkid-temp" ]
then
@@ -741,6 +764,7 @@ create_initramfs() {
append_data 'base_layout'
append_data 'auxilary' "${BUSYBOX}"
append_data 'busybox' "${BUSYBOX}"
+ append_data 'e2fstools' "${E2FSTOOLS}"
append_data 'lvm' "${LVM}"
append_data 'dmraid' "${DMRAID}"
append_data 'iscsi' "${ISCSI}"
diff --git a/genkernel.conf b/genkernel.conf
index 5d93a66..af73931 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -87,6 +87,9 @@ USECOLOR="yes"
# Add iSCSI support.
#ISCSI="no"
+# Add e2fsprogs support.
+#E2FSPROGS="no"
+
# Include support for unionfs
#UNIONFS="1"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/genkernel:ryao commit in: /, doc/
@ 2012-08-25 1:03 Richard Yao
0 siblings, 0 replies; 8+ messages in thread
From: Richard Yao @ 2012-08-25 1:03 UTC (permalink / raw
To: gentoo-commits
commit: c1f630380387919dadc8c31e9919b3899b2057b6
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 00:55:13 2012 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 01:03:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c1f63038
Add support for e2fsprogs back in
Add support for e2fsprogs, specifically mke2fs and e2fsck, back into
genkernel.
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
---
doc/genkernel.8.txt | 3 +++
gen_cmdline.sh | 6 ++++++
gen_determineargs.sh | 1 +
gen_initramfs.sh | 24 ++++++++++++++++++++++++
genkernel.conf | 3 +++
5 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 9a96f32..912f899 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -263,6 +263,9 @@ INITIALIZATION
*--*[*no-*]*dmraid*::
Includes or excludes DMRAID support.
+*--*[*no-*]*e2fsprogs*::
+ Includes or excludes e2fsprogs.
+
*--*[*no-*]*zfs*::
Includes or excludes ZFS support.
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 938b1a5..741d298 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -91,6 +91,8 @@ longusage() {
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs"
echo " --dmraid Include DMRAID support"
echo " --no-dmraid Exclude DMRAID support"
+ echo " --e2fsprogs Include e2fsprogs"
+ echo " --no-e2fsprogs Exclude e2fsprogs"
echo " --zfs Include ZFS support"
echo " --no-zfs Exclude ZFS support"
echo " --multipath Include Multipath support"
@@ -306,6 +308,10 @@ parse_cmdline() {
fi
print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
;;
+ --e2fsprogs|--no-e2fsprogs)
+ CMD_ZFS=`parse_optbool "$*"`
+ print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}"
+ ;;
--zfs|--no-zfs)
CMD_ZFS=`parse_optbool "$*"`
print_info 2 "CMD_ZFS: ${CMD_ZFS}"
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 7f352f8..95d278d 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -122,6 +122,7 @@ determine_real_args() {
set_config_with_override BOOL GPG CMD_GPG
set_config_with_override BOOL MDADM CMD_MDADM
set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG
+ set_config_with_override BOOL E2FSPROGS CMD_E2FSPROGS
set_config_with_override BOOL ZFS CMD_ZFS
set_config_with_override BOOL MULTIPATH CMD_MULTIPATH
set_config_with_override BOOL FIRMWARE CMD_FIRMWARE
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ac90830..5de95a1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -127,6 +127,29 @@ append_busybox() {
rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
}
+append_e2fstools(){
+ if [ -d "${TEMP}/initramfs-e2fsprogs-temp" ]
+ then
+ rm -r "${TEMP}/initramfs-e2fsprogs-temp/"
+ fi
+
+ # Using different name for blkid compatibility
+ cd ${TEMP}
+ mkdir -p "${TEMP}/initramfs-e2fsprogs-temp/"
+
+ copy_binaries "${TEMP}"/initramfs-e2fsprogs-temp/ /sbin/{e2fsck,mke2fs}
+
+ for i in /etc/{mke2fs,e2fsck}.conf; do
+ cp "$i" "${TEMP}/initramfs-e2fsprogs-temp/$(basename $i)" \
+ || gen_die "Could not copy over $(basename $i)";
+ done
+
+ cd "${TEMP}/initramfs-e2fsprogs-temp/"
+ log_future_cpio_content
+ find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+ rm -rf "${TEMP}/initramfs-e2fsprogs-temp" > /dev/null
+}
+
append_blkid(){
if [ -d "${TEMP}/initramfs-blkid-temp" ]
then
@@ -741,6 +764,7 @@ create_initramfs() {
append_data 'base_layout'
append_data 'auxilary' "${BUSYBOX}"
append_data 'busybox' "${BUSYBOX}"
+ append_data 'e2fstools' "${E2FSTOOLS}"
append_data 'lvm' "${LVM}"
append_data 'dmraid' "${DMRAID}"
append_data 'iscsi' "${ISCSI}"
diff --git a/genkernel.conf b/genkernel.conf
index 5d93a66..af73931 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -87,6 +87,9 @@ USECOLOR="yes"
# Add iSCSI support.
#ISCSI="no"
+# Add e2fsprogs support.
+#E2FSPROGS="no"
+
# Include support for unionfs
#UNIONFS="1"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/genkernel:ryao commit in: /, doc/
@ 2012-08-25 1:19 Richard Yao
0 siblings, 0 replies; 8+ messages in thread
From: Richard Yao @ 2012-08-25 1:19 UTC (permalink / raw
To: gentoo-commits
commit: d8ee02a13e971fd031a912f4a49d7e93e794ad56
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 00:55:13 2012 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 01:18:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d8ee02a1
Add support for e2fsprogs back in
Add support for e2fsprogs, specifically mke2fs and e2fsck, back into
genkernel.
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
---
doc/genkernel.8.txt | 3 +++
gen_cmdline.sh | 6 ++++++
gen_determineargs.sh | 1 +
gen_initramfs.sh | 27 +++++++++++++++++++++++++++
genkernel.conf | 3 +++
5 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 9a96f32..912f899 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -263,6 +263,9 @@ INITIALIZATION
*--*[*no-*]*dmraid*::
Includes or excludes DMRAID support.
+*--*[*no-*]*e2fsprogs*::
+ Includes or excludes e2fsprogs.
+
*--*[*no-*]*zfs*::
Includes or excludes ZFS support.
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 938b1a5..741d298 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -91,6 +91,8 @@ longusage() {
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs"
echo " --dmraid Include DMRAID support"
echo " --no-dmraid Exclude DMRAID support"
+ echo " --e2fsprogs Include e2fsprogs"
+ echo " --no-e2fsprogs Exclude e2fsprogs"
echo " --zfs Include ZFS support"
echo " --no-zfs Exclude ZFS support"
echo " --multipath Include Multipath support"
@@ -306,6 +308,10 @@ parse_cmdline() {
fi
print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
;;
+ --e2fsprogs|--no-e2fsprogs)
+ CMD_ZFS=`parse_optbool "$*"`
+ print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}"
+ ;;
--zfs|--no-zfs)
CMD_ZFS=`parse_optbool "$*"`
print_info 2 "CMD_ZFS: ${CMD_ZFS}"
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 7f352f8..95d278d 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -122,6 +122,7 @@ determine_real_args() {
set_config_with_override BOOL GPG CMD_GPG
set_config_with_override BOOL MDADM CMD_MDADM
set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG
+ set_config_with_override BOOL E2FSPROGS CMD_E2FSPROGS
set_config_with_override BOOL ZFS CMD_ZFS
set_config_with_override BOOL MULTIPATH CMD_MULTIPATH
set_config_with_override BOOL FIRMWARE CMD_FIRMWARE
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ac90830..172e42f 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -127,6 +127,32 @@ append_busybox() {
rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
}
+append_e2fsprogs(){
+ local file
+
+ if [ -d "${TEMP}/initramfs-e2fsprogs-temp" ]
+ then
+ rm -r "${TEMP}/initramfs-e2fsprogs-temp/"
+ fi
+
+ # Using different name for blkid compatibility
+ cd ${TEMP}
+ mkdir -p "${TEMP}/initramfs-e2fsprogs-temp/"
+
+ copy_binaries "${TEMP}"/initramfs-e2fsprogs-temp/ /sbin/{e2fsck,mke2fs}
+
+ for i in /etc/{mke2fs,e2fsck}.conf; do
+ file="$(basename $i)"
+ cp "$i" "${TEMP}/initramfs-e2fsprogs-temp/$file" \
+ || gen_die "Could not copy over $file"
+ done
+
+ cd "${TEMP}/initramfs-e2fsprogs-temp/"
+ log_future_cpio_content
+ find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+ rm -rf "${TEMP}/initramfs-e2fsprogs-temp" > /dev/null
+}
+
append_blkid(){
if [ -d "${TEMP}/initramfs-blkid-temp" ]
then
@@ -741,6 +767,7 @@ create_initramfs() {
append_data 'base_layout'
append_data 'auxilary' "${BUSYBOX}"
append_data 'busybox' "${BUSYBOX}"
+ append_data 'e2fsprogs' "${E2FSPROGS}"
append_data 'lvm' "${LVM}"
append_data 'dmraid' "${DMRAID}"
append_data 'iscsi' "${ISCSI}"
diff --git a/genkernel.conf b/genkernel.conf
index 5d93a66..af73931 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -87,6 +87,9 @@ USECOLOR="yes"
# Add iSCSI support.
#ISCSI="no"
+# Add e2fsprogs support.
+#E2FSPROGS="no"
+
# Include support for unionfs
#UNIONFS="1"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/genkernel:ryao commit in: /, doc/
@ 2012-08-25 1:36 Richard Yao
0 siblings, 0 replies; 8+ messages in thread
From: Richard Yao @ 2012-08-25 1:36 UTC (permalink / raw
To: gentoo-commits
commit: fa6a43b66de490a420ca243e659a3dcbf579205d
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 00:55:13 2012 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 01:35:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=fa6a43b6
Add support for e2fsprogs back in
Add support for e2fsprogs, specifically mke2fs and e2fsck, back into
genkernel.
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
---
doc/genkernel.8.txt | 3 +++
gen_cmdline.sh | 6 ++++++
gen_determineargs.sh | 1 +
gen_initramfs.sh | 27 +++++++++++++++++++++++++++
genkernel.conf | 3 +++
5 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 9a96f32..912f899 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -263,6 +263,9 @@ INITIALIZATION
*--*[*no-*]*dmraid*::
Includes or excludes DMRAID support.
+*--*[*no-*]*e2fsprogs*::
+ Includes or excludes e2fsprogs.
+
*--*[*no-*]*zfs*::
Includes or excludes ZFS support.
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 938b1a5..a305201 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -91,6 +91,8 @@ longusage() {
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs"
echo " --dmraid Include DMRAID support"
echo " --no-dmraid Exclude DMRAID support"
+ echo " --e2fsprogs Include e2fsprogs"
+ echo " --no-e2fsprogs Exclude e2fsprogs"
echo " --zfs Include ZFS support"
echo " --no-zfs Exclude ZFS support"
echo " --multipath Include Multipath support"
@@ -306,6 +308,10 @@ parse_cmdline() {
fi
print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
;;
+ --e2fsprogs|--no-e2fsprogs)
+ CMD_E2FSPROGS=`parse_optbool "$*"`
+ print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}"
+ ;;
--zfs|--no-zfs)
CMD_ZFS=`parse_optbool "$*"`
print_info 2 "CMD_ZFS: ${CMD_ZFS}"
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 7f352f8..95d278d 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -122,6 +122,7 @@ determine_real_args() {
set_config_with_override BOOL GPG CMD_GPG
set_config_with_override BOOL MDADM CMD_MDADM
set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG
+ set_config_with_override BOOL E2FSPROGS CMD_E2FSPROGS
set_config_with_override BOOL ZFS CMD_ZFS
set_config_with_override BOOL MULTIPATH CMD_MULTIPATH
set_config_with_override BOOL FIRMWARE CMD_FIRMWARE
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ac90830..172e42f 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -127,6 +127,32 @@ append_busybox() {
rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
}
+append_e2fsprogs(){
+ local file
+
+ if [ -d "${TEMP}/initramfs-e2fsprogs-temp" ]
+ then
+ rm -r "${TEMP}/initramfs-e2fsprogs-temp/"
+ fi
+
+ # Using different name for blkid compatibility
+ cd ${TEMP}
+ mkdir -p "${TEMP}/initramfs-e2fsprogs-temp/"
+
+ copy_binaries "${TEMP}"/initramfs-e2fsprogs-temp/ /sbin/{e2fsck,mke2fs}
+
+ for i in /etc/{mke2fs,e2fsck}.conf; do
+ file="$(basename $i)"
+ cp "$i" "${TEMP}/initramfs-e2fsprogs-temp/$file" \
+ || gen_die "Could not copy over $file"
+ done
+
+ cd "${TEMP}/initramfs-e2fsprogs-temp/"
+ log_future_cpio_content
+ find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+ rm -rf "${TEMP}/initramfs-e2fsprogs-temp" > /dev/null
+}
+
append_blkid(){
if [ -d "${TEMP}/initramfs-blkid-temp" ]
then
@@ -741,6 +767,7 @@ create_initramfs() {
append_data 'base_layout'
append_data 'auxilary' "${BUSYBOX}"
append_data 'busybox' "${BUSYBOX}"
+ append_data 'e2fsprogs' "${E2FSPROGS}"
append_data 'lvm' "${LVM}"
append_data 'dmraid' "${DMRAID}"
append_data 'iscsi' "${ISCSI}"
diff --git a/genkernel.conf b/genkernel.conf
index 5d93a66..af73931 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -87,6 +87,9 @@ USECOLOR="yes"
# Add iSCSI support.
#ISCSI="no"
+# Add e2fsprogs support.
+#E2FSPROGS="no"
+
# Include support for unionfs
#UNIONFS="1"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/genkernel:ryao commit in: /, doc/
@ 2012-08-25 1:44 Richard Yao
0 siblings, 0 replies; 8+ messages in thread
From: Richard Yao @ 2012-08-25 1:44 UTC (permalink / raw
To: gentoo-commits
commit: d4bc44450173a9a7abe86d5918fa77cd84a4e918
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 00:55:13 2012 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 01:44:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d4bc4445
Add support for e2fsprogs back in
Add support for e2fsprogs, specifically mke2fs and e2fsck, back into
genkernel.
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
---
doc/genkernel.8.txt | 3 +++
gen_cmdline.sh | 6 ++++++
gen_determineargs.sh | 1 +
gen_initramfs.sh | 27 +++++++++++++++++++++++++++
genkernel.conf | 3 +++
5 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 9a96f32..912f899 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -263,6 +263,9 @@ INITIALIZATION
*--*[*no-*]*dmraid*::
Includes or excludes DMRAID support.
+*--*[*no-*]*e2fsprogs*::
+ Includes or excludes e2fsprogs.
+
*--*[*no-*]*zfs*::
Includes or excludes ZFS support.
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 938b1a5..a305201 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -91,6 +91,8 @@ longusage() {
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs"
echo " --dmraid Include DMRAID support"
echo " --no-dmraid Exclude DMRAID support"
+ echo " --e2fsprogs Include e2fsprogs"
+ echo " --no-e2fsprogs Exclude e2fsprogs"
echo " --zfs Include ZFS support"
echo " --no-zfs Exclude ZFS support"
echo " --multipath Include Multipath support"
@@ -306,6 +308,10 @@ parse_cmdline() {
fi
print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
;;
+ --e2fsprogs|--no-e2fsprogs)
+ CMD_E2FSPROGS=`parse_optbool "$*"`
+ print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}"
+ ;;
--zfs|--no-zfs)
CMD_ZFS=`parse_optbool "$*"`
print_info 2 "CMD_ZFS: ${CMD_ZFS}"
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index d1ec199..81ac05f 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -122,6 +122,7 @@ determine_real_args() {
set_config_with_override BOOL GPG CMD_GPG
set_config_with_override BOOL MDADM CMD_MDADM
set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG
+ set_config_with_override BOOL E2FSPROGS CMD_E2FSPROGS
set_config_with_override BOOL ZFS CMD_ZFS
set_config_with_override BOOL MULTIPATH CMD_MULTIPATH
set_config_with_override BOOL FIRMWARE CMD_FIRMWARE
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ac90830..172e42f 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -127,6 +127,32 @@ append_busybox() {
rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
}
+append_e2fsprogs(){
+ local file
+
+ if [ -d "${TEMP}/initramfs-e2fsprogs-temp" ]
+ then
+ rm -r "${TEMP}/initramfs-e2fsprogs-temp/"
+ fi
+
+ # Using different name for blkid compatibility
+ cd ${TEMP}
+ mkdir -p "${TEMP}/initramfs-e2fsprogs-temp/"
+
+ copy_binaries "${TEMP}"/initramfs-e2fsprogs-temp/ /sbin/{e2fsck,mke2fs}
+
+ for i in /etc/{mke2fs,e2fsck}.conf; do
+ file="$(basename $i)"
+ cp "$i" "${TEMP}/initramfs-e2fsprogs-temp/$file" \
+ || gen_die "Could not copy over $file"
+ done
+
+ cd "${TEMP}/initramfs-e2fsprogs-temp/"
+ log_future_cpio_content
+ find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+ rm -rf "${TEMP}/initramfs-e2fsprogs-temp" > /dev/null
+}
+
append_blkid(){
if [ -d "${TEMP}/initramfs-blkid-temp" ]
then
@@ -741,6 +767,7 @@ create_initramfs() {
append_data 'base_layout'
append_data 'auxilary' "${BUSYBOX}"
append_data 'busybox' "${BUSYBOX}"
+ append_data 'e2fsprogs' "${E2FSPROGS}"
append_data 'lvm' "${LVM}"
append_data 'dmraid' "${DMRAID}"
append_data 'iscsi' "${ISCSI}"
diff --git a/genkernel.conf b/genkernel.conf
index 5d93a66..af73931 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -87,6 +87,9 @@ USECOLOR="yes"
# Add iSCSI support.
#ISCSI="no"
+# Add e2fsprogs support.
+#E2FSPROGS="no"
+
# Include support for unionfs
#UNIONFS="1"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/genkernel:ryao commit in: /, doc/
@ 2012-08-25 1:46 Richard Yao
0 siblings, 0 replies; 8+ messages in thread
From: Richard Yao @ 2012-08-25 1:46 UTC (permalink / raw
To: gentoo-commits
commit: 0b6dce71c7b305ff2515fd769227416724b58f9b
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 00:55:13 2012 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 01:46:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0b6dce71
Add support for e2fsprogs back in
Add support for e2fsprogs, specifically mke2fs and e2fsck, back into
genkernel.
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
---
doc/genkernel.8.txt | 3 +++
gen_cmdline.sh | 6 ++++++
gen_determineargs.sh | 1 +
gen_initramfs.sh | 27 +++++++++++++++++++++++++++
genkernel.conf | 3 +++
5 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 9a96f32..912f899 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -263,6 +263,9 @@ INITIALIZATION
*--*[*no-*]*dmraid*::
Includes or excludes DMRAID support.
+*--*[*no-*]*e2fsprogs*::
+ Includes or excludes e2fsprogs.
+
*--*[*no-*]*zfs*::
Includes or excludes ZFS support.
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 938b1a5..a305201 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -91,6 +91,8 @@ longusage() {
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs"
echo " --dmraid Include DMRAID support"
echo " --no-dmraid Exclude DMRAID support"
+ echo " --e2fsprogs Include e2fsprogs"
+ echo " --no-e2fsprogs Exclude e2fsprogs"
echo " --zfs Include ZFS support"
echo " --no-zfs Exclude ZFS support"
echo " --multipath Include Multipath support"
@@ -306,6 +308,10 @@ parse_cmdline() {
fi
print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
;;
+ --e2fsprogs|--no-e2fsprogs)
+ CMD_E2FSPROGS=`parse_optbool "$*"`
+ print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}"
+ ;;
--zfs|--no-zfs)
CMD_ZFS=`parse_optbool "$*"`
print_info 2 "CMD_ZFS: ${CMD_ZFS}"
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index d1ec199..81ac05f 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -122,6 +122,7 @@ determine_real_args() {
set_config_with_override BOOL GPG CMD_GPG
set_config_with_override BOOL MDADM CMD_MDADM
set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG
+ set_config_with_override BOOL E2FSPROGS CMD_E2FSPROGS
set_config_with_override BOOL ZFS CMD_ZFS
set_config_with_override BOOL MULTIPATH CMD_MULTIPATH
set_config_with_override BOOL FIRMWARE CMD_FIRMWARE
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ac90830..af232d8 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -127,6 +127,32 @@ append_busybox() {
rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
}
+append_e2fsprogs(){
+ local name=''
+
+ if [ -d "${TEMP}/initramfs-e2fsprogs-temp" ]
+ then
+ rm -r "${TEMP}/initramfs-e2fsprogs-temp/"
+ fi
+
+ # Using different name for blkid compatibility
+ cd ${TEMP}
+ mkdir -p "${TEMP}/initramfs-e2fsprogs-temp/"
+
+ copy_binaries "${TEMP}"/initramfs-e2fsprogs-temp/ /sbin/{e2fsck,mke2fs}
+
+ for i in /etc/{mke2fs,e2fsck}.conf; do
+ file="$(basename $i)"
+ cp "$i" "${TEMP}/initramfs-e2fsprogs-temp/${name}" \
+ || gen_die "Could not copy over ${name}"
+ done
+
+ cd "${TEMP}/initramfs-e2fsprogs-temp/"
+ log_future_cpio_content
+ find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+ rm -rf "${TEMP}/initramfs-e2fsprogs-temp" > /dev/null
+}
+
append_blkid(){
if [ -d "${TEMP}/initramfs-blkid-temp" ]
then
@@ -741,6 +767,7 @@ create_initramfs() {
append_data 'base_layout'
append_data 'auxilary' "${BUSYBOX}"
append_data 'busybox' "${BUSYBOX}"
+ append_data 'e2fsprogs' "${E2FSPROGS}"
append_data 'lvm' "${LVM}"
append_data 'dmraid' "${DMRAID}"
append_data 'iscsi' "${ISCSI}"
diff --git a/genkernel.conf b/genkernel.conf
index 5d93a66..af73931 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -87,6 +87,9 @@ USECOLOR="yes"
# Add iSCSI support.
#ISCSI="no"
+# Add e2fsprogs support.
+#E2FSPROGS="no"
+
# Include support for unionfs
#UNIONFS="1"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/genkernel:ryao commit in: /, doc/
@ 2012-11-05 18:30 Richard Yao
0 siblings, 0 replies; 8+ messages in thread
From: Richard Yao @ 2012-11-05 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 360ce3baf9df88c95b55fdb4d2c3b71a23449667
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 23:31:31 2012 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 23:31:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=360ce3ba
Document resume parameters.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
---
ChangeLog | 3 +++
doc/genkernel.8.txt | 4 +++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bb5e916..3a795e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
# Distributed under the GPL v2
# $Id$
+ 13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> doc/genkernel.8.txt:
+ Document resume parameters.
+
13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> 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/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 0377828..0f88334 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -550,7 +550,9 @@ which the ramdisk scripts would recognize.
*real_resume*=<...>::
*resume*=<...>::
*noresume*::
- TO BE DOCUMENTED
+ *noresume* disables any default resume parameters. *resume* and
+ *real_resume* specify a device via LABEL or UUID to use for for loading a
+ TuxOnICE, SWSUSP or Suspend2 resume image.
*cdroot*[=<...>]::
*cdroot_type*=<...>::
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/genkernel:ryao commit in: /, doc/
@ 2012-11-05 18:30 Richard Yao
0 siblings, 0 replies; 8+ messages in thread
From: Richard Yao @ 2012-11-05 18:30 UTC (permalink / raw
To: gentoo-commits
commit: a9a3c6d173b9e3e21080f7b493756fda359f8ebd
Author: Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Mon Apr 9 18:36:56 2012 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 00:00:46 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a9a3c6d1
Update the documentation to reflect current status
We only support creating initramfs nowdays, so RAM disk support is not needed.
Since initramfs does not need root=/dev/ram0 (and we actually ignore it if it is set),
we should not tell people to use it.
We should also stop tell people to use real_root.
Conflicts:
genkernel
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
---
ChangeLog | 4 ++++
README | 11 +++--------
doc/genkernel.8.txt | 16 ++++++++++------
gen_bootloader.sh | 7 ++-----
genkernel | 9 +++------
5 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 10680da..dfe39e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
# Distributed under the GPL v2
# $Id$
+ 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.
+
15 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
Bump to 3.4.44.2 with depmod corner cases by xake.
diff --git a/README b/README
index 196e956..c202a54 100644
--- a/README
+++ b/README
@@ -21,18 +21,13 @@ PORTING:
IMPORTANT KERNEL NOTES:
- You MUST have /dev/pts turned on.
- "Block devices->Loopback device support"
- "Block devices->RAM disk support"
- To boot genkernel properly, the kernel config must have
- RAM disk support and Initial RAM disk support. You should
- also set your "Default RAM disk size to 8192"
+ Initial RAM disk support.
BOOTING A KERNEL WITH INITRD:
GRUB:
- real_root= needs to point to your root partition
- root= needs to point to the ramdisk (should stay at /dev/ram0)
- init= needs to point to the linuxrc file to execute on the ramdisk
+ root= needs to point to your root partition
vga= should be the resolution you want your screen. 0x317 is
1024x768 - 16bpp and you'll get a pretty splash if
configured properly
@@ -40,5 +35,5 @@ BOOTING A KERNEL WITH INITRD:
GRUB EXAMPLE ENTRY:
title=2.6.0 [ Genkernel ]
root (hd0,0)
- kernel (hd0,0)/boot/kernel-2.6.0-gentoo root=/dev/ram0 init=/linuxrc real_root=/dev/hda3 vga=0x317
+ kernel (hd0,0)/boot/kernel-2.6.0-gentoo root=/dev/hda3 vga=0x317
initrd (hd0,0)/boot/initrd-2.6.0-gentoo
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 0f88334..dc04240 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -384,9 +384,13 @@ RAMDISK OPTIONS
The following options can be passed as kernel parameters from the bootloader,
which the ramdisk scripts would recognize.
-*real_root*=<...>::
+*root*=<...>::
Specifies the device node of the root filesystem to mount.
+*real_root*=<...>::
+ Legacy kernel parameter from kernel-2.4 initrd.
+ Does the same as *root*=, which should be used in its place.
+
*crypt_root*=<...>::
This specifies the device encrypted by Luks, which contains the
root filesystem to mount.
@@ -423,9 +427,13 @@ which the ramdisk scripts would recognize.
*dodmraid*[=<...>]::
Activate Device-Mapper RAID and (optionally) pass arguments to it.
-*real_init*=<...>::
+*init*=<...>::
Override location of init script, default is "/sbin/init".
+*real_init*=<...>::
+ Legacy kernel parameter from kernel-2.4 initrd.
+ Does the same as *init*=, which should be used in its place.
+
*init_opts*=<...>::
Passes arguments to init on bootup.
@@ -486,10 +494,6 @@ which the ramdisk scripts would recognize.
*nocache*::
Enables/disables caching of CD contents in RAM.
-*root*=<...>::
- Omit or specify as "/dev/ram0".
- For other values be sure to know what you're doing.
-
*subdir*=<...>::
switch_root into "<CHROOT>/<SUBDIR>" instead of "<CHROOT>/".
<CHROOT> is "/newroot" (or "/union") usually.
diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 5b73d97..7a4f485 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -89,11 +89,8 @@ set_bootloader_grub() {
# 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' ]
- then
- echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
- else
- echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=/dev/ram0 init=/linuxrc real_root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
+ echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
+ if [ "${BUILD_INITRD}" = '1' ]
if [ "${PAT}" -gt '4' ]
then
echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}
diff --git a/genkernel b/genkernel
index e84e089..ca634d4 100755
--- a/genkernel
+++ b/genkernel
@@ -331,23 +331,20 @@ then
print_info 1 "Kernel compiled successfully!"
print_info 1 ''
print_info 1 'Required Kernel Parameters:'
+ print_info 1 ' root=/dev/$ROOT'
if [ "${BUILD_RAMDISK}" = '0' ]
then
- print_info 1 ' root=/dev/$ROOT'
print_info 1 ' [ And "vga=0x317 splash=verbose" if you use a framebuffer ]'
print_info 1 ''
print_info 1 ' Where $ROOT is the device node for your root partition as the'
print_info 1 ' one specified in /etc/fstab'
else
- print_info 1 ' real_root=/dev/$ROOT'
print_info 1 ''
print_info 1 ' Where $ROOT is the device node for your root partition as the'
print_info 1 ' one specified in /etc/fstab'
print_info 1 ''
print_info 1 "If you require Genkernel's hardware detection features; you MUST"
- print_info 1 'tell your bootloader to use the provided INITRAMFS file. Otherwise;'
- print_info 1 'substitute the root argument for the real_root argument if you are'
- print_info 1 'not planning to use the initramfs...'
+ print_info 1 'tell your bootloader to use the provided INITRAMFS file.'
fi
fi
@@ -362,7 +359,7 @@ then
[ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support'
[ "${DMRAID}" = '1' ] && print_warning 1 ' or "dodmraid=<additional options>"'
[ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS volume management support'
- [ "${ZFS}" = '1' ] && print_warning 1 'add either "real_root=ZFS" (bootfs autodetection) or "real_root=ZFS=<dataset>" to boot from a ZFS dataset'
+ [ "${ZFS}" = '1' ] && print_warning 1 ' and either "root=ZFS" to use bootfs autodetection or "root=ZFS=<dataset>" to force booting from a specific dataset'
[ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-11-05 18:32 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-05 18:30 [gentoo-commits] proj/genkernel:ryao commit in: /, doc/ Richard Yao
-- strict thread matches above, loose matches on Subject: below --
2012-11-05 18:30 Richard Yao
2012-08-25 1:46 Richard Yao
2012-08-25 1:44 Richard Yao
2012-08-25 1:36 Richard Yao
2012-08-25 1:19 Richard Yao
2012-08-25 1:03 Richard Yao
2012-08-25 0:58 Richard Yao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox