| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-04-04 15:17:30 +0000 (Fri, 04 Apr 2008) |
| 3 |
New Revision: 663 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/generic/initrd.scripts |
| 8 |
trunk/genkernel |
| 9 |
Log: |
| 10 |
Added a patch to skip device nodes for devices if at least one partition exists on the device. This aids in LiveUSB usage and is for bug #212794. This is genkernel 3.4.10_pre8. |
| 11 |
|
| 12 |
Modified: trunk/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- trunk/ChangeLog 2008-04-03 22:02:47 UTC (rev 662) |
| 15 |
+++ trunk/ChangeLog 2008-04-04 15:17:30 UTC (rev 663) |
| 16 |
@@ -2,6 +2,12 @@ |
| 17 |
# Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 18 |
# $Header: $ |
| 19 |
|
| 20 |
+ 04 Apr 2008; Chris Gianelloni <wolf31o2@g.o> |
| 21 |
+ generic/initrd.scripts, genkernel: |
| 22 |
+ Added a patch to skip device nodes for devices if at least one partition |
| 23 |
+ exists on the device. This aids in LiveUSB usage and is for bug #212794. |
| 24 |
+ This is genkernel 3.4.10_pre8. |
| 25 |
+ |
| 26 |
03 Apr 2008; Andrew Gaffney <agaffney@g.o> generic/linuxrc: |
| 27 |
Split up /dev node checks into console/null and tty1 |
| 28 |
|
| 29 |
|
| 30 |
Modified: trunk/generic/initrd.scripts |
| 31 |
=================================================================== |
| 32 |
--- trunk/generic/initrd.scripts 2008-04-03 22:02:47 UTC (rev 662) |
| 33 |
+++ trunk/generic/initrd.scripts 2008-04-04 15:17:30 UTC (rev 663) |
| 34 |
@@ -92,6 +92,23 @@ |
| 35 |
# Check for a block device to mount |
| 36 |
if [ -b "${x}" ] |
| 37 |
then |
| 38 |
+ skip=0 |
| 39 |
+ bsn=`basename "${x}"` |
| 40 |
+ # |
| 41 |
+ # If disk and it has at least one partition, skip. |
| 42 |
+ # We use /sys/block/${bsn}/${bsn}[0-9]* to make sure that we |
| 43 |
+ # don't skip device mapper devices. Even the craziest scenario |
| 44 |
+ # deserves a fair chance. |
| 45 |
+ # |
| 46 |
+ for part in `ls /sys/block/${bsn}/${bsn}[0-9]* 2>/dev/null` |
| 47 |
+ do |
| 48 |
+ skip=1 |
| 49 |
+ break; |
| 50 |
+ done |
| 51 |
+ if [ ${skip} -eq 1 ] |
| 52 |
+ then |
| 53 |
+ continue |
| 54 |
+ fi |
| 55 |
good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT} |
| 56 |
|
| 57 |
# if [ "${media}" = "cdrom" ]; then |
| 58 |
@@ -281,8 +298,9 @@ |
| 59 |
} |
| 60 |
|
| 61 |
test_success() { |
| 62 |
+ retcode=$? |
| 63 |
# If last command failed send error message and fall back to a shell |
| 64 |
- if [ "$?" != '0' ] |
| 65 |
+ if [ "$retcode" != '0' ] |
| 66 |
then |
| 67 |
error_string=$1 |
| 68 |
error_string="${error_string:-run command}" |
| 69 |
@@ -385,13 +403,13 @@ |
| 70 |
if [ "${KV_2_6_OR_GREATER}" ] |
| 71 |
then |
| 72 |
cd /sys |
| 73 |
- [ "${DO_slowusb}" ] && sleep 10 |
| 74 |
+ [ "${DO_slowusb}" ] && sdelay |
| 75 |
check_slowusb |
| 76 |
- [ "${FORCE_slowusb}" ] && sleep 10 |
| 77 |
+ [ "${FORCE_slowusb}" ] && sdelay |
| 78 |
good_msg 'Activating mdev' |
| 79 |
runmdev |
| 80 |
[ "${DO_slowusb}" ] || \ |
| 81 |
- [ "${FORCE_slowusb}" ] && sleep 20 |
| 82 |
+ [ "${FORCE_slowusb}" ] && sdelay |
| 83 |
cd / |
| 84 |
fi |
| 85 |
} |
| 86 |
|
| 87 |
Modified: trunk/genkernel |
| 88 |
=================================================================== |
| 89 |
--- trunk/genkernel 2008-04-03 22:02:47 UTC (rev 662) |
| 90 |
+++ trunk/genkernel 2008-04-04 15:17:30 UTC (rev 663) |
| 91 |
@@ -1,7 +1,7 @@ |
| 92 |
#!/bin/bash |
| 93 |
|
| 94 |
PATH="${PATH}:/sbin:/usr/sbin" |
| 95 |
-GK_V='3.4.10_pre7' |
| 96 |
+GK_V='3.4.10_pre8' |
| 97 |
|
| 98 |
# Set the default for TMPDIR. May be modified by genkernel.conf or the |
| 99 |
# --tempdir command line option. |
| 100 |
|
| 101 |
-- |
| 102 |
gentoo-commits@l.g.o mailing list |
Archives