denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added patches from François-Xavier Roure <fx_roure@yahoo.fr> from bug #149020. This will end up being genkernel 3.4.6, most likely.

Browse Source 
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@474 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 18 years ago
parent 2056384a90
commit 9862e9b7ce
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File

5
ChangeLog
Unescape View File

@ -2,6 +2,11 @@
# Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
16 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_initrd.sh,
generic/linuxrc, genkernel:
Added patches from François-Xavier Roure <fx_roure@yahoo.fr> from bug
#149020. This will end up being genkernel 3.4.6, most likely.
14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh: 14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh:
Adjust selinux stuff in gen_compile.sh to actually do what we intended, not Adjust selinux stuff in gen_compile.sh to actually do what we intended, not
the opposite. the opposite.

10
gen_initrd.sh
Unescape View File

@ -8,7 +8,7 @@ create_initrd_loop() {
gen_die 'Could not create loopback mount directory!' gen_die 'Could not create loopback mount directory!'
dd if=/dev/zero of=${TMPDIR}/initrd-${KV} bs=1k count=${1} >> "${DEBUGFILE}" 2>&1 || dd if=/dev/zero of=${TMPDIR}/initrd-${KV} bs=1k count=${1} >> "${DEBUGFILE}" 2>&1 ||
gen_die "Could not zero initrd-${KV}" gen_die "Could not zero initrd-${KV}"
mke2fs -F -N500 -q "${TMPDIR}/initrd-${KV}" >> "${DEBUGFILE}" 2>&1 || mke2fs -F -N750 -q "${TMPDIR}/initrd-${KV}" >> "${DEBUGFILE}" 2>&1 ||
gen_die "Could not format initrd-${KV}!" gen_die "Could not format initrd-${KV}!"
mount -t ext2 -o loop "${TMPDIR}/initrd-${KV}" "${TEMP}/initrd-mount" >> "${DEBUGFILE}" 2>&1 || mount -t ext2 -o loop "${TMPDIR}/initrd-${KV}" "${TEMP}/initrd-mount" >> "${DEBUGFILE}" 2>&1 ||
gen_die 'Could not mount the initrd filesystem!' gen_die 'Could not mount the initrd filesystem!'
@ -236,9 +236,9 @@ create_base_initrd_sys() {
fi fi
for i in '[' ash basename cat chroot clear cp dirname echo env false find \ for i in '[' ash basename cat chroot clear cp dirname echo env false find \
grep gunzip gzip ln ls loadkmap losetup lsmod mkdir mknod more mount mv \ grep gunzip gzip ln ls loadkmap losetup lsmod mdev mkdir mknod more mount \
pivot_root ps awk pwd rm rmdir rmmod sed sh sleep tar test touch true umount uname \ mv pivot_root ps awk pwd rm rmdir rmmod sed sh sleep tar test touch true \
xargs yes zcat chmod chown cut kill killall; do umount uname xargs yes zcat chmod chown cut kill killall; do
rm -f ${TEMP}/initrd-temp/bin/$i > /dev/null rm -f ${TEMP}/initrd-temp/bin/$i > /dev/null
ln ${TEMP}/initrd-temp/bin/busybox ${TEMP}/initrd-temp/bin/$i || ln ${TEMP}/initrd-temp/bin/busybox ${TEMP}/initrd-temp/bin/$i ||
gen_die "Busybox error: could not link ${i}!" gen_die "Busybox error: could not link ${i}!"
@ -396,7 +396,7 @@ create_initrd() {
create_initrd_aux create_initrd_aux
INITRD_CALC_SIZE=`calc_initrd_size` INITRD_CALC_SIZE=`calc_initrd_size`
INITRD_SIZE=`expr ${INITRD_CALC_SIZE} + 100` INITRD_SIZE=`expr ${INITRD_CALC_SIZE} + 250`
print_info 1 " :: Size is at ${INITRD_SIZE}K" print_info 1 " :: Size is at ${INITRD_SIZE}K"
print_info 1 " >> Creating loopback filesystem..." print_info 1 " >> Creating loopback filesystem..."
create_initrd_loop ${INITRD_SIZE} create_initrd_loop ${INITRD_SIZE}

2
generic/linuxrc
Unescape View File

@ -670,7 +670,7 @@ then
mount -o move /memory /${CHROOT}/.unions/memory || echo '*: Failed to move unionfs /memory into the system root!' mount -o move /memory /${CHROOT}/.unions/memory || echo '*: Failed to move unionfs /memory into the system root!'
fi fi
if [ "$0" = '/linuxrc' ] if [ "$0" = '/linuxrc' ] || [ "$0" = 'linuxrc' ]
then then
[ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1 [ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1
echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting" echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting"

2
genkernel
Unescape View File

@ -2,7 +2,7 @@
# Genkernel v3 # Genkernel v3
PATH="/bin:/usr/bin:/sbin:/usr/sbin" PATH="/bin:/usr/bin:/sbin:/usr/sbin"
GK_V='3.4.5' GK_V='3.4.6'
TMPDIR='/var/tmp/genkernel' TMPDIR='/var/tmp/genkernel'
TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$ TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$

Write Preview
Loading…
Cancel
Save