View | Details | Raw Unified
Collapse All | Expand All

(-) genkernel/trunk/generic/initrd.defaults (+1 lines)
 Lines 76-81    Link Here  
CDROOT_TYPE='iso9660'
CDROOT_TYPE='iso9660'
NEW_ROOT="/newroot"
NEW_ROOT="/newroot"
CONSOLE="/dev/console"
CONSOLE="/dev/console"
CRYPT_SILENT=0
 

        
# Only sections that are in by default or those that
# Only sections that are in by default or those that

        
# are not module groups need to be defined here...
# are not module groups need to be defined here...



(-) genkernel/trunk/generic/initrd.scripts
      (-10 / +11 lines)




  

    

    

       Lines 74-84
       
    
  Link Here 
    

  

        
	# $2 = recognition file
	# $2 = recognition file

        
	# $3 = variable to have the device path
	# $3 = variable to have the device path

        
	# $4 = directory before /mnt, like NEW_ROOT
	# $4 = directory before /mnt, like NEW_ROOT

            

              
              
        # $5 = mount type for devices

            

        
	# args remaining are possible devices 
	# args remaining are possible devices 

        

            

              
	local media=$1 recon=$2 vrbl=$3

              
	(( $# < 6 )) && \

            

            

              

              
                bad_msg "Bad invocation of function findmediamount, please file a bug \

            

            

              

              
                report with this message" && exit 1

            

            

              

              

            

            

              

              
	local media=$1 recon=$2 vrbl=$3 mnttype=$5

            

        
	local mntdir="${4}/mnt/${media}"
	local mntdir="${4}/mnt/${media}"

            

              
	shift 4

              
	shift 5

            

        

        
	good_msg "Looking for the ${media}" ${CRYPT_SILENT}
	good_msg "Looking for the ${media}" ${CRYPT_SILENT}

        

  

    

    

       Lines 94-105
       
    
  Link Here 
    

  

        
			then
			then

        
				good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT}
				good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT}

        

            

              
#				if [ "${media}" = "cdrom" ]; then

              
				mount -r -t ${mnttype} ${x} ${mntdir} >/dev/null 2>&1

            

            

              
#					mount -r -t iso9660 ${x} ${mntdir} &>/dev/null

              
				

            

            

              
#				else

              

            

            

              
#					mount -r -t auto ${x} ${mntdir} &>/dev/null

              

            

            

              
#				fi

              

            

            

              
				mount -r -t ${CDROOT_TYPE} ${x} ${mntdir} &>/dev/null

              

            

        
				if [ "$?" = '0' ]
				if [ "$?" = '0' ]

        
				then
				then

        
					# Check for the media
					# Check for the media

  

    

    

       Lines 143-149
       
    
  Link Here 
    

  

        
	# a bunch of extra devices
	# a bunch of extra devices

        
	[ -n "${CDROOT_DEV}" ] && DEVICES="${CDROOT_DEV}"
	[ -n "${CDROOT_DEV}" ] && DEVICES="${CDROOT_DEV}"

        

            

              
	findmediamount "cdrom" "${SUBDIR}/livecd" "REAL_ROOT" "${NEW_ROOT}" ${DEVICES}

              
	findmediamount "cdrom" "${SUBDIR}/livecd" "REAL_ROOT" "${NEW_ROOT}" "${CDROOT_TYPE}" ${DEVICES}

            

        
}
}

        

        
bootstrapKey() {
bootstrapKey() {

  

    

    

       Lines 151-157
       
    
  Link Here 
    

  

        
	local KEYDEVS=`devicelist`
	local KEYDEVS=`devicelist`

        
	eval local keyloc='"${CRYPT_'${1}'_KEY}"'
	eval local keyloc='"${CRYPT_'${1}'_KEY}"'

        

            

              
	findmediamount "key" "${keyloc}" "CRYPT_${1}_KEYDEV" "" ${KEYDEVS}

              
	findmediamount "key" "${keyloc}" "CRYPT_${1}_KEYDEV" "" "auto" ${KEYDEVS}

            

        
}
}

        

        
cache_cd_contents() {
cache_cd_contents() {



(-) genkernel/trunk/generic/linuxrc
      (-1 lines)




  

    

    

       Lines 44-50
       
    
  Link Here 
    

  

        
REAL_ROOT=''
REAL_ROOT=''

        
FAKE_ROOT=''
FAKE_ROOT=''

        
REAL_ROOTFLAGS=''
REAL_ROOTFLAGS=''

            

              
CRYPT_SILENT=0

              
            

        
for x in ${CMDLINE}
for x in ${CMDLINE}

        
do
do

        
	case "${x}" in
	case "${x}" in