* [gentoo-commits] proj/genkernel:master commit in: /, arch/sparc64/, arch/ppc/, arch/ppc64/, arch/um/, arch/x86_64/, arch/ia64/, ...
@ 2011-07-03 18:59 Sebastian Pipping
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2011-07-03 18:59 UTC (permalink / raw
To: gentoo-commits
commit: bf0cad6a30b2344a3abb6cbeb805b27ba7708c96
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul 3 18:56:05 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 18:57:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=bf0cad6a
Remove support for sys-fs/evms, as it was removed from Gentoo (bug #372423)
---
ChangeLog | 11 +++++++++
arch/alpha/modules_load | 1 -
arch/arm/modules_load | 1 -
arch/ia64/modules_load | 1 -
arch/mips/modules_load | 1 -
arch/parisc/modules_load | 1 -
arch/parisc64/modules_load | 1 -
arch/ppc/modules_load | 1 -
arch/ppc64/modules_load | 1 -
arch/sparc/modules_load | 1 -
arch/sparc64/modules_load | 1 -
arch/um/modules_load | 1 -
arch/x86/modules_load | 1 -
arch/x86_64/modules_load | 1 -
defaults/initrd.defaults | 2 +-
defaults/initrd.scripts | 18 --------------
defaults/linuxrc | 7 -----
defaults/modules_load | 1 -
doc/genkernel.8.txt | 7 -----
gen_cmdline.sh | 13 ----------
gen_determineargs.sh | 1 -
gen_initramfs.sh | 54 --------------------------------------------
genkernel | 1 -
genkernel.conf | 4 ---
maintenance/docmatcher.py | 2 +-
25 files changed, 13 insertions(+), 121 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 80850ae..862e001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,17 @@
# Distributed under the GPL v2
# $Id$
+ 03 Jul 2011; Sebastian Pipping <sping@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,
+ arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
+ arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
+ defaults/initrd.defaults, defaults/initrd.scripts, defaults/linuxrc,
+ defaults/modules_load, doc/genkernel.8.txt, gen_cmdline.sh,
+ gen_determineargs.sh, gen_initramfs.sh, genkernel, genkernel.conf,
+ maintenance/docmatcher.py:
+ Remove support for sys-fs/evms, as it was removed from Gentoo (bug #372423)
+
22 Jun 2011; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
Make --arch-override= affect "make menuconfig" (bug #247246)
diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load
index faf099d..731dbf4 100644
--- a/arch/alpha/modules_load
+++ b/arch/alpha/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/arm/modules_load b/arch/arm/modules_load
index cd14951..4b43271 100644
--- a/arch/arm/modules_load
+++ b/arch/arm/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load
index 51bdc14..b323538 100644
--- a/arch/ia64/modules_load
+++ b/arch/ia64/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/mips/modules_load b/arch/mips/modules_load
index faf099d..731dbf4 100644
--- a/arch/mips/modules_load
+++ b/arch/mips/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load
index faf099d..731dbf4 100644
--- a/arch/parisc/modules_load
+++ b/arch/parisc/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load
index 51bdc14..b323538 100644
--- a/arch/parisc64/modules_load
+++ b/arch/parisc64/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load
index faf099d..731dbf4 100644
--- a/arch/ppc/modules_load
+++ b/arch/ppc/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load
index 51bdc14..b323538 100644
--- a/arch/ppc64/modules_load
+++ b/arch/ppc64/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load
index faf099d..731dbf4 100644
--- a/arch/sparc/modules_load
+++ b/arch/sparc/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load
index 51bdc14..b323538 100644
--- a/arch/sparc64/modules_load
+++ b/arch/sparc64/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/um/modules_load b/arch/um/modules_load
index dfe4431..625a304 100644
--- a/arch/um/modules_load
+++ b/arch/um/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index 84ec83e..b7936bf 100644
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@@ -4,7 +4,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index d553165..8bae053 100644
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 72e8376..76d72a7 100755
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -79,5 +79,5 @@ DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"
# Only sections that are in by default or those that
# are not module groups need to be defined here...
-HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb evms lvm dmraid mdadm fs net'
+HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb lvm dmraid mdadm fs net'
MY_HWOPTS='modules pata sata scsi slowusb usb firewire waitscan dmraid mdadm fs net iscsi'
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 37a7eb4..b908ba0 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -660,28 +660,10 @@ 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}" | /bin/lvm /proc/self/fd/0
-
- # Disable EVMS since lvm is activated and they dont work together.
- if [ "${USE_EVMS_NORMAL}" = '1' ]
- then
- bad_msg "Disabling EVMS Support because LVM started"
- bad_msg "Do not add dolvm to the cmdline if this is not what you want"
- bad_msg "LVM and EVMS do not work well together"
- USE_EVMS_NORMAL=0
- fi
else
bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
fi
fi
-
- if [ "${USE_EVMS_NORMAL}" = '1' ]
- then
- if [ -e '/sbin/evms_activate' ]
- then
- good_msg "Activating EVMS"
- evms_activate
- fi
- fi
}
startiscsi() {
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 57f26fd..0843f5d 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -96,13 +96,6 @@ do
DMRAID_OPTS=`parse_opt "${x}"`
USE_DMRAID_NORMAL=1
;;
- doevms)
- USE_EVMS_NORMAL=1
- ;;
- doevms2)
- bad_msg 'Using doevms2 is deprecated, use doevms, instead.'
- USE_EVMS_NORMAL=1
- ;;
# Debug Options
debug)
DEBUG='yes'
diff --git a/defaults/modules_load b/defaults/modules_load
index 31f534b..269a40c 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 54cb411..2d7f775 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -236,10 +236,6 @@ INITIALIZATION
*--no-keymap*::
Disables keymap selection at boot.
-*--evms*::
- Add in EVMS support from static binaries if they exist on the system:
- you should run "emerge evms" first (in the host system).
-
*--lvm*::
Add in LVM support from static binaries if they exist on the
system, or compile static LVM binaries if static ones do not
@@ -417,9 +413,6 @@ which the ramdisk scripts would recognize.
location. Otherwise the location will be deduced from the DCHP
request (option root-path)
-*doevms*::
- Activate EVMS volumes on bootup
-
*dolvm*::
Activate LVM volumes on bootup
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 9e4009e..f7eb707 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -75,9 +75,6 @@ longusage() {
echo " --splash-res=<res> Select splash theme resolutions to install"
echo " --do-keymap-auto Forces keymap selection at boot"
echo " --no-keymap Disables keymap selection support"
- echo " --evms Include EVMS support"
- echo " --> 'emerge evms' in the host operating system"
- echo " first"
echo " --lvm Include LVM support"
echo " --mdadm Include MDADM/MDMON support"
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs"
@@ -224,16 +221,6 @@ parse_cmdline() {
CMD_KEYMAP=0
print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}"
;;
- --evms)
- CMD_EVMS=1
- print_info 2 "CMD_EVMS: ${CMD_EVMS}"
- ;;
- --evms2)
- CMD_EVMS=1
- print_info 2 "CMD_EVMS: ${CMD_EVMS}"
- echo
- print_warning 1 "Please use --evms, as --evms2 is deprecated."
- ;;
--lvm)
CMD_LVM=1
print_info 2 "CMD_LVM: ${CMD_LVM}"
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 6f88805..ce479cb 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -108,7 +108,6 @@ determine_real_args() {
set_config_with_override STRING INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH
set_config_with_override BOOL OLDCONFIG CMD_OLDCONFIG
set_config_with_override BOOL LVM CMD_LVM
- set_config_with_override BOOL EVMS CMD_EVMS
set_config_with_override BOOL DMRAID CMD_DMRAID
set_config_with_override BOOL ISCSI CMD_ISCSI
set_config_with_override BOOL BUSYBOX CMD_BUSYBOX "yes"
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 543f484..7fe4421 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -279,59 +279,6 @@ append_lvm(){
rm -r "${TEMP}/initramfs-lvm-temp/"
}
-append_evms(){
- if [ -d "${TEMP}/initramfs-evms-temp" ]
- then
- rm -r "${TEMP}/initramfs-evms-temp/"
- fi
- mkdir -p "${TEMP}/initramfs-evms-temp/lib/evms"
- mkdir -p "${TEMP}/initramfs-evms-temp/etc/"
- mkdir -p "${TEMP}/initramfs-evms-temp/bin/"
- mkdir -p "${TEMP}/initramfs-evms-temp/sbin/"
- if [ "${EVMS}" = '1' ]
- then
- print_info 1 ' EVMS: Adding support...'
- mkdir -p ${TEMP}/initramfs-evms-temp/lib
- cp -a /lib/ld-* "${TEMP}/initramfs-evms-temp/lib" \
- || gen_die 'Could not copy files for EVMS!'
- if [ -n "`ls /lib/libgcc_s*`" ]
- then
- cp -a /lib/libgcc_s* "${TEMP}/initramfs-evms-temp/lib" \
- || gen_die 'Could not copy files for EVMS!'
- fi
- cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-evms-temp/lib" \
- || gen_die 'Could not copy files for EVMS!'
- cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-evms-temp/lib" \
- || gen_die 'Could not copy files for EVMS!'
- cp -a /lib/libpthread* "${TEMP}/initramfs-evms-temp/lib" \
- || gen_die 'Could not copy files for EVMS!'
- cp -a /lib/libuuid*so* "${TEMP}/initramfs-evms-temp/lib" \
- || gen_die 'Could not copy files for EVMS!'
- cp -a /lib/libevms*so* "${TEMP}/initramfs-evms-temp/lib" \
- || gen_die 'Could not copy files for EVMS!'
- cp -a /lib/evms "${TEMP}/initramfs-evms-temp/lib" \
- || gen_die 'Could not copy files for EVMS!'
- cp -a /lib/evms/* "${TEMP}/initramfs-evms-temp/lib/evms" \
- || gen_die 'Could not copy files for EVMS!'
- cp -a /etc/evms.conf "${TEMP}/initramfs-evms-temp/etc" \
- || gen_die 'Could not copy files for EVMS!'
- cp /sbin/evms_activate "${TEMP}/initramfs-evms-temp/sbin" \
- || gen_die 'Could not copy over evms_activate!'
-
- # Fix EVMS complaining that it can't find the swap utilities.
- # These are not required in the initramfs
- for swap_libs in "${TEMP}/initramfs-evms-temp/lib/evms/*/swap*.so"
- do
- rm ${swap_libs}
- done
- fi
- cd "${TEMP}/initramfs-evms-temp/"
- find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
- || gen_die "compressing evms cpio"
- cd "${TEMP}"
- rm -r "${TEMP}/initramfs-evms-temp/"
-}
-
append_mdadm(){
if [ -d "${TEMP}/initramfs-mdadm-temp" ]
then
@@ -676,7 +623,6 @@ create_initramfs() {
append_data 'lvm' "${LVM}"
append_data 'dmraid' "${DMRAID}"
append_data 'iscsi' "${ISCSI}"
- append_data 'evms' "${EVMS}"
append_data 'mdadm' "${MDADM}"
append_data 'luks' "${LUKS}"
append_data 'multipath' "${MULTIPATH}"
diff --git a/genkernel b/genkernel
index f72cf43..38e445f 100755
--- a/genkernel
+++ b/genkernel
@@ -348,7 +348,6 @@ then
print_warning 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
[ "${SPLASH}" = '1' ] && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
[ "${LVM}" = '1' ] && print_warning 1 'add "dolvm" for lvm support'
- [ "${EVMS}" = '1' ] && print_warning 1 'add "doevms" for evms support'
[ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support'
[ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support'
[ "${DMRAID}" = '1' ] && print_warning 1 ' or "dodmraid=<additional options>"'
diff --git a/genkernel.conf b/genkernel.conf
index 420eb93..24fcd54 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -62,10 +62,6 @@ USECOLOR="yes"
# Add in GnuPG support
# GPG="no"
-# Add in EVMS support from static binaries if they exist on the system: you
-# should run "emerge evms" first.
-# EVMS="no"
-
# Add DMRAID support.
# DMRAID="no"
diff --git a/maintenance/docmatcher.py b/maintenance/docmatcher.py
index 848774a..6ba2cf9 100644
--- a/maintenance/docmatcher.py
+++ b/maintenance/docmatcher.py
@@ -27,7 +27,7 @@ EXTRA_VARIABLES = tuple(EXTRA_VARIABLES)
IGNORE_OPTIONS = ('help', 'version')
_GPG_PARAMETERS = ('symmetric', )
IGNORE_PARAMETERS = _GPG_PARAMETERS
-DEPRECATED_PARAMETERS = ('lvm2', 'evms2', 'gensplash', 'gensplash-res')
+DEPRECATED_PARAMETERS = ('lvm2', 'gensplash', 'gensplash-res')
def exract_gen_cmdline_sh():
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/genkernel:master commit in: /, arch/sparc64/, arch/ppc/, arch/ppc64/, arch/um/, arch/x86_64/, arch/ia64/, ...
@ 2012-02-06 8:19 Robin H. Johnson
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2012-02-06 8:19 UTC (permalink / raw
To: gentoo-commits
commit: fc98fa9d89319e7705a393a739b99f994e12420b
Author: Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Jan 28 18:57:11 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 08:19:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=fc98fa9d
Implement ZFS Support
This provides ZFS support, to go with the sys-fs/zfs package.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> (cleanups)
---
ChangeLog | 10 ++++++
arch/alpha/modules_load | 2 +-
arch/arm/modules_load | 2 +-
arch/ia64/modules_load | 2 +-
arch/mips/modules_load | 2 +-
arch/parisc/modules_load | 2 +-
arch/parisc64/modules_load | 2 +-
arch/ppc/modules_load | 2 +-
arch/ppc64/modules_load | 2 +-
arch/sparc/modules_load | 2 +-
arch/sparc64/modules_load | 2 +-
arch/um/modules_load | 2 +-
arch/x86/modules_load | 2 +-
arch/x86_64/modules_load | 2 +-
defaults/busy-config | 2 +-
defaults/initrd.scripts | 5 +++
defaults/linuxrc | 71 +++++++++++++++++++++++++++++++++++++++++--
defaults/modules_load | 2 +-
doc/genkernel.8.txt | 8 +++++
gen_cmdline.sh | 6 ++++
gen_determineargs.sh | 1 +
gen_initramfs.sh | 27 ++++++++++++++++
genkernel | 2 +
23 files changed, 141 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6c2a7d7..d6e4dcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,16 @@
# Distributed under the GPL v2
# $Id$
+ 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,
+ arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
+ arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
+ defaults/busy-config, defaults/initrd.scripts, defaults/linuxrc,
+ defaults/modules_load, doc/genkernel.8.txt, gen_cmdline.sh,
+ gen_determineargs.sh, gen_initramfs.sh, genkernel:
+ This provides ZFS support, to go with the sys-fs/zfs package.
+
06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
Refactor copy_binaries and multipath slightly for ease of usage and readability.
diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load
index 2aeb5c1..6d7dfbf 100644
--- a/arch/alpha/modules_load
+++ b/arch/alpha/modules_load
@@ -24,5 +24,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/arm/modules_load b/arch/arm/modules_load
index a4c5f51..616caaf 100644
--- a/arch/arm/modules_load
+++ b/arch/arm/modules_load
@@ -21,5 +21,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load
index 971484c..aa9ae31 100644
--- a/arch/ia64/modules_load
+++ b/arch/ia64/modules_load
@@ -24,4 +24,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/mips/modules_load b/arch/mips/modules_load
index 2aeb5c1..6d7dfbf 100644
--- a/arch/mips/modules_load
+++ b/arch/mips/modules_load
@@ -24,5 +24,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load
index 2aeb5c1..6d7dfbf 100644
--- a/arch/parisc/modules_load
+++ b/arch/parisc/modules_load
@@ -24,5 +24,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load
index 971484c..aa9ae31 100644
--- a/arch/parisc64/modules_load
+++ b/arch/parisc64/modules_load
@@ -24,4 +24,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load
index 2aeb5c1..6d7dfbf 100644
--- a/arch/ppc/modules_load
+++ b/arch/ppc/modules_load
@@ -24,5 +24,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load
index 971484c..aa9ae31 100644
--- a/arch/ppc64/modules_load
+++ b/arch/ppc64/modules_load
@@ -24,4 +24,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load
index 2aeb5c1..6d7dfbf 100644
--- a/arch/sparc/modules_load
+++ b/arch/sparc/modules_load
@@ -24,5 +24,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load
index 971484c..aa9ae31 100644
--- a/arch/sparc64/modules_load
+++ b/arch/sparc64/modules_load
@@ -24,4 +24,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/um/modules_load b/arch/um/modules_load
index cf3b19f..d00e495 100644
--- a/arch/um/modules_load
+++ b/arch/um/modules_load
@@ -24,5 +24,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index a9383e5..c601927 100644
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@@ -25,5 +25,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index d12f57d..0da1ec3 100644
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@@ -24,4 +24,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech 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 fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/defaults/busy-config b/defaults/busy-config
index 8d69369..2b9a4c4 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -220,7 +220,7 @@ CONFIG_FALSE=y
CONFIG_FSYNC=y
CONFIG_HEAD=y
# CONFIG_FEATURE_FANCY_HEAD is not set
-# CONFIG_HOSTID is not set
+CONFIG_HOSTID=y
# CONFIG_INSTALL is not set
# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
CONFIG_LN=y
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 609c52f..54e7b80 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -664,6 +664,11 @@ startVolumes() {
bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
fi
fi
+
+ if [ "${USE_ZFS}" = '1' ]
+ then
+ /sbin/zpool import -N -a ${ZPOOL_FORCE}
+ fi
}
startiscsi() {
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6bdaea1..0a69a6d 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -96,6 +96,19 @@ do
DMRAID_OPTS=${x#*=}
USE_DMRAID_NORMAL=1
;;
+ dozfs*)
+ if [ ! -x /sbin/zfs ]; then
+ USE_ZFS=0
+ bad_msg 'zfs binary not found: aborting use of zfs!'
+ else
+ USE_ZFS=1
+ MY_HWOPTS="${MY_HWOPTS} zfs"
+ if [ "${x#*=}" = 'force' ]
+ then
+ ZPOOL_FORCE=-f
+ fi
+ fi
+ ;;
# Debug Options
debug)
DEBUG='yes'
@@ -444,6 +457,49 @@ do
continue
fi
;;
+ ZFS*)
+ ROOT_DEV="${REAL_ROOT#*=}"
+ if [ "${ROOT_DEV}" != 'ZFS' ]
+ then
+ zfs get type ${ROOT_DEV} > /dev/null
+
+ if [ "$?" = '0' ]
+ then
+ got_good_root=1;
+ REAL_ROOT=${ROOT_DEV}
+ ROOTFSTYPE=zfs
+ fi
+ else
+ BOOTFS=$(/sbin/zpool list -H -o bootfs)
+ if [ "${BOOTFS}" != '-' ]
+ then
+
+ for i in ${BOOTFS}
+ do
+
+ zfs get type ${i} > /dev/null
+ retval=$?
+
+ if [ ${retval} -eq 0 ]; then
+ got_good_root=1
+ REAL_ROOT=${i}
+ ROOTFSTYPE=zfs
+ break
+ fi
+
+ done;
+
+ fi
+
+ fi
+
+ if [ ${got_good_root} -ne 1 ]; then
+ prompt_user "REAL_ROOT" "root block device"
+ got_good_root=0
+ fi
+
+ continue
+ ;;
esac
if [ "${REAL_ROOT}" = '' ]
@@ -477,17 +533,24 @@ do
else
good_msg "Mounting root..."
+ if [ "${ROOTFSTYPE}" = 'zfs' ]
+ then
+ MOUNT_STATE=rw
+ else
+ MOUNT_STATE=ro
+ fi
+
# Try to mount the device as ${NEW_ROOT}
if [ "${REAL_ROOT}" = '/dev/nfs' ]; then
findnfsmount
else
# mount ro so fsck doesn't barf later
if [ "${REAL_ROOTFLAGS}" = '' ]; then
- good_msg "Using mount -t ${ROOTFSTYPE} -o ro"
- mount -t ${ROOTFSTYPE} -o ro ${REAL_ROOT} ${NEW_ROOT}
+ good_msg "Using mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE}"
+ mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE} ${REAL_ROOT} ${NEW_ROOT}
else
- good_msg "Using mount -t ${ROOTFSTYPE} -o ro,${REAL_ROOTFLAGS}"
- mount -t ${ROOTFSTYPE} -o ro,${REAL_ROOTFLAGS} ${REAL_ROOT} ${NEW_ROOT}
+ good_msg "Using mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE},${REAL_ROOTFLAGS}"
+ mount -t ${ROOTFSTYPE} -o ${MOUNT_STATE},${REAL_ROOTFLAGS} ${REAL_ROOT} ${NEW_ROOT}
fi
fi
diff --git a/defaults/modules_load b/defaults/modules_load
index 269a40c..d65f9f9 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -24,5 +24,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
# Filesystems
-MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 1e02fb7..67edbd9 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -260,6 +260,9 @@ INITIALIZATION
*--*[*no-*]*dmraid*::
Includes or excludes DMRAID support.
+*--*[*no-*]*zfs*::
+ Includes or excludes ZFS support.
+
*--*[*no-*]*multipath*::
Includes or excludes Multipath support
@@ -439,6 +442,10 @@ which the ramdisk scripts would recognize.
*domdadm*::
Scan for RAID arrays on bootup
+*dozfs*[=force]::
+ Scan for bootable ZFS pools on bootup. Optionally force import if
+ necessary.
+
*doscsi*::
Activate SCSI devices on bootup, necessary when SCSI support is
compiled as modules and you're using SCSI or SATA devices.
@@ -586,6 +593,7 @@ AUTHORS
- NFS Support by Thomas Seiler <thseiler@gmail.com>
- GnuPG 1.x integration by dacook <schism@subverted.org>
- MDADM integration by Matthias Dahl <ua_bugz_gentoo@mortal-soul.de>
+- ZFS integration by Richard Yao <ryao@cs.stonybrook.edu>
SEE ALSO
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 4c04f94..de56a25 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -90,6 +90,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 " --zfs Include ZFS support"
+ echo " --no-zfs Exclude ZFS support"
echo " --multipath Include Multipath support"
echo " --no-multipath Exclude Multipath support"
echo " --iscsi Include iSCSI support"
@@ -296,6 +298,10 @@ parse_cmdline() {
fi
print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
;;
+ --zfs|--no-zfs)
+ CMD_ZFS=`parse_optbool "$*"`
+ print_info 2 "CMD_ZFS: ${CMD_ZFS}"
+ ;;
--multipath|--no-multipath)
CMD_MULTIPATH=`parse_optbool "$*"`
if [ "$CMD_MULTIPATH" = "1" -a ! -e /usr/include/libdevmapper.h ]
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index b12efca..e6ed0a3 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -120,6 +120,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 ZFS CMD_ZFS
set_config_with_override BOOL MULTIPATH CMD_MULTIPATH
set_config_with_override BOOL FIRMWARE CMD_FIRMWARE
set_config_with_override STRING FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware"
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 43fd77f..170361b 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -328,6 +328,31 @@ append_mdadm(){
rm -rf "${TEMP}/initramfs-mdadm-temp" > /dev/null
}
+append_zfs(){
+ if [ -d "${TEMP}/initramfs-zfs-temp" ]
+ then
+ rm -r "${TEMP}/initramfs-zfs-temp"
+ fi
+
+ mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+
+ # Copy files to /etc/zfs
+ for i in /etc/zfs/{zdev.conf,zpool.cache}
+ do
+ cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" \
+ || gen_die "Could not copy file ${i} for ZFS"
+ done
+
+ # Copy binaries
+ copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zfs,zpool}
+
+ cd "${TEMP}/initramfs-zfs-temp/"
+ find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+ || gen_die "compressing zfs cpio"
+ cd "${TEMP}"
+ rm -rf "${TEMP}/initramfs-zfs-temp" > /dev/null
+}
+
append_splash(){
splash_geninitramfs=`which splash_geninitramfs 2>/dev/null`
if [ -x "${splash_geninitramfs}" ]
@@ -642,6 +667,8 @@ create_initramfs() {
print_info 1 "initramfs: Not copying modules..."
fi
+ append_data 'zfs' "${ZFS}"
+
append_data 'blkid' "${DISKLABEL}"
append_data 'unionfs_fuse' "${UNIONFS}"
diff --git a/genkernel b/genkernel
index 19ef657..5883b5d 100755
--- a/genkernel
+++ b/genkernel
@@ -351,6 +351,8 @@ then
[ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support'
[ "${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 support'
+ [ "${ZFS}" = '1' ] && print_warning 1 ' and either "real_root=ZFS" to use bootfs autodetection or "real_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 [ `grep 'CONFIG_EXT[0-9]_FS=' "${KERNEL_DIR}"/.config | wc -l` -ge 2 ]; then
print_warning 1 'With support for several ext* filesystems around it may be needed to'
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/genkernel:master commit in: /, arch/sparc64/, arch/ppc/, arch/ppc64/, arch/um/, arch/x86_64/, arch/ia64/, ...
@ 2012-10-13 23:24 Robin H. Johnson
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2012-10-13 23:24 UTC (permalink / raw
To: gentoo-commits
commit: e6de60283bbe7b9aa9a7934609a183893ce543a1
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 23:23:15 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 23:24:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e6de6028
Bug #286187: Complete multipath support.
Somewhere in the mists of time we lost part of the multipath patch, so
we were bundling the userspace, but not the kernel modules, or ever
using it.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
---
ChangeLog | 9 +++++++++
arch/alpha/modules_load | 1 +
arch/arm/modules_load | 1 +
arch/ia64/modules_load | 1 +
arch/mips/modules_load | 1 +
arch/parisc/modules_load | 1 +
arch/parisc64/modules_load | 1 +
arch/ppc/modules_load | 1 +
arch/ppc64/modules_load | 1 +
arch/sparc/modules_load | 1 +
arch/sparc64/modules_load | 1 +
arch/um/modules_load | 1 +
arch/x86/modules_load | 1 +
arch/x86_64/modules_load | 1 +
defaults/initrd.scripts | 10 ++++++++++
defaults/linuxrc | 4 ++++
defaults/modules_load | 1 +
doc/genkernel.8.txt | 3 +++
gen_configkernel.sh | 8 ++++++++
gen_initramfs.sh | 5 ++++-
20 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 05484d9..bb5e916 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,15 @@
# Distributed under the GPL v2
# $Id$
+ 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,
+ arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
+ arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
+ defaults/initrd.scripts, defaults/linuxrc, defaults/modules_load,
+ gen_configkernel.sh, gen_initramfs.sh:
+ Bug #286187: Complete multipath support.
+
13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.defaults,
defaults/initrd.scripts, defaults/linuxrc, doc/genkernel.8.txt:
Bug #351873: More livecd control, and initramfs livecd argument
diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load
index 39199d3..5ff3c0a 100644
--- a/arch/alpha/modules_load
+++ b/arch/alpha/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/arm/modules_load b/arch/arm/modules_load
index 6c09869..509b59d 100644
--- a/arch/arm/modules_load
+++ b/arch/arm/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load
index 58d60c8..bf5f143 100644
--- a/arch/ia64/modules_load
+++ b/arch/ia64/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/mips/modules_load b/arch/mips/modules_load
index 39199d3..5ff3c0a 100644
--- a/arch/mips/modules_load
+++ b/arch/mips/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load
index 39199d3..5ff3c0a 100644
--- a/arch/parisc/modules_load
+++ b/arch/parisc/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load
index 58d60c8..bf5f143 100644
--- a/arch/parisc64/modules_load
+++ b/arch/parisc64/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load
index 39199d3..5ff3c0a 100644
--- a/arch/ppc/modules_load
+++ b/arch/ppc/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load
index 58d60c8..bf5f143 100644
--- a/arch/ppc64/modules_load
+++ b/arch/ppc64/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load
index 39199d3..5ff3c0a 100644
--- a/arch/sparc/modules_load
+++ b/arch/sparc/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load
index 58d60c8..bf5f143 100644
--- a/arch/sparc64/modules_load
+++ b/arch/sparc64/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/um/modules_load b/arch/um/modules_load
index 8a67d90..db48f1a 100644
--- a/arch/um/modules_load
+++ b/arch/um/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index 5ea5cc0..5bf348c 100644
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@@ -6,6 +6,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index f8e45d3..1cfc4f4 100644
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 227fc99..53e1f97 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -616,6 +616,16 @@ startVolumes() {
fi
fi
+ 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
+ fi
+
if [ "${USE_DMRAID_NORMAL}" = '1' ]
then
if [ -e '/sbin/dmraid' ]
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 54a57c6..48446ba 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -101,6 +101,10 @@ do
DMRAID_OPTS=${x#*=}
USE_DMRAID_NORMAL=1
;;
+ domultipath)
+ good_msg "Booting with multipath activated."
+ USE_MULTIPATH_NORMAL=1
+ ;;
dozfs*)
USE_ZFS=1
diff --git a/defaults/modules_load b/defaults/modules_load
index 19521df..2643c0f 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -5,6 +5,7 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-zero"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
# Hardware (IDE/SCSI/SATA)
MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 6376e28..0377828 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -457,6 +457,9 @@ which the ramdisk scripts would recognize.
Scan for bootable ZFS pools on bootup. Optionally force import if
necessary.
+*domultipath*::
+ Activate Multipath on bootup
+
*doscsi*::
Activate SCSI devices on bootup, necessary when SCSI support is
compiled as modules and you're using SCSI or SATA devices.
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 6271ca0..b546db1 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -117,6 +117,14 @@ config_kernel() {
sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_DM_MIRROR is.*/CONFIG_DM_MIRROR=m/g'
fi
+ # Multipath
+ if isTrue ${CMD_MULTIPATH}
+ then
+ sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
+ sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH is.*/CONFIG_DM_MULTIPATH=m/g'
+ sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g'
+ fi
+
# Make sure dmraid modules are on if --dmraid
if isTrue ${CMD_DMRAID}
then
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 55b9dd9..64e00e8 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -226,7 +226,10 @@ append_multipath(){
mkdir -p "${TEMP}"/initramfs-multipath-temp/{bin,etc,sbin,lib}/
# Copy files
- copy_binaries "${TEMP}/initramfs-multipath-temp" /sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} /lib64/udev/scsi_id /bin/mountpoint
+ copy_binaries "${TEMP}/initramfs-multipath-temp" \
+ /bin/mountpoint \
+ /sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} \
+ /{lib,lib64}/{udev/scsi_id,multipath/*so}
if [ -x /sbin/multipath ]
then
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-13 23:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-03 18:59 [gentoo-commits] proj/genkernel:master commit in: /, arch/sparc64/, arch/ppc/, arch/ppc64/, arch/um/, arch/x86_64/, arch/ia64/, Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2012-02-06 8:19 Robin H. Johnson
2012-10-13 23:24 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox