diff options
| author | Josh Paetzel <jpaetzel@FreeBSD.org> | 2011-11-05 19:25:21 +0000 |
|---|---|---|
| committer | Josh Paetzel <jpaetzel@FreeBSD.org> | 2011-11-05 19:25:21 +0000 |
| commit | e4985e44df5b9805d8ad426b3e03b9b8c0d4d200 (patch) | |
| tree | 37fa3690027dda1e75ea7b51dbe4f01eac87e76b /usr.sbin | |
| parent | 4ce04b3d91896495a8252323137e7efed5a41942 (diff) | |
Notes
Diffstat (limited to 'usr.sbin')
4 files changed, 13 insertions, 4 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh b/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh index 5b3069558e39..ba8cccd0c2db 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh @@ -280,7 +280,7 @@ setup_gpart_partitions() if [ "${_pType}" = "gpt" ] ; then get_fs_line_xvars "${_pDisk}p${CURPART}" "${STRING}" else - get_fs_line_xvars "${_wSlice}" "${STRING}" + get_fs_line_xvars "${_wSlice}${PARTLETTER}" "${STRING}" fi XTRAOPTS="${VAR}" diff --git a/usr.sbin/pc-sysinstall/backend/functions-disk.sh b/usr.sbin/pc-sysinstall/backend/functions-disk.sh index 73c3eb4c179f..c3f1b22771a0 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-disk.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-disk.sh @@ -470,7 +470,8 @@ setup_disk_slice() # Default to round-robin if the user didn't specify 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" # Reset DISK to the gmirror device diff --git a/usr.sbin/pc-sysinstall/backend/functions-networking.sh b/usr.sbin/pc-sysinstall/backend/functions-networking.sh index bdd5a1a84c16..6b8cb1e0a940 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-networking.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-networking.sh @@ -431,6 +431,10 @@ start_networking() elif [ "$NETDEV" = "IPv6-SLAAC" ] then enable_auto_slaac + elif [ "$NETDEV" = "AUTO-DHCP-SLAAC" ] + then + enable_auto_dhcp + enable_auto_slaac else enable_manual_nic ${NETDEV} fi @@ -457,6 +461,10 @@ save_networking_install() elif [ "$NETDEV" = "IPv6-SLAAC" ] then save_auto_slaac + elif [ "$NETDEV" = "AUTO-DHCP-SLAAC" ] + then + save_auto_dhcp + save_auto_slaac else save_manual_nic ${NETDEV} fi diff --git a/usr.sbin/pc-sysinstall/backend/functions-unmount.sh b/usr.sbin/pc-sysinstall/backend/functions-unmount.sh index 23630f7674a4..57a417ef6e20 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-unmount.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-unmount.sh @@ -43,7 +43,7 @@ start_gmirror_sync() { cd ${MIRRORCFGDIR} - for DISK in `ls *` + for DISK in `ls ${MIRRORCFGDIR}` do MIRRORDISK="`cat ${DISK} | cut -d ':' -f 1`" MIRRORBAL="`cat ${DISK} | cut -d ':' -f 2`" @@ -51,7 +51,7 @@ start_gmirror_sync() # Start the mirroring service rc_nohalt "gmirror forget ${MIRRORNAME}" - rc_halt "gmirror insert ${MIRRORNAME} /dev/${MIRRORDISK}" + rc_halt "gmirror insert ${MIRRORNAME} ${MIRRORDISK}" done |