diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2009-04-06 15:25:11 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2009-04-06 15:25:11 +0000 |
| commit | 278851ba43f3f308d46835891e701e833c69aa11 (patch) | |
| tree | 2fda15641270075c8621728bd4cc7281153cdc25 /usr.sbin/sysmerge/sysmerge.sh | |
| parent | adf7d340ce72d3dacfa488d391aae215daa70082 (diff) | |
Fix regression introduced in r1.32 where after running MAKEDEV sysmerge
would stop comparing files.
breakage reported by and ok naddy@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.sh')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 6e4117714ca..49500116ea9 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.33 2009/04/06 10:35:20 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.34 2009/04/06 15:25:10 ajacoutot Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton <DougB@FreeBSD.org> @@ -241,7 +241,7 @@ mm_install() { /dev/MAKEDEV) echo -n "===> A new ${DESTDIR}/dev/MAKEDEV script was installed, " echo "MAKEDEV will be run" - cd ${DESTDIR}/dev && /bin/sh MAKEDEV all + (cd ${DESTDIR}/dev && /bin/sh MAKEDEV all) ;; /etc/login.conf) if [ -f ${DESTDIR}/etc/login.conf.db ]; then |