|
Lines 79-84
Link Here
|
| 79 |
CDROOT=1 |
79 |
CDROOT=1 |
| 80 |
CDROOT_DEV=`parse_opt "${x}"` |
80 |
CDROOT_DEV=`parse_opt "${x}"` |
| 81 |
;; |
81 |
;; |
|
|
82 |
usbroot) |
| 83 |
CDROOT=1 |
| 84 |
USBROOT=1 |
| 85 |
;; |
| 86 |
usbroot\=*) |
| 87 |
CDROOT=1 |
| 88 |
USBROOT=1 |
| 89 |
USBROOT_DEV=`parse_opt "${x}"` |
| 90 |
;; |
| 82 |
|
91 |
|
| 83 |
# Start livecd loop and looptype options |
92 |
# Start livecd loop and looptype options |
| 84 |
loop\=*) |
93 |
loop\=*) |
|
Lines 220-225
Link Here
|
| 220 |
good_msg 'Skipping module load; no modules in the initrd!' |
229 |
good_msg 'Skipping module load; no modules in the initrd!' |
| 221 |
fi |
230 |
fi |
| 222 |
|
231 |
|
|
|
232 |
if [ "${USBROOT}" != '0' ] && mount -t usbfs usbfs /proc/bus/usb |
| 233 |
|
| 223 |
# Mount sysfs |
234 |
# Mount sysfs |
| 224 |
mount_sysfs |
235 |
mount_sysfs |
| 225 |
|
236 |
|
|
Lines 608-613
Link Here
|
| 608 |
|
619 |
|
| 609 |
if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ] |
620 |
if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ] |
| 610 |
then |
621 |
then |
|
|
622 |
[ "${USBROOT}" != '0' ] && umount /tmp/.initrd/proc/bus/usb || echo '*: Failed to unmount the initrd /proc/bus/usb!' |
| 611 |
umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!' |
623 |
umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!' |
| 612 |
mount -n --move /tmp/.initrd/dev dev || echo '*: Failed to move over the /dev tree!' |
624 |
mount -n --move /tmp/.initrd/dev dev || echo '*: Failed to move over the /dev tree!' |
| 613 |
rm -rf /tmp/.initrd/dev || echo '*: Failed to remove the initrd /dev!' |
625 |
rm -rf /tmp/.initrd/dev || echo '*: Failed to remove the initrd /dev!' |
|
Lines 619-628
Link Here
|
| 619 |
/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/stderr ] && rm /tmp/.initrd/dev/stderr |
631 |
/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/stderr ] && rm /tmp/.initrd/dev/stderr |
| 620 |
/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/core ] && rm /tmp/.initrd/dev/core |
632 |
/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/core ] && rm /tmp/.initrd/dev/core |
| 621 |
umount /tmp/.initrd/dev || echo '*: Failed to unmount the initrd /dev!' |
633 |
umount /tmp/.initrd/dev || echo '*: Failed to unmount the initrd /dev!' |
|
|
634 |
[ "${USBROOT}" != '0' ] && umount /tmp/.initrd/proc/bus/usb || echo '*: Failed to unmount the initrd /proc/bus/usb!' |
| 622 |
umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!' |
635 |
umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!' |
| 623 |
umount /tmp/.initrd/sys || echo '*: Failed to unmount the initrd /sys!' |
636 |
umount /tmp/.initrd/sys || echo '*: Failed to unmount the initrd /sys!' |
| 624 |
elif /tmp/.initrd/bin/[ "${CDROOT}" -eq '1' ] |
637 |
elif /tmp/.initrd/bin/[ "${CDROOT}" -eq '1' ] |
| 625 |
then |
638 |
then |
|
|
639 |
[ "${USBROOT}" != '0' ] && umount /tmp/.initrd/proc/bus/usb || echo "*: Failed to unmount the initrd /proc/bus/usb!" |
| 626 |
umount /tmp/.initrd/proc || echo "*: Failed to unmount the initrd /proc!" |
640 |
umount /tmp/.initrd/proc || echo "*: Failed to unmount the initrd /proc!" |
| 627 |
umount /dev 2>/dev/null |
641 |
umount /dev 2>/dev/null |
| 628 |
mount -n --move /tmp/.initrd/dev dev 2>/dev/null |
642 |
mount -n --move /tmp/.initrd/dev dev 2>/dev/null |
|
Lines 654-659
Link Here
|
| 654 |
echo -n '.' |
668 |
echo -n '.' |
| 655 |
umount /dev || echo '*: Failed to unmount the initrd /dev!' |
669 |
umount /dev || echo '*: Failed to unmount the initrd /dev!' |
| 656 |
umount /sys || echo '*: Failed to unmount the initrd /sys!' |
670 |
umount /sys || echo '*: Failed to unmount the initrd /sys!' |
|
|
671 |
[ "${USBROOT}" != '0' ] && umount /proc/bus/usb || echo '*: Failed to unmount the initrd /proc/bus/usb!' |
| 657 |
umount /proc || echo '*: Failed to unmount the initrd /proc!' |
672 |
umount /proc || echo '*: Failed to unmount the initrd /proc!' |
| 658 |
echo -n '.' |
673 |
echo -n '.' |
| 659 |
|
674 |
|
