| 1 |
commit: 203bdc8c856b208c9b9c44ec922fbb8c75b5d07f |
| 2 |
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 8 10:52:25 2012 +0000 |
| 4 |
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 8 10:52:25 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=203bdc8c |
| 7 |
|
| 8 |
Merge branch 'master' into dracut |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
defaults/initrd.defaults |
| 12 |
defaults/initrd.scripts |
| 13 |
defaults/linuxrc |
| 14 |
gen_arch.sh |
| 15 |
gen_compile.sh |
| 16 |
gen_determineargs.sh |
| 17 |
gen_initramfs.sh |
| 18 |
patches/busybox/1.18.1/1.18.1-mdstart.diff |
| 19 |
|
| 20 |
|
| 21 |
ChangeLog | 48 +++++++++++++++++++++++++++ |
| 22 |
doc/genkernel.8.txt | 3 ++ |
| 23 |
gen_bootloader.sh | 4 +- |
| 24 |
gen_cmdline.sh | 4 +- |
| 25 |
gen_compile.sh | 4 +- |
| 26 |
gen_configkernel.sh | 2 +- |
| 27 |
gen_determineargs.sh | 12 +++--- |
| 28 |
gen_funcs.sh | 10 +++--- |
| 29 |
gen_moddeps.sh | 4 +- |
| 30 |
gen_package.sh | 33 +++++++++--------- |
| 31 |
patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch | 26 ++++++++++++++ |
| 32 |
11 files changed, 113 insertions(+), 37 deletions(-) |
| 33 |
|
| 34 |
diff --cc gen_bootloader.sh |
| 35 |
index 320685d,79531d4..c5bb85b |
| 36 |
--- a/gen_bootloader.sh |
| 37 |
+++ b/gen_bootloader.sh |
| 38 |
@@@ -60,13 -60,18 +60,13 @@@ set_bootloader_grub() |
| 39 |
echo "root (${GRUB_BOOT_DISK},${GRUB_BOOT_PARTITION})" >> ${GRUB_CONF} |
| 40 |
echo >> ${GRUB_CONF} |
| 41 |
|
| 42 |
- # Add grub configuration to grub.conf |
| 43 |
+ # Add grub configuration to grub.conf |
| 44 |
echo "# Genkernel generated entry, see GRUB documentation for details" >> ${GRUB_CONF} |
| 45 |
echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF} |
| 46 |
- if [ "${BUILD_INITRD}" = '0' ] |
| 47 |
+ echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF} |
| 48 |
+ if [ "${BUILD_INITRD}" -eq '1' ] |
| 49 |
then |
| 50 |
- echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF} |
| 51 |
- else |
| 52 |
- echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=/dev/ram0 init=/linuxrc real_root=${GRUB_ROOTFS}" >> ${GRUB_CONF} |
| 53 |
- if [ "${PAT}" -gt '4' ] |
| 54 |
- then |
| 55 |
- echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF} |
| 56 |
- fi |
| 57 |
+ echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF} |
| 58 |
fi |
| 59 |
echo >> ${GRUB_CONF} |
| 60 |
else |
Archives