Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow using iso images on usb media #82

Draft
wants to merge 1 commit into
base: oi/hipster
Choose a base branch
from
Draft

allow using iso images on usb media #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions usr/src/cmd/slim-install/svc/media-fs-root
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
# Make sure that the libraries essential to this stage of booting can be found.
LD_LIBRARY_PATH=/lib; export LD_LIBRARY_PATH

builtin grep
builtin rm

#
Expand Down Expand Up @@ -71,18 +70,14 @@ fi
# For devices that do, attempt to mount them to see if the
# compressed /usr filesystem exists

PTYP=`/sbin/uname -p`
if [ $PTYP = "sparc" ]; then
FSTYP=hsfs
OPTIONS="ro"
else
FSTYP=ufs
OPTIONS="nologging,noatime"
fi
OPTIONS="ro,nologging,noatime"

/sbin/listusb | while read dev rdev
do
/usr/lib/fs/${FSTYP}/fstyp $rdev 2>&1 | grep "^${FSTYP}$"
FSTYP=$(/usr/lib/fs/hsfs/fstyp $rdev 2>/dev/null)
if [ X$FSTYP != "Xhsfs" ]; then
FSTYP=$(/usr/lib/fs/ufs/fstyp $rdev 2>/dev/null)
fi
if [ $? -eq 0 ]; then
$MOUNT -F $FSTYP -o $OPTIONS $dev /.cdrom || break
if [[ "$volsetid" != "$( < "/.cdrom/.volsetid" )" ]]; then
Expand Down