* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2011-04-17 18:14 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2011-04-17 18:14 UTC (permalink / raw
To: gentoo-commits
commit: ade0b7669be72b77c56d85dcc78761d05815d347
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Mar 28 17:24:06 2011 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 17:24:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ade0b766
Merge branch 'master' into stable
HACKING | 2 +-
doc/genkernel.8.txt | 2 +-
gen_compile.sh | 10 +++++++++-
.../open-iscsi-2.0.872-omg-calling-configure.patch | 11 +++++++++++
patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch | 11 +++++++++++
5 files changed, 33 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2011-04-17 18:14 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2011-04-17 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 3261a50884e930e0e422377dd647a16991a6bc42
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Mar 16 13:48:20 2011 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 13:48:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3261a508
Merge branch experimental using --no-ff
ChangeLog | 14 ++++++++++++++
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/initrd.scripts | 7 +------
defaults/modules_load | 2 +-
doc/genkernel.8.txt | 9 +++++++--
gen_cmdline.sh | 7 ++++++-
gen_determineargs.sh | 1 +
gen_initramfs.sh | 15 +++++++++++++--
genkernel.conf | 7 ++++++-
21 files changed, 62 insertions(+), 26 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2011-04-17 18:14 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2011-04-17 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 4f87856880d31496ff91d22bf3e6da793fb27b60
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Mar 28 18:22:23 2011 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 18:22:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4f878568
Merge branch 'stable-next' into stable
ChangeLog | 12 ++++++++++++
HACKING | 2 +-
defaults/initrd.scripts | 2 +-
defaults/linuxrc | 17 +++++++++--------
doc/genkernel.8.txt | 10 ++++++----
gen_cmdline.sh | 5 -----
gen_compile.sh | 10 +++++++++-
gen_initramfs.sh | 6 +-----
.../open-iscsi-2.0.872-omg-calling-configure.patch | 11 +++++++++++
patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch | 11 +++++++++++
10 files changed, 61 insertions(+), 25 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2011-04-17 18:14 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2011-04-17 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 0caf098f1b9ec5f8de884a844c8df29316af0a3a
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 15:37:43 2011 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 15:37:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0caf098f
Merge branch 'stable' into dracut
Conflicts:
defaults/initrd.scripts
defaults/linuxrc
gen_cmdline.sh
gen_compile.sh
gen_initramfs.sh
ChangeLog | 15 +++++++++++++++
HACKING | 2 +-
doc/genkernel.8.txt | 10 ++++++----
gen_cmdline.sh | 1 +
genkernel | 2 +-
.../open-iscsi-2.0.872-omg-calling-configure.patch | 11 +++++++++++
patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch | 11 +++++++++++
7 files changed, 46 insertions(+), 6 deletions(-)
diff --cc gen_cmdline.sh
index 9e6b093,9e4009e..a433975
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@@ -58,24 -69,12 +58,25 @@@ longusage()
echo " --no-mountboot Don't mount BOOTDIR automatically"
echo " --bootdir=<dir> Set the location of the boot-directory, default is /boot"
echo " Initialization"
- echo " --splash=<theme> Enable framebuffer splash using <theme>"
- echo " --splash-res=<res> Select splash theme resolutions to install"
- echo " --splash=<theme> Enable framebuffer splash using <theme>"
- 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 " --bootloader=grub Add new kernel to GRUB configuration"
++ echo " --genzimage Make and install kernelz image (PowerPC)"
+ echo " Dracut engine"
+ echo " --add-modules=<modules list>"
+ echo " Additional Dracut modules;"
+ echo " see /usr/share/dracut/modules.d for possible"
+ echo " values; separate modules by space, e.g.:"
+ echo " --add-modules=\"lvm crypt nfs\""
+ echo " --auto Rely on Dracut system check instead of"
+ echo " specifying modules by hand"
+ echo " --crypt Include LUKS support"
+ echo " --> 'emerge cryptsetup'"
+ echo " --no-ramdisk-modules Don't copy any modules to the ramdisk"
+ echo " --dmraid Include DMRAID support"
+ echo " --dracut-dir=<dir> Directory of Dracut sources; if given Dracut"
+ echo " is run in local mode (see description of '-l'"
+ echo " in 'man 8 dracut'); script changes current"
+ echo " directory to <dir>, so don't use relative"
+ echo " paths then"
echo " --evms Include EVMS support"
echo " --> 'emerge evms' in the host operating system"
echo " first"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2011-04-17 18:14 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2011-04-17 18:14 UTC (permalink / raw
To: gentoo-commits
commit: d37dd8c2e6044ae4d899279d0dd7c049949165d7
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 13:06:40 2011 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 13:06:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d37dd8c2
Merge branch 'stable' into dracut
Conflicts:
defaults/initrd.defaults
defaults/initrd.scripts
gen_cmdline.sh
gen_determineargs.sh
gen_initramfs.sh
genkernel.conf
ChangeLog | 24 ++++++++++++++++++++++++
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/modules_load | 2 +-
doc/genkernel.8.txt | 9 +++++++--
gen_cmdline.sh | 6 ++----
genkernel | 2 +-
18 files changed, 48 insertions(+), 21 deletions(-)
diff --cc gen_cmdline.sh
index 098eb09,506ca3f..9e6b093
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@@ -40,9 -41,11 +40,9 @@@ longusage()
echo " --no-install Do not install the kernel after building"
echo " --symlink Manage symlinks in /boot for installed images"
echo " --no-symlink Do not manage symlinks"
- echo " --no-ramdisk-modules Don't copy any modules to the ramdisk"
- echo " --all-ramdisk-modules Copy all kernel modules to the ramdisk"
echo " --callback=<...> Run the specified arguments after the"
echo " kernel and modules have been compiled"
- echo " --static Build a static (monolithic) kernel."
+ echo " --static Build a static (monolithic kernel)."
echo " Kernel settings"
echo " --kerneldir=<dir> Location of the kernel sources"
echo " --kernel-config=<file> Kernel configuration file to use for compilation"
@@@ -52,30 -55,26 +52,30 @@@
echo " --kernel-cc=<compiler> Compiler to use for kernel (e.g. distcc)"
echo " --kernel-as=<assembler> Assembler to use for kernel"
echo " --kernel-ld=<linker> Linker to use for kernel"
- echo " --kernel-cross-compile=<cross var> CROSS_COMPILE kernel variable"
echo " --kernel-make=<makeprg> GNU Make to use for kernel"
- echo " --utils-cc=<compiler> Compiler to use for utilities"
- echo " --utils-as=<assembler> Assembler to use for utils"
- echo " --utils-ld=<linker> Linker to use for utils"
- echo " --utils-make=<makeprog> GNU Make to use for utils"
- echo " --utils-cross-compile=<cross var> CROSS_COMPILE utils variable"
- echo " --utils-arch=<arch> Force to arch for utils only instead of"
- echo " autodetect."
echo " --makeopts=<makeopts> Make options such as -j2, etc..."
echo " --mountboot Mount BOOTDIR automatically if mountable"
- echo " --no-mountboot Don't mount BOOTDIR automatically"
+ echo " --no-mountboot Don't mount BOOTDIR automatically"
echo " --bootdir=<dir> Set the location of the boot-directory, default is /boot"
echo " Initialization"
- echo " --splash=<theme> Enable framebuffer splash using <theme>"
- echo " --splash-res=<res> Select splash theme resolutions to install"
- echo " --splash=<theme> Enable framebuffer splash using <theme>"
- 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 " --bootloader=grub Add new kernel to GRUB configuration"
+ echo " Dracut engine"
+ echo " --add-modules=<modules list>"
+ echo " Additional Dracut modules;"
+ echo " see /usr/share/dracut/modules.d for possible"
+ echo " values; separate modules by space, e.g.:"
+ echo " --add-modules=\"lvm crypt nfs\""
+ echo " --auto Rely on Dracut system check instead of"
+ echo " specifying modules by hand"
+ echo " --crypt Include LUKS support"
+ echo " --> 'emerge cryptsetup'"
+ echo " --no-ramdisk-modules Don't copy any modules to the ramdisk"
+ echo " --dmraid Include DMRAID support"
+ echo " --dracut-dir=<dir> Directory of Dracut sources; if given Dracut"
+ echo " is run in local mode (see description of '-l'"
+ echo " in 'man 8 dracut'); script changes current"
+ echo " directory to <dir>, so don't use relative"
+ echo " paths then"
echo " --evms Include EVMS support"
echo " --> 'emerge evms' in the host operating system"
echo " first"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2011-04-17 18:14 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2011-04-17 18:14 UTC (permalink / raw
To: gentoo-commits
commit: b3d5157aaa14e936335b4b7010eedce1b607a67d
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 18:11:51 2011 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 18:11:51 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b3d5157a
gen_dracut: Updated to latest changes in Dracut options
---
gen_dracut.sh | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/gen_dracut.sh b/gen_dracut.sh
index 62b431d..acc76af 100755
--- a/gen_dracut.sh
+++ b/gen_dracut.sh
@@ -2,7 +2,7 @@
# $Id$
BASIC_MODULES=dash\ i18n\ kernel-modules\ resume\ rootfs-block\ terminfo
-BASIC_MODULES+=\ udev-rules\ uswsusp\ base
+BASIC_MODULES+=\ udev-rules\ base
MODULES=lvm\ dmraid\ iscsi\ mdraid\ crypt\ multipath\ plymouth\ gensplash
dracut_modules() {
@@ -26,7 +26,7 @@ dracut_modules() {
}
create_initramfs() {
- local tmprd="${TMPDIR}/initramfs-${KV}" opts='-f -v' add_files=()
+ local tmprd="${TMPDIR}/initramfs-${KV}" opts='-f -L=3 -M' add_files=()
print_info 1 'initramfs: >> Initializing Dracut...'
@@ -42,7 +42,7 @@ create_initramfs() {
if isTrue "${NORAMDISKMODULES}" || isTrue "${BUILD_STATIC}"
then
print_info 1 ' >> Not copying kernel modules and firmware...'
- opts+=\ --ignore-kernel-modules
+ opts+=\ --no-kernel
else
isTrue "${FIRMWARE}" && opts+=" --fwdir ${FIRMWARE_DIR}"
[[ ${FIRMWARE_FILES} ]] && add_files+=(${FIRMWARE_FILES})
@@ -54,17 +54,24 @@ create_initramfs() {
opts+=" ${EXTRA_OPTIONS}"
opts+=" $(dracut_modules)"
- export DRACUT_GENSPLASH_THEME=${GENSPLASH_THEME}
- export DRACUT_GENSPLASH_RES=${GENSPLASH_RES}
- print_info 1 " >> DRACUT_GENSPLASH_THEME=${GENSPLASH_THEME}"
- print_info 1 " >> DRACUT_GENSPLASH_RES=${GENSPLASH_RES}"
+ if isTrue "${GENSPLASH}"
+ then
+ export DRACUT_GENSPLASH_THEME=${GENSPLASH_THEME}
+ export DRACUT_GENSPLASH_RES=${GENSPLASH_RES}
+ print_info 1 " >> DRACUT_GENSPLASH_THEME=${GENSPLASH_THEME}"
+ print_info 1 " >> DRACUT_GENSPLASH_RES=${GENSPLASH_RES}"
+ fi
print_info 1 " >> dracut ${opts} '${tmprd}' '${KV}'"
if [[ ${DRACUT_DIR} ]]; then
cd "${DRACUT_DIR}"
eval ./dracut ${opts} \'${tmprd}\' \'${KV}\'
cd - >/dev/null
else
- eval dracut ${opts} \'${tmprd}\' \'${KV}\'
+ eval dracut ${opts} \'${tmprd}\' \'${KV}\' | while read module; do
+ [[ \ $MODULES\ =~ \ $module\ ]] && \
+ module="${BOLD}${module}${NORMAL}"
+ print_info 1 " >> Including module: $module"
+ done
fi
if isTrue "${INTEGRATED_INITRAMFS}"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2011-08-10 10:47 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2011-08-10 10:47 UTC (permalink / raw
To: gentoo-commits
commit: 5fdb97158cc30b245682079737cba8d94630ae9d
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 08:38:35 2011 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 08:38:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5fdb9715
Merge branch 'master' into dracut
Conflicts:
defaults/initrd.defaults
defaults/initrd.scripts
defaults/linuxrc
gen_cmdline.sh
gen_determineargs.sh
gen_initramfs.sh
genkernel
genkernel.conf
netboot/linuxrc.x
ChangeLog | 103 ++++++++++++++++
HACKING | 4 +-
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/kernel-config | 4 +-
arch/x86/modules_load | 3 +-
arch/x86_64/kernel-config | 6 +-
arch/x86_64/modules_load | 3 +-
defaults/config.sh | 6 +
defaults/kernel-config | 4 +-
defaults/modules_load | 3 +-
doc/genkernel.8.txt | 129 +++++++++++++++++--
gen_arch.sh | 15 ++-
gen_cmdline.sh | 8 ++
gen_compile.sh | 49 ++++----
gen_configkernel.sh | 3 +-
gen_determineargs.sh | 104 ++++++++--------
gen_funcs.sh | 4 +-
genkernel | 2 +-
genkernel.conf | 126 ++++++++++++++++---
maintenance/docmatcher.py | 10 ++-
patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch | 11 --
31 files changed, 456 insertions(+), 152 deletions(-)
diff --cc gen_determineargs.sh
index 2ed0656,ce479cb..20880c6
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@@ -68,63 -68,66 +68,63 @@@ get_KV()
determine_real_args() {
print_info 4 "Resolving config file, command line, and arch default settings."
+ set_config_alias MDADM MDRAID
+ set_config_alias LUKS CRYPT
+ set_config_alias SPLASH GENSPLASH
+ set_config_alias FBSPLASH GENSPLASH
+
- # Config File Command Line Arch Default
- # ----------- ------------ ------------
- set_config_with_override 2 DEBUGFILE CMD_DEBUGFILE
- set_config_with_override 2 KERNEL_DIR CMD_KERNEL_DIR "${DEFAULT_KERNEL_SOURCE}"
- set_config_with_override 1 NO_KERNEL_SOURCES CMD_NO_KERNEL_SOURCES
- set_config_with_override 2 KNAME CMD_KERNNAME "genkernel"
-
- set_config_with_override 2 MAKEOPTS CMD_MAKEOPTS "$DEFAULT_MAKEOPTS"
- set_config_with_override 2 KERNEL_MAKE CMD_KERNEL_MAKE "$DEFAULT_KERNEL_MAKE"
- set_config_with_override 2 KERNEL_CC CMD_KERNEL_CC "$DEFAULT_KERNEL_CC"
- set_config_with_override 2 KERNEL_LD CMD_KERNEL_LD "$DEFAULT_KERNEL_LD"
- set_config_with_override 2 KERNEL_AS CMD_KERNEL_AS "$DEFAULT_KERNEL_AS"
-
- set_config_with_override 2 KERNEL_CROSS_COMPILE CMD_KERNEL_CROSS_COMPILE
- set_config_with_override 2 BOOTDIR CMD_BOOTDIR "/boot"
-
- set_config_with_override 1 POSTCLEAR CMD_POSTCLEAR
- set_config_with_override 1 MRPROPER CMD_MRPROPER
- set_config_with_override 1 MENUCONFIG CMD_MENUCONFIG
- set_config_with_override 1 CLEAN CMD_CLEAN
-
- set_config_with_override 2 MINKERNPACKAGE CMD_MINKERNPACKAGE
- set_config_with_override 2 MODULESPACKAGE CMD_MODULESPACKAGE
- set_config_with_override 2 KERNCACHE CMD_KERNCACHE
- set_config_with_override 1 NORAMDISKMODULES CMD_NORAMDISKMODULES
- set_config_with_override 2 INITRAMFS_OVERLAY CMD_INITRAMFS_OVERLAY
- set_config_with_override 1 MOUNTBOOT CMD_MOUNTBOOT
- set_config_with_override 1 BUILD_STATIC CMD_STATIC
- set_config_with_override 1 SAVE_CONFIG CMD_SAVE_CONFIG
- set_config_with_override 1 SYMLINK CMD_SYMLINK
- set_config_with_override 2 INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH
- set_config_with_override 1 OLDCONFIG CMD_OLDCONFIG
- set_config_with_override 1 LVM CMD_LVM
- set_config_with_override 1 EVMS CMD_EVMS
- set_config_with_override 1 DMRAID CMD_DMRAID
- set_config_with_override 1 ISCSI CMD_ISCSI
- set_config_with_override 1 UNIONFS CMD_UNIONFS
- set_config_with_override 1 MULTIPATH CMD_MULTIPATH
- set_config_with_override 1 FIRMWARE CMD_FIRMWARE
- set_config_with_override 2 FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware"
- set_config_with_override 2 FIRMWARE_FILES CMD_FIRMWARE_FILES
- set_config_with_override 1 INTEGRATED_INITRAMFS CMD_INTEGRATED_INITRAMFS
- set_config_with_override 1 GENZIMAGE CMD_GENZIMAGE
- set_config_with_override 1 AUTO CMD_AUTO
- set_config_with_override 1 GENERIC CMD_GENERIC
- set_config_with_override 2 DRACUT_DIR CMD_DRACUT_DIR
- set_config_with_override 1 MDRAID CMD_MDRAID
- set_config_with_override 1 CRYPT CMD_CRYPT
- set_config_with_override 1 PLYMOUTH CMD_PLYMOUTH
- set_config_with_override 1 GENSPLASH CMD_GENSPLASH
- set_config_with_override 2 ADD_MODULES CMD_ADD_MODULES
- set_config_with_override 2 EXTRA_OPTIONS CMD_EXTRA_OPTIONS
+ # Dest / Config File Command Line Arch Default
+ # ------------------ ------------ ------------
+ set_config_with_override STRING LOGFILE CMD_LOGFILE
+ set_config_with_override STRING KERNEL_DIR CMD_KERNEL_DIR "${DEFAULT_KERNEL_SOURCE}"
+ set_config_with_override BOOL NO_KERNEL_SOURCES CMD_NO_KERNEL_SOURCES
+ set_config_with_override STRING KNAME CMD_KERNNAME "genkernel"
+
+ set_config_with_override STRING MAKEOPTS CMD_MAKEOPTS "$DEFAULT_MAKEOPTS"
+ set_config_with_override STRING KERNEL_MAKE CMD_KERNEL_MAKE "$DEFAULT_KERNEL_MAKE"
- set_config_with_override STRING UTILS_MAKE CMD_UTILS_MAKE "$DEFAULT_UTILS_MAKE"
+ set_config_with_override STRING KERNEL_CC CMD_KERNEL_CC "$DEFAULT_KERNEL_CC"
+ set_config_with_override STRING KERNEL_LD CMD_KERNEL_LD "$DEFAULT_KERNEL_LD"
+ set_config_with_override STRING KERNEL_AS CMD_KERNEL_AS "$DEFAULT_KERNEL_AS"
- set_config_with_override STRING UTILS_CC CMD_UTILS_CC "$DEFAULT_UTILS_CC"
- set_config_with_override STRING UTILS_LD CMD_UTILS_LD "$DEFAULT_UTILS_LD"
- set_config_with_override STRING UTILS_AS CMD_UTILS_AS "$DEFAULT_UTILS_AS"
+
+ set_config_with_override STRING KERNEL_CROSS_COMPILE CMD_KERNEL_CROSS_COMPILE
- set_config_with_override STRING UTILS_CROSS_COMPILE CMD_UTILS_CROSS_COMPILE
+ set_config_with_override STRING BOOTDIR CMD_BOOTDIR "/boot"
+
- set_config_with_override BOOL SPLASH CMD_SPLASH
+ set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR
+ set_config_with_override BOOL MRPROPER CMD_MRPROPER
+ set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG
+ set_config_with_override BOOL CLEAN CMD_CLEAN
+
+ set_config_with_override STRING MINKERNPACKAGE CMD_MINKERNPACKAGE
+ set_config_with_override STRING MODULESPACKAGE CMD_MODULESPACKAGE
+ set_config_with_override STRING KERNCACHE CMD_KERNCACHE
+ set_config_with_override BOOL NORAMDISKMODULES CMD_NORAMDISKMODULES
- set_config_with_override BOOL ALLRAMDISKMODULES CMD_ALLRAMDISKMODULES
+ set_config_with_override STRING INITRAMFS_OVERLAY CMD_INITRAMFS_OVERLAY
+ set_config_with_override BOOL MOUNTBOOT CMD_MOUNTBOOT
+ set_config_with_override BOOL BUILD_STATIC CMD_STATIC
+ set_config_with_override BOOL SAVE_CONFIG CMD_SAVE_CONFIG
+ set_config_with_override BOOL SYMLINK CMD_SYMLINK
+ 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 DMRAID CMD_DMRAID
+ set_config_with_override BOOL ISCSI CMD_ISCSI
- set_config_with_override BOOL BUSYBOX CMD_BUSYBOX "yes"
+ set_config_with_override BOOL UNIONFS CMD_UNIONFS
- set_config_with_override BOOL NETBOOT CMD_NETBOOT
- set_config_with_override STRING REAL_ROOT CMD_REAL_ROOT
- set_config_with_override BOOL DISKLABEL CMD_DISKLABEL
- set_config_with_override BOOL LUKS CMD_LUKS
- 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 MULTIPATH CMD_MULTIPATH
+ set_config_with_override BOOL FIRMWARE CMD_FIRMWARE
+ set_config_with_override STRING FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware"
+ set_config_with_override STRING FIRMWARE_FILES CMD_FIRMWARE_FILES
+ set_config_with_override BOOL INTEGRATED_INITRAMFS CMD_INTEGRATED_INITRAMFS
+ set_config_with_override BOOL GENZIMAGE CMD_GENZIMAGE
- set_config_with_override BOOL KEYMAP CMD_KEYMAP "yes"
- set_config_with_override BOOL DOKEYMAPAUTO CMD_DOKEYMAPAUTO
- set_config_with_override STRING BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG
++
++ set_config_with_override BOOL AUTO CMD_AUTO
++ set_config_with_override BOOL GENERIC CMD_GENERIC
++ set_config_with_override STRING DRACUT_DIR CMD_DRACUT_DIR
++ set_config_with_override BOOL MDRAID CMD_MDRAID
++ set_config_with_override BOOL CRYPT CMD_CRYPT
++ set_config_with_override BOOL PLYMOUTH CMD_PLYMOUTH
++ set_config_with_override BOOL GENSPLASH CMD_GENSPLASH
++ set_config_with_override STRING ADD_MODULES CMD_ADD_MODULES
++ set_config_with_override STRING EXTRA_OPTIONS CMD_EXTRA_OPTIONS
BOOTDIR=`arch_replace "${BOOTDIR}"`
BOOTDIR=${BOOTDIR%/} # Remove any trailing slash
diff --cc genkernel.conf
index 65a6b0c,24fcd54..c425da0
--- a/genkernel.conf
+++ b/genkernel.conf
@@@ -88,15 -100,25 +100,14 @@@ DISKLABEL="yes
# Add new kernel to grub?
# BOOTLOADER="grub"
- # ===============Dracut engine================
+ # Enable splashutils in early space (initrd). Default is "no".
+ # SPLASH="yes"
- # Add in EVMS support from static binaries if they exist on the system: you
- # should run "emerge evms" first.
- # EVMS="no"
-
- # Include RAID support via mdadm
- # MDRAID="no"
+ # Use this splash theme. If commented out - the "default" name theme is used.
+ # Also, SPLASH="yes" needs to be enabled for this one to one work.
+ # This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).
+ # SPLASH_THEME="gentoo"
-
-# =========Keymap Settings=========
-#
-# Force keymap selection at boot
-#DOKEYMAPAUTO="yes"
-
-
-# Disables keymap selection support
-#KEYMAP="0"
-
-
# =========Low Level Compile Settings=========
#
# GNU Make to use for kernel. See also the --kernel-make command line option.
@@@ -113,6 -135,32 +124,10 @@@
# Linker to use for the kernel. See also the --kernel-ld command line option.
# KERNEL_LD="ld"
-# GNU Make to use for the utilities. See also the --utils-make command line
-# option.
-# UTILS_MAKE="make"
-
-# Compiler to use for the utilities (e.g. distcc). See also the --utils-cc
-# command line option.
-# UTILS_CC="gcc"
-
-# Assembler to use for the utilities. See also the --utils-as command line
-# option.
-# UTILS_AS="as"
-
-# Linker to use for the utilities. See also the --utils-ld command line
-# option.
-# UTILS_LD="ld"
-
-
-# Common prefix of cros compile commands
-#UTILS_CROSS_COMPILE="x86_64-pc-linux-gnu"
-
-
+ # Value of CROSS_COMPILE utils variable
+ # during kernel compilation
+ #KERNEL_CROSS_COMPILE="x86_64-pc-linux-gnu"
+
-
# =========GENKERNEL LOCATION CONFIGURATION============
# Variables:
# %%ARCH%% - Final determined architecture
@@@ -141,3 -191,133 +156,78 @@@ DEFAULT_KERNEL_SOURCE="/usr/src/linux
# Default kernel config (only use to override using
# arch/%%ARCH%%/kernel-config-${VER}.${PAT} !)
# DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config"
+
-# Specifies a user created busybox config
-#BUSYBOX_CONFIG="/path/to/file"
-
-BUSYBOX_VER="VERSION_BUSYBOX"
-BUSYBOX_SRCTAR="${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2"
-BUSYBOX_DIR="busybox-${BUSYBOX_VER}"
-BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2"
-# BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat"
-
-DEVICE_MAPPER_VER="VERSION_DMAP"
-DEVICE_MAPPER_DIR="device-mapper.${DEVICE_MAPPER_VER}"
-DEVICE_MAPPER_SRCTAR="${DISTDIR}/device-mapper.${DEVICE_MAPPER_VER}.tgz"
-DEVICE_MAPPER_BINCACHE="%%CACHE%%/device-mapper-${DEVICE_MAPPER_VER}-%%ARCH%%.tar.bz2"
-
-LVM_VER="VERSION_LVM"
-LVM_DIR="LVM2.${LVM_VER}"
-LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz"
-LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2"
-
-MDADM_VER="VERSION_MDADM"
-MDADM_DIR="mdadm-${MDADM_VER}"
-MDADM_SRCTAR="${DISTDIR}/mdadm-${MDADM_VER}.tar.bz2"
-MDADM_BINCACHE="%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2"
-
-DMRAID_VER="VERSION_DMRAID"
-DMRAID_DIR="dmraid/${DMRAID_VER}"
-DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2"
-DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2"
-
-ISCSI_VER="VERSION_ISCSI"
-ISCSI_DIR="open-iscsi-${ISCSI_VER}"
-ISCSI_SRCTAR="${DISTDIR}/open-iscsi-${ISCSI_VER}.tar.gz"
-ISCSI_BINCACHE="%%CACHE%%/iscsi-${ISCSI_VER}-%%ARCH%%.bz2"
-
-E2FSPROGS_VER="VERSION_E2FSPROGS"
-E2FSPROGS_DIR="e2fsprogs-${E2FSPROGS_VER}"
-E2FSPROGS_SRCTAR="${DISTDIR}/e2fsprogs-${E2FSPROGS_VER}.tar.gz"
-BLKID_BINCACHE="%%CACHE%%/blkid-${E2FSPROGS_VER}-%%ARCH%%.bz2"
-
-FUSE_VER="VERSION_FUSE"
-FUSE_DIR="fuse-${FUSE_VER}"
-FUSE_SRCTAR="${DISTDIR}/fuse-${FUSE_VER}.tar.gz"
-FUSE_BINCACHE="%%CACHE%%/fuse-${FUSE_VER}-%%ARCH%%.tar.bz2"
-
-UNIONFS_FUSE_VER="VERSION_UNIONFS_FUSE"
-UNIONFS_FUSE_DIR="unionfs-fuse-${UNIONFS_FUSE_VER}"
-UNIONFS_FUSE_SRCTAR="${DISTDIR}/unionfs-fuse-${UNIONFS_FUSE_VER}.tar.bz2"
-UNIONFS_FUSE_BINCACHE="%%CACHE%%/unionfs-fuse-${UNIONFS_FUSE_VER}-%%ARCH%%.bz2"
-
-GPG_VER="VERSION_GPG"
-GPG_DIR="gnupg-${GPG_VER}"
-GPG_SRCTAR="${DISTDIR}/gnupg-${GPG_VER}.tar.bz2"
-GPG_BINCACHE="%%CACHE%%/gnupg-${GPG_VER}-%%ARCH%%.bz2"
-
-
+ # =========MISC KERNEL CONFIGURATION============
+ #
+ # Tag the kernel and ramdisk with a name:
+ # If not defined the option defaults to
+ # 'genkernel'
+ #KNAME="genkernel"
+
+
+ # This option is only valid if kerncache is
+ # defined. If there is a valid kerncache no checks
+ # will be made against a kernel source tree
+ #NO_KERNEL_SOURCES="1"
+
+
+ # Build a static (monolithic kernel)
+ #BUILD_STATIC="1"
+
+
+ # Make and install kernelz image (PowerPC)
+ #GENZIMAGE="1"
+
+
+ # File to output a .tar.bz2'd kernel contents
+ # of /lib/modules/ and the kernel config
+ # NOTE: This is created before the callbacks
+ # are run!
+ #KERNCACHE="/path/to/file"
+
+
+ # Prefix to kernel module destination, modules
+ # will be installed in <prefix>/lib/modules
+ # (.conf equivalent of --module-prefix=<dir>)
+ #INSTALL_MOD_PATH=""
+
+
+ # =========MISC INITRD CONFIGURATION============
+ #
+ # Copy all kernel modules to the ramdisk
+ #ALLRAMDISKMODULES="1"
+
+
+ # Don't copy any modules to the ramdisk
+ #NORAMDISKMODULES="1"
+
+
+ # File to output a .tar.bz2'd kernel and ramdisk:
+ # No modules outside of the ramdisk will be
+ # included...
+ #MINKERNPACKAGE="/path/to/file.bz2"
+
+
+ # File to output a .tar.bz2'd modules after the
+ # callbacks have run
+ #MODULESPACKAGE="/path/to/file.bz2"
+
+
+ # Directory structure to include in the initramfs,
+ # only available on >=2.6 kernels
+ #INITRAMFS_OVERLAY=""
+
+
+ # Build the generated initramfs into the kernel instead of
+ # keeping it as a separate file
+ #INTEGRATED_INITRAMFS="1"
+
+
+ # Create a self-contained env in the initramfs
+ #NETBOOT="1"
+
+
+ # =========MISC BOOT CONFIGURATION============
+ #
+ # Specify a default for real_root=
+ #REAL_ROOT="/dev/one/two/gentoo"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2011-08-10 10:47 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2011-08-10 10:47 UTC (permalink / raw
To: gentoo-commits
commit: f1146f8e6fb34efa6b3d375c926bfa3ce43c88f2
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 10:45:57 2011 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 10:45:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f1146f8e
--mdadmconf and MDRAID_CONFIG to include or not /etc/mdadm.conf
---
gen_cmdline.sh | 4 ++++
gen_determineargs.sh | 2 ++
gen_dracut.sh | 10 ++++++++++
3 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 9abab0b..922cc73 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -467,6 +467,10 @@ parse_cmdline() {
CMD_MDRAID=1
print_info 2 "CMD_MDRAID: ${CMD_MDRAID}"
;;
+ --mdadmconf)
+ CMD_MDRAID_CONFIG=1
+ print_info 2 "CMD_MDRAID_CONFIG: ${CMD_MDRAID_CONFIG}"
+ ;;
--multipath)
if [ ! -e /usr/include/libdevmapper.h ]
then
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 37c1847..502bd36 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -69,6 +69,7 @@ determine_real_args() {
print_info 4 "Resolving config file, command line, and arch default settings."
set_config_alias MDADM MDRAID
+ set_config_alias MDADM_CONFIG MDRAID_CONFIG
set_config_alias LUKS CRYPT
set_config_alias GPG CRYPT_GPG
set_config_alias SPLASH GENSPLASH
@@ -121,6 +122,7 @@ determine_real_args() {
set_config_with_override BOOL GENERIC CMD_GENERIC
set_config_with_override STRING DRACUT_DIR CMD_DRACUT_DIR
set_config_with_override BOOL MDRAID CMD_MDRAID
+ set_config_with_override BOOL MDRAID_CONFIG CMD_MDRAID_CONFIG
set_config_with_override BOOL CRYPT CMD_CRYPT
set_config_with_override BOOL CRYPT_GPG CMD_CRYPT_GPG
set_config_with_override BOOL PLYMOUTH CMD_PLYMOUTH
diff --git a/gen_dracut.sh b/gen_dracut.sh
index 22cea3d..858426e 100755
--- a/gen_dracut.sh
+++ b/gen_dracut.sh
@@ -5,6 +5,10 @@ BASIC_MODULES=dash\ i18n\ kernel-modules\ resume\ rootfs-block\ terminfo
BASIC_MODULES+=\ udev-rules\ base
MODULES=lvm\ dmraid\ iscsi\ mdraid\ crypt\ crypt-gpg\ multipath\ plymouth\ gensplash
+strstr() {
+ [[ $1 =~ $2 ]]
+}
+
dracut_modules() {
local a=() o=()
@@ -54,6 +58,12 @@ create_initramfs() {
opts+=" ${EXTRA_OPTIONS}"
opts+=" $(dracut_modules)"
+ if strstr "${opts}" " mdraid "
+ then
+ isTrue "${MDRAID_CONFIG}" && opts+=\ --mdadmconf || \
+ opts+=\ --nomdadmconf
+ fi
+
if isTrue "${GENSPLASH}"
then
export DRACUT_GENSPLASH_THEME=${GENSPLASH_THEME}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2011-08-10 10:47 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2011-08-10 10:47 UTC (permalink / raw
To: gentoo-commits
commit: f23f77e24dfc09caa400f5230fbaaeef9c66d779
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 09:32:53 2011 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 09:32:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f23f77e2
Added GPG support.
---
gen_cmdline.sh | 5 +++++
gen_determineargs.sh | 2 ++
gen_dracut.sh | 8 ++++----
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 41581ac..9abab0b 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -70,6 +70,7 @@ longusage() {
echo " specifying modules by hand"
echo " --crypt Include LUKS support"
echo " --> 'emerge cryptsetup'"
+ echo " --gpg Include GPG-armored LUKS key support"
echo " --no-ramdisk-modules Don't copy any modules to the ramdisk"
echo " --dmraid Include DMRAID support"
echo " --dracut-dir=<dir> Directory of Dracut sources; if given Dracut"
@@ -383,6 +384,10 @@ parse_cmdline() {
CMD_CRYPT=1
print_info 2 "CMD_CRYPT: ${CMD_CRYPT}"
;;
+ --gpg|--crypt-gpg)
+ CMD_CRYPT_GPG=1
+ print_info 2 "CMD_CRYPT_GPG: ${CMD_CRYPT_GPG}"
+ ;;
--dmraid)
if [ ! -e /usr/include/libdevmapper.h ]
then
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 20880c6..37c1847 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -70,6 +70,7 @@ determine_real_args() {
set_config_alias MDADM MDRAID
set_config_alias LUKS CRYPT
+ set_config_alias GPG CRYPT_GPG
set_config_alias SPLASH GENSPLASH
set_config_alias FBSPLASH GENSPLASH
@@ -121,6 +122,7 @@ determine_real_args() {
set_config_with_override STRING DRACUT_DIR CMD_DRACUT_DIR
set_config_with_override BOOL MDRAID CMD_MDRAID
set_config_with_override BOOL CRYPT CMD_CRYPT
+ set_config_with_override BOOL CRYPT_GPG CMD_CRYPT_GPG
set_config_with_override BOOL PLYMOUTH CMD_PLYMOUTH
set_config_with_override BOOL GENSPLASH CMD_GENSPLASH
set_config_with_override STRING ADD_MODULES CMD_ADD_MODULES
diff --git a/gen_dracut.sh b/gen_dracut.sh
index acc76af..22cea3d 100755
--- a/gen_dracut.sh
+++ b/gen_dracut.sh
@@ -3,19 +3,19 @@
BASIC_MODULES=dash\ i18n\ kernel-modules\ resume\ rootfs-block\ terminfo
BASIC_MODULES+=\ udev-rules\ base
-MODULES=lvm\ dmraid\ iscsi\ mdraid\ crypt\ multipath\ plymouth\ gensplash
+MODULES=lvm\ dmraid\ iscsi\ mdraid\ crypt\ crypt-gpg\ multipath\ plymouth\ gensplash
dracut_modules() {
local a=() o=()
isTrue "${PLYMOUTH}" && isTrue "${GENSPLASH}" && gen_die 'Framebuffer Splash and Plymouth selected! You cannot choose both splash engines.'
- isTrue "${EVMS}" && gen_die 'EVMS is no longer supported. If you *really* need it, file a bug report and we bring it back to life.'
isTrue "${UNIONFS}" && gen_die 'UnionFS not yet supported.'
for var in ${MODULES}
do
- var="${var^^}"
- isTrue "${!var}" && a+=(${var,,})
+ opt="${var^^}"
+ opt="${opt//-/_}"
+ isTrue "${!opt}" && a+=(${var})
done
a+=(${ADD_MODULES})
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2012-01-08 10:53 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2012-01-08 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 203bdc8c856b208c9b9c44ec922fbb8c75b5d07f
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 8 10:52:25 2012 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 10:52:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=203bdc8c
Merge branch 'master' into dracut
Conflicts:
defaults/initrd.defaults
defaults/initrd.scripts
defaults/linuxrc
gen_arch.sh
gen_compile.sh
gen_determineargs.sh
gen_initramfs.sh
patches/busybox/1.18.1/1.18.1-mdstart.diff
ChangeLog | 48 +++++++++++++++++++++++++++
doc/genkernel.8.txt | 3 ++
gen_bootloader.sh | 4 +-
gen_cmdline.sh | 4 +-
gen_compile.sh | 4 +-
gen_configkernel.sh | 2 +-
gen_determineargs.sh | 12 +++---
gen_funcs.sh | 10 +++---
gen_moddeps.sh | 4 +-
gen_package.sh | 33 +++++++++---------
patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch | 26 ++++++++++++++
11 files changed, 113 insertions(+), 37 deletions(-)
diff --cc gen_bootloader.sh
index 320685d,79531d4..c5bb85b
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@@ -60,13 -60,18 +60,13 @@@ set_bootloader_grub()
echo "root (${GRUB_BOOT_DISK},${GRUB_BOOT_PARTITION})" >> ${GRUB_CONF}
echo >> ${GRUB_CONF}
- # Add grub configuration to grub.conf
+ # Add grub configuration to grub.conf
echo "# Genkernel generated entry, see GRUB documentation for details" >> ${GRUB_CONF}
echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF}
- if [ "${BUILD_INITRD}" = '0' ]
+ echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
+ if [ "${BUILD_INITRD}" -eq '1' ]
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}
- if [ "${PAT}" -gt '4' ]
- then
- echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}
- fi
+ echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}
fi
echo >> ${GRUB_CONF}
else
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/genkernel:dracut commit in: /
@ 2012-06-25 8:35 Amadeusz Żołnowski
0 siblings, 0 replies; 11+ messages in thread
From: Amadeusz Żołnowski @ 2012-06-25 8:35 UTC (permalink / raw
To: gentoo-commits
commit: 6a76ccf9900e40dd42d4eae016ed2f59e8ffb504
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 08:35:23 2012 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 08:35:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6a76ccf9
gen_dracut.sh: Add fs-lib and usrmount to basic modules.
---
gen_dracut.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gen_dracut.sh b/gen_dracut.sh
index 3edfc8f..6c9a9de 100755
--- a/gen_dracut.sh
+++ b/gen_dracut.sh
@@ -2,7 +2,7 @@
# $Id$
BASIC_MODULES=dash\ i18n\ kernel-modules\ resume\ rootfs-block\ terminfo
-BASIC_MODULES+=\ udev-rules\ base
+BASIC_MODULES+=\ udev-rules\ \usrmount\ base\ fs-lib
MODULES=lvm\ dmraid\ iscsi\ mdraid\ crypt\ crypt-gpg\ multipath\ plymouth\ gensplash
strstr() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-06-25 8:36 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-10 10:47 [gentoo-commits] proj/genkernel:dracut commit in: / Amadeusz Żołnowski
-- strict thread matches above, loose matches on Subject: below --
2012-06-25 8:35 Amadeusz Żołnowski
2012-01-08 10:53 Amadeusz Żołnowski
2011-08-10 10:47 Amadeusz Żołnowski
2011-08-10 10:47 Amadeusz Żołnowski
2011-04-17 18:14 Amadeusz Żołnowski
2011-04-17 18:14 Amadeusz Żołnowski
2011-04-17 18:14 Amadeusz Żołnowski
2011-04-17 18:14 Amadeusz Żołnowski
2011-04-17 18:14 Amadeusz Żołnowski
2011-04-17 18:14 Amadeusz Żołnowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox