Roll up several patches used by PC-BSD.
- Fix an issue with gmirror. - Allow IPv4 DHCP and IPv6 SLAAC concurrently. - Fix zpool options using the wrong device name. Approved by: kib (mentor) Obtained from: kris@pcbsd.org MFC after: 3 days
This commit is contained in:
parent
4ce04b3d91
commit
e4985e44df
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=227118
@ -280,7 +280,7 @@ setup_gpart_partitions()
|
|||||||
if [ "${_pType}" = "gpt" ] ; then
|
if [ "${_pType}" = "gpt" ] ; then
|
||||||
get_fs_line_xvars "${_pDisk}p${CURPART}" "${STRING}"
|
get_fs_line_xvars "${_pDisk}p${CURPART}" "${STRING}"
|
||||||
else
|
else
|
||||||
get_fs_line_xvars "${_wSlice}" "${STRING}"
|
get_fs_line_xvars "${_wSlice}${PARTLETTER}" "${STRING}"
|
||||||
fi
|
fi
|
||||||
XTRAOPTS="${VAR}"
|
XTRAOPTS="${VAR}"
|
||||||
|
|
||||||
|
@ -470,7 +470,8 @@ setup_disk_slice()
|
|||||||
# Default to round-robin if the user didn't specify
|
# Default to round-robin if the user didn't specify
|
||||||
if [ -z "$MIRRORBAL" ]; then MIRRORBAL="round-robin" ; fi
|
if [ -z "$MIRRORBAL" ]; then MIRRORBAL="round-robin" ; fi
|
||||||
|
|
||||||
echo "$MIRRORDISK:$MIRRORBAL:gm${gmnum}" >${MIRRORCFGDIR}/$DISK
|
_mFile=`echo $DISK | sed 's|/|%|g'`
|
||||||
|
echo "$MIRRORDISK:$MIRRORBAL:gm${gmnum}" >${MIRRORCFGDIR}/$_mFile
|
||||||
init_gmirror "$gmnum" "$MIRRORBAL" "$DISK" "$MIRRORDISK"
|
init_gmirror "$gmnum" "$MIRRORBAL" "$DISK" "$MIRRORDISK"
|
||||||
|
|
||||||
# Reset DISK to the gmirror device
|
# Reset DISK to the gmirror device
|
||||||
|
@ -431,6 +431,10 @@ start_networking()
|
|||||||
elif [ "$NETDEV" = "IPv6-SLAAC" ]
|
elif [ "$NETDEV" = "IPv6-SLAAC" ]
|
||||||
then
|
then
|
||||||
enable_auto_slaac
|
enable_auto_slaac
|
||||||
|
elif [ "$NETDEV" = "AUTO-DHCP-SLAAC" ]
|
||||||
|
then
|
||||||
|
enable_auto_dhcp
|
||||||
|
enable_auto_slaac
|
||||||
else
|
else
|
||||||
enable_manual_nic ${NETDEV}
|
enable_manual_nic ${NETDEV}
|
||||||
fi
|
fi
|
||||||
@ -457,6 +461,10 @@ save_networking_install()
|
|||||||
elif [ "$NETDEV" = "IPv6-SLAAC" ]
|
elif [ "$NETDEV" = "IPv6-SLAAC" ]
|
||||||
then
|
then
|
||||||
save_auto_slaac
|
save_auto_slaac
|
||||||
|
elif [ "$NETDEV" = "AUTO-DHCP-SLAAC" ]
|
||||||
|
then
|
||||||
|
save_auto_dhcp
|
||||||
|
save_auto_slaac
|
||||||
else
|
else
|
||||||
save_manual_nic ${NETDEV}
|
save_manual_nic ${NETDEV}
|
||||||
fi
|
fi
|
||||||
|
@ -43,7 +43,7 @@ start_gmirror_sync()
|
|||||||
{
|
{
|
||||||
|
|
||||||
cd ${MIRRORCFGDIR}
|
cd ${MIRRORCFGDIR}
|
||||||
for DISK in `ls *`
|
for DISK in `ls ${MIRRORCFGDIR}`
|
||||||
do
|
do
|
||||||
MIRRORDISK="`cat ${DISK} | cut -d ':' -f 1`"
|
MIRRORDISK="`cat ${DISK} | cut -d ':' -f 1`"
|
||||||
MIRRORBAL="`cat ${DISK} | cut -d ':' -f 2`"
|
MIRRORBAL="`cat ${DISK} | cut -d ':' -f 2`"
|
||||||
@ -51,7 +51,7 @@ start_gmirror_sync()
|
|||||||
|
|
||||||
# Start the mirroring service
|
# Start the mirroring service
|
||||||
rc_nohalt "gmirror forget ${MIRRORNAME}"
|
rc_nohalt "gmirror forget ${MIRRORNAME}"
|
||||||
rc_halt "gmirror insert ${MIRRORNAME} /dev/${MIRRORDISK}"
|
rc_halt "gmirror insert ${MIRRORNAME} ${MIRRORDISK}"
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user