From: Tim Yamin Date: Thu, 28 Jul 2005 13:49:58 +0000 (+0000) Subject: >> 3.3.1. Fix #100144, #100169, #100583. X-Git-Tag: v3.4.10.902~471 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ed6e170ce7b54c71da9308e93a44683c15596c1;p=genkernel.git >> 3.3.1. Fix #100144, #100169, #100583. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@281 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 0fa363a..e438b76 100644 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -495,7 +495,7 @@ merge_initramfs_cpio_archives(){ [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' ] || [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' ] && - cp ${TEMP}/initramfs-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz + cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz } clear_cpio_dir(){ diff --git a/gen_package.sh b/gen_package.sh index d69f563..f892b15 100644 --- a/gen_package.sh +++ b/gen_package.sh @@ -90,6 +90,7 @@ gen_kerncache_extract_kernel() cp "${TEMP}/kernelz-${ARCH}-${KV}" "/boot/kernelz-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy the kernel binary to /boot!' fi cp "${TEMP}/System.map-${ARCH}-${KV}" "/boot/System.map-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy System.map to /boot!' +} gen_kerncache_extract_modules() { diff --git a/generic/initrd.scripts b/generic/initrd.scripts index 42bd1e5..730c803 100644 --- a/generic/initrd.scripts +++ b/generic/initrd.scripts @@ -162,8 +162,8 @@ findnfsmount() { fi if [ "${NFSROOT}" != '' ]; then - if [ "${CDROOT}" != '' ]; then - good_msg "Attempting to mount NFS CD image on ${NFSPATH}" + if [ "${CDROOT}" != '0' ]; then + good_msg "Attempting to mount NFS CD image on ${NFSROOT}" mount -t nfs -o ro,nolock,rsize=1024,wsize=1024 ${NFSROOT} ${NEW_ROOT}/mnt/cdrom if [ "$?" = '0' ]; then REAL_ROOT="/dev/nfs" @@ -171,7 +171,7 @@ findnfsmount() { bad_msg "NFS Mounting failed. Is the path corrent ?" fi else - good_msg "Attemping to mount NFS root on ${NFSPATH}" + good_msg "Attemping to mount NFS root on ${NFSROOT}" mount -t nfs -o ro,nolock,rsize=1024,wsize=1024 ${NFSROOT} ${NEW_ROOT} if [ "$?" = '0' ]; then REAL_ROOT="/dev/nfs" @@ -440,6 +440,11 @@ startVolumes() { then if [ -e '/bin/vgscan' -a -e '/bin/vgchange' ] then + for dev in ${RAID_DEVICES} + do + setup_md_device "${dev}" + done + good_msg "Scanning for Volume Groups" /bin/vgscan --ignorelockingfailure --mknodes 2>/dev/null good_msg "Activating Volume Groups" @@ -510,12 +515,15 @@ cdupdate() { } setup_md_device() { - [ -z "${REAL_ROOT}" ] && return # LiveCD + local device + + [ -z "$1" ] && device="${REAL_ROOT}" || device="$1" + [ -z "${device}" ] && return # LiveCD - if [ `echo ${REAL_ROOT}|sed -e 's#\(/dev/md\)[[:digit:]]\+#\1#'` = "/dev/md" ] + if [ `echo ${device}|sed -e 's#\(/dev/md\)[[:digit:]]\+#\1#'` = "/dev/md" ] then good_msg 'Detected real_root as a md device. Setting up the device node...' - MD_NUMBER=`echo ${REAL_ROOT}|sed -e 's#/dev/md\([[:digit:]]\+\)#\1#'` + MD_NUMBER=`echo ${device}|sed -e 's#/dev/md\([[:digit:]]\+\)#\1#'` if [ ! -e /dev/md${MD_NUMBER} ] then mknod /dev/md${MD_NUMBER} b 9 ${MD_NUMBER} >/dev/null 2>&1 diff --git a/generic/linuxrc b/generic/linuxrc index 3092517..a0b59af 100644 --- a/generic/linuxrc +++ b/generic/linuxrc @@ -153,6 +153,10 @@ do ;; # /dev/md + lvmraid\=*) + RAID_DEVICES="${RAID_DEVICES} `parse_opt ${x}`" + ;; + part\=*) MDPART=`parse_opt "${x}"` ;; diff --git a/genkernel b/genkernel index 0f5568c..4d52d67 100755 --- a/genkernel +++ b/genkernel @@ -2,7 +2,7 @@ # Genkernel v3 PATH="/bin:/usr/bin:/sbin:/usr/sbin" -GK_V='3.2.12' +GK_V='3.3.1' TMPDIR='/var/tmp/genkernel' TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified. @@ -28,7 +28,7 @@ source ${GK_BIN}/gen_bootloader.sh || gen_die "Could not read ${GK_BIN}/gen_boot TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$ trap_cleanup(){ - #Call exit code of 1 for failure + # Call exit code of 1 for failure cleanup exit 1 } @@ -381,7 +381,7 @@ then [ "${GENSPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${GENSPLASH_THEME} CONSOLE=/dev/tty1 quiet\" if you use a gensplash framebuffer ]" [ "${BOOTSPLASH}" -eq '1' ] && print_info 1 'add "vga=791 splash=silent" if you use a bootsplash framebuffer' [ "${LVM2}" -eq '1' ] && print_info 1 'add "dolvm2" for lvm2 support' - [ "${EVMS2}" -eq '1' ] && print_info 1 'add "doevms" for evms support' + [ "${EVMS2}" -eq '1' ] && print_info 1 'add "doevms2" for evms support' [ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support' [ "${DMRAID}" -eq '1' ] && print_info 1 ' or "dodmraid="' [ "${UNIONFS}" -eq '1' ] && print_info 1 'add "unionfs" for unionfs support' diff --git a/genkernel.8 b/genkernel.8 index 5585f97..874ae60 100644 --- a/genkernel.8 +++ b/genkernel.8 @@ -1,4 +1,4 @@ -.TH GENKERNEL "8" "July 2005" "genkernel 3.2.0" "Gentoo Linux" +.TH GENKERNEL "8" "July 2005" "genkernel 3.3" "Gentoo Linux" .SH NAME genkernel \- the Gentoo Linux automatic kernel compiler. .SH SYNOPSIS @@ -272,3 +272,12 @@ and should be assigned to kernel@gentoo.org. Please check if an existing bug documents the same issue before opening a new bug. Issues for kernel sources not supported by Gentoo should go to their relevant authors. +.SH AUTHORS +Tim Yamin +.B +.sp +Eric Edgar +.B +.sp +NFS Support by Thomas Seiler +.B diff --git a/pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2 b/pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2 index afe53a1..1fb41c7 100644 Binary files a/pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2 and b/pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2 differ diff --git a/ppc/config.sh b/ppc/config.sh index 81c70f9..39ae81e 100644 --- a/ppc/config.sh +++ b/ppc/config.sh @@ -24,4 +24,4 @@ UTILS_AS=as UTILS_LD=ld COMPRESS_INITRD=yes - +GENERATE_Z_IMAGE=1