diff options
| author | imp <imp@FreeBSD.org> | 2010-10-09 07:45:24 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-10-09 07:45:24 +0000 |
| commit | 77a8584fd98601764683b95454ea91ac9d1050de (patch) | |
| tree | ed7fdacbcc85d380f75897c2702839a352846069 /usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh | |
| parent | 6dc6856e334aa81abad9a95e6efe87e9d697c7aa (diff) | |
| download | FreeBSD-src-77a8584fd98601764683b95454ea91ac9d1050de.zip FreeBSD-src-77a8584fd98601764683b95454ea91ac9d1050de.tar.gz | |
Enable softupdate + journals support.
PR: 150862
Submitted by: Kris Moore
Diffstat (limited to 'usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh')
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh b/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh index 1604148..04bd0b4 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh @@ -217,7 +217,7 @@ setup_mbr_partitions() # Now check that these values are sane case $FS in - UFS|UFS+S|UFS+J|ZFS|SWAP) ;; + UFS|UFS+S|UFS+J||UFS+SUJ|ZFS|SWAP) ;; *) exit_err "ERROR: Invalid file system specified on $line" ;; esac @@ -261,7 +261,7 @@ setup_mbr_partitions() check_for_mount "${MNT}" "/boot" if [ "${?}" = "0" ] ; then USINGBOOTPART="0" ; export USINGBOOTPART - if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" ] + if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a "${FS}" != "UFS+SUJ" ] then exit_err "/boot partition must be formatted with UFS" fi @@ -401,7 +401,7 @@ setup_gpt_partitions() # Now check that these values are sane case $FS in - UFS|UFS+S|UFS+J|ZFS|SWAP) ;; + UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP) ;; *) exit_err "ERROR: Invalid file system specified on $line" ;; esac @@ -438,7 +438,7 @@ setup_gpt_partitions() if [ "${?}" = "0" ] ; then if [ "${CURPART}" = "2" ] ; then USINGBOOTPART="0" ; export USINGBOOTPART - if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" ] + if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a "${FS}" != "UFS+SUJ" ] then exit_err "/boot partition must be formatted with UFS" fi |
