/[baselayout]/branches/rc-scripts-1_6/sbin/rc
Gentoo

Diff of /branches/rc-scripts-1_6/sbin/rc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 775 Revision 776
134 echo 134 echo
135 135
136 check_statedir /proc 136 check_statedir /proc
137 137
138 ebegin "Mounting proc at /proc" 138 ebegin "Mounting proc at /proc"
139 if [[ ${RC_USE_FSTAB} = "yes" ]]
140 then
139 mntcmd=$( get_mount_fstab /proc ) 141 mntcmd=$(get_mount_fstab /proc)
142 else
143 unset mntcmd
144 fi
140 mntcmd=${mntcmd:--t proc none /proc} 145 try mount -n ${mntcmd:--t proc none /proc}
141 try mount -n ${mntcmd}
142 eend $? 146 eend $?
143 147
144 # Read off the kernel commandline to see if there's any special settings 148 # Read off the kernel commandline to see if there's any special settings
145 # especially check to see if we need to set the CDBOOT environment variable 149 # especially check to see if we need to set the CDBOOT environment variable
146 # Note: /proc MUST be mounted 150 # Note: /proc MUST be mounted
149 if [ "$(get_KV)" -ge "$(KV_to_int '2.6.0')" ] 153 if [ "$(get_KV)" -ge "$(KV_to_int '2.6.0')" ]
150 then 154 then
151 if [ -d /sys ] 155 if [ -d /sys ]
152 then 156 then
153 ebegin "Mounting sysfs at /sys" 157 ebegin "Mounting sysfs at /sys"
158 if [[ ${RC_USE_FSTAB} = "yes" ]]
159 then
154 mntcmd=$( get_mount_fstab /sys ) 160 mntcmd=$(get_mount_fstab /sys)
161 else
162 unset mntcmd
163 fi
155 mntcmd=${mntcmd:--t sysfs none /sys} 164 try mount -n ${mntcmd:--t sysfs none /sys}
156 try mount -n ${mntcmd}
157 eend $? 165 eend $?
158 else 166 else
159 ewarn "No /sys to mount sysfs needed in 2.6 and later kernels!" 167 ewarn "No /sys to mount sysfs needed in 2.6 and later kernels!"
160 fi 168 fi
161 fi 169 fi
222 # Actually start setting up /dev now 230 # Actually start setting up /dev now
223 if [ "${udev}" = "yes" ] 231 if [ "${udev}" = "yes" ]
224 then 232 then
225 # Setup temporary storage for /dev 233 # Setup temporary storage for /dev
226 ebegin "Mounting /dev for udev" 234 ebegin "Mounting /dev for udev"
235 if [[ ${RC_USE_FSTAB} = "yes" ]]
236 then
227 mntcmd=$( get_mount_fstab /dev ) 237 mntcmd=$(get_mount_fstab /dev)
238 else
239 unset mntcmd
240 fi
228 if [ -n "${mntcmd}" ] 241 if [[ -n ${mntcmd} ]]
229 then 242 then
230 try mount -n ${mntcmd} 243 try mount -n ${mntcmd}
231 else 244 else
232 if egrep -qs tmpfs /proc/filesystems ; then 245 if egrep -qs tmpfs /proc/filesystems ; then
233 try mount -n -t tmpfs none /dev 246 try mount -n -t tmpfs none /dev
328 fi 341 fi
329 342
330 if [ -d /dev/pts ] 343 if [ -d /dev/pts ]
331 then 344 then
332 ebegin "Mounting devpts at /dev/pts" 345 ebegin "Mounting devpts at /dev/pts"
346 if [[ ${RC_USE_FSTAB} = "yes" ]]
347 then
333 mntcmd=$( get_mount_fstab /dev/pts ) 348 mntcmd=$(get_mount_fstab /dev/pts)
349 else
350 unset mntcmd
351 fi
334 mntcmd=${mntcmd:--t devpts -o gid=5,mode=0620 none /dev/pts} 352 try mount -n ${mntcmd:--t devpts -o gid=5,mode=0620 none /dev/pts}
335 try mount -n ${mntcmd}
336 eend $? 353 eend $?
337 fi 354 fi
338 fi 355 fi
339 fi 356 fi
340 357

Legend:
Removed from v.775  
changed lines
  Added in v.776

  ViewVC Help
Powered by ViewVC 1.1.20