Skip to content

Consistently use the native illumos "file" command (r151054) #516

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

Merged
merged 1 commit into from
Jun 26, 2025
Merged

Consistently use the native illumos "file" command (r151054) #516

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
11 changes: 3 additions & 8 deletions src/brand/shared/image.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function seed_zone {
else
# If the input file is compressed, extract the first portion
# to determine its type.
typeset type=`file -b "$seedsrc"`
typeset type=`/usr/has/bin/file -b "$seedsrc"`
typeset filter
case "$type" in
ZFS*) filter='cat' ;;
Expand All @@ -91,12 +91,7 @@ function seed_zone {
whence -fp pbzip2 >/dev/null && \
filter='pbzip2 -dc'
;;
Zstandard*) filter='zstd -dc'
whence -fp zstd >/dev/null || \
fatal "Cannot uncompress %s - %s" \
"$type" \
"no 'zstd' command found on system."
;;
Zstandard*) filter='zstd -dc' ;;
*\ tar\ *) filter='cat' ;;
*)
fatal "Seed file %s not in a supported format (%s)" \
Expand All @@ -109,7 +104,7 @@ function seed_zone {

typeset tf=`mktemp`
$filter "$seedsrc" | dd of="$tf" bs=1024 count=1024
typeset type=`file -b "$tf"`
typeset type=`/usr/has/bin/file -b "$tf"`
rm -f "$tf"

log "Underlying file type is '%s'" "$type"
Expand Down