Added --bladecenter for slow USB CD on IBM BladeCenter.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@288 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 20 years ago
parent 6d8a9bb8d6
commit b1329967a7

@ -69,6 +69,7 @@ longusage() {
echo " --lvm2 Include LVM2 support" echo " --lvm2 Include LVM2 support"
# echo " --unionfs Include UNIONFS support" # echo " --unionfs Include UNIONFS support"
echo " --dmraid Include DMRAID support" echo " --dmraid Include DMRAID support"
echo " --bladecenter Enables extra pauses for IBM Bladecenter CD boots"
echo " --bootloader=grub Add new kernel to GRUB configuration" echo " --bootloader=grub Add new kernel to GRUB configuration"
echo " --linuxrc=<file> Specifies a user created linuxrc" echo " --linuxrc=<file> Specifies a user created linuxrc"
echo " --disklabel Include disk label and uuid support in your initrd" echo " --disklabel Include disk label and uuid support in your initrd"
@ -201,6 +202,10 @@ parse_cmdline() {
CMD_NO_BUSYBOX=1 CMD_NO_BUSYBOX=1
print_info 2 "CMD_NO_BUSYBOX: $CMD_NO_BUSYBOX" print_info 2 "CMD_NO_BUSYBOX: $CMD_NO_BUSYBOX"
;; ;;
--bladecenter)
CMD_BLADECENTER=1
print_info 2 "CMD_BLADECENTER: $CMD_BLADECENTER"
;;
--dmraid) --dmraid)
CMD_DMRAID=1 CMD_DMRAID=1
print_info 2 "CMD_DMRAID: $CMD_DMRAID" print_info 2 "CMD_DMRAID: $CMD_DMRAID"

@ -387,6 +387,13 @@ determine_real_args() {
else else
BUSYBOX=1 BUSYBOX=1
fi fi
if isTrue "${CMD_BLADECENTER}"
then
BLADECENTER=1
else
BLADECENTER=0
fi
if isTrue "${CMD_DMRAID}" if isTrue "${CMD_DMRAID}"
then then

@ -257,25 +257,27 @@ start_dev_mgr(){
# Check udev is available... # Check udev is available...
if [ "${KV_2_6_OR_GREATER}" -a ! "${USE_UDEV_NORMAL}" -eq '0' -a -x /sbin/udev ] if [ "${KV_2_6_OR_GREATER}" -a ! "${USE_UDEV_NORMAL}" -eq '0' -a -x /sbin/udev ]
then then
USE_UDEV_NORMAL=1 USE_UDEV_NORMAL=1
else else
USE_UDEV_NORMAL=0 USE_UDEV_NORMAL=0
fi fi
if [ "${USE_UDEV_NORMAL}" -eq '1' ] if [ "${USE_UDEV_NORMAL}" -eq '1' ]
then then
cd /sys cd /sys
kill_devfsd [ "${BLADECENTER}" -eq "1" ] && sleep 10
good_msg 'Activating udev' kill_devfsd
runUdev good_msg 'Activating udev'
cd / runUdev
[ "${BLADECENTER}" -eq "1" ] && sleep 20
cd /
else else
if [ ! -e /dev/.devfsd ] if [ ! -e /dev/.devfsd ]
then then
good_msg 'Activating devfs' good_msg 'Activating devfs'
mount -t devfs devfs /dev mount -t devfs devfs /dev
devfsd /dev -np devfsd /dev -np
fi fi
fi fi
} }

@ -539,6 +539,7 @@ then
fi fi
done done
[ "${BLADECENTER}" -eq '1' ] && sleep 10
mkdir initrd proc tmp sys 2>/dev/null mkdir initrd proc tmp sys 2>/dev/null
chmod 1777 tmp chmod 1777 tmp
fi fi
@ -553,6 +554,7 @@ then
# Let Init scripts know that we booted from CD # Let Init scripts know that we booted from CD
export CDBOOT export CDBOOT
CDBOOT=1 CDBOOT=1
[ "${BLADECENTER}" -eq '1' ] && sleep 10
else else
mkdir -p ${NEW_ROOT}/tmp/.initrd mkdir -p ${NEW_ROOT}/tmp/.initrd
fi fi
@ -576,6 +578,7 @@ then
cd ${CHROOT} cd ${CHROOT}
mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null
pivot_root . tmp/.initrd pivot_root . tmp/.initrd
[ "${BLADECENTER}" -eq '1' ] && sleep 10
echo -n '.' echo -n '.'
if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ] if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ]

Loading…
Cancel
Save