diff options
| author | jpaetzel <jpaetzel@FreeBSD.org> | 2011-11-05 19:25:21 +0000 |
|---|---|---|
| committer | jpaetzel <jpaetzel@FreeBSD.org> | 2011-11-05 19:25:21 +0000 |
| commit | 2e79cf338b15afc6e2daa659795d26dbcf78b422 (patch) | |
| tree | 37fa3690027dda1e75ea7b51dbe4f01eac87e76b /usr.sbin/pc-sysinstall/backend/functions-unmount.sh | |
| parent | 4f4798012733e29338d9fc54ff938ec51e669a2e (diff) | |
| download | FreeBSD-src-2e79cf338b15afc6e2daa659795d26dbcf78b422.zip FreeBSD-src-2e79cf338b15afc6e2daa659795d26dbcf78b422.tar.gz | |
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
Diffstat (limited to 'usr.sbin/pc-sysinstall/backend/functions-unmount.sh')
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend/functions-unmount.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-unmount.sh b/usr.sbin/pc-sysinstall/backend/functions-unmount.sh index 23630f7..57a417e 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 |
