diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-09-12 13:26:19 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-09-12 13:26:19 +0000 |
| commit | 3926a659ece69ceaba77679b6e1c7fe7f00f3431 (patch) | |
| tree | 267eab6de3c798070e9951fcb89988cc30098003 /src/genkernel_bradmssw | |
| parent | Updated default kernel configurations for x86/amd64 to match the 2006.1 release. (diff) | |
| download | gentoo-3926a659ece69ceaba77679b6e1c7fe7f00f3431.tar.gz gentoo-3926a659ece69ceaba77679b6e1c7fe7f00f3431.tar.bz2 gentoo-3926a659ece69ceaba77679b6e1c7fe7f00f3431.zip | |
iso9660 -> auto, and added support for checking SUBDIR for the livecd file. This is for bug #147186.
Diffstat (limited to 'src/genkernel_bradmssw')
| -rw-r--r-- | src/genkernel_bradmssw/generic/initrd.scripts | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/genkernel_bradmssw/generic/initrd.scripts b/src/genkernel_bradmssw/generic/initrd.scripts index a7fca775cc..c864464697 100644 --- a/src/genkernel_bradmssw/generic/initrd.scripts +++ b/src/genkernel_bradmssw/generic/initrd.scripts @@ -1,6 +1,7 @@ #!/bin/ash . /etc/initrd.defaults + backup() { echo -ne "\033[0G\033[0K" } @@ -70,12 +71,12 @@ findcdmount() { # Check for a block device to mount if [ -b "${x}" ] then - good_msg "Attempting to mount CD:- ${x}" - mount -r -t iso9660 ${x} ${NEW_ROOT}/mnt/cdrom > /dev/null 2>&1 + good_msg "Attempting to mount media:- ${x}" + mount -r -t auto ${x} ${NEW_ROOT}/mnt/cdrom > /dev/null 2>&1 if [ "$?" = '0' ] then # Check for a LiveCD - if [ -e ${NEW_ROOT}/mnt/cdrom/livecd ] + if [ -e ${NEW_ROOT}/mnt/cdrom/${SUBDIR}/livecd ] then REAL_ROOT="${x}" break @@ -87,7 +88,7 @@ findcdmount() { done if [ "${REAL_ROOT}" != '' ] then - good_msg "CD medium found on ${x}" + good_msg "Media found on ${x}" fi fi } |