Page MenuHomeFreeBSD
Files F139447445

D32936.id111960.diff
No OneTemporary
Actions

D32936.id111960.diff
View Options

diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -1079,9 +1079,18 @@
/dev/$disk${swappart}.eli none swap sw 0 0 \
$BSDINSTALL_TMPETC/fstab || return $FAILURE
else
- f_eval_catch $funcname printf "$PRINTF_FSTAB" \
- /dev/$disk$swappart none swap sw 0 0 \
- $BSDINSTALL_TMPETC/fstab || return $FAILURE
+ case "$ZFSBOOT_PARTITION_SCHEME" in
+ GPT*)
+ f_eval_catch $funcname printf "$PRINTF_FSTAB" \
+ /dev/gpt/swap$index none swap sw 0 0 \
+ $BSDINSTALL_TMPETC/fstab || return $FAILURE
+ ;;
+ *)
+ f_eval_catch $funcname printf "$PRINTF_FSTAB" \
+ /dev/$disk$swappart none swap sw 0 0 \
+ $BSDINSTALL_TMPETC/fstab || return $FAILURE
+ ;;
+ esac
fi
return $SUCCESS

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 13, 4:53 AM (17 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26922045
Default Alt Text
D32936.id111960.diff (1 KB)

Event Timeline