diff options
| -rwxr-xr-x | bootstrap/bootstrap | 6 | ||||
| -rw-r--r-- | mk/platform/Cygwin.mk | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 01b0e23315e..554ca279d4f 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.189 2013/02/20 12:44:14 obache Exp $ +# $NetBSD: bootstrap,v 1.190 2013/02/22 13:39:31 obache Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -474,8 +474,8 @@ CYGWIN_*) fi return 1 } - root_user=`id -u` - root_group=`id -g Administrators` + root_user=Administrators + root_group=Administrators need_bsd_install=no opsys=`uname -o` need_awk=no diff --git a/mk/platform/Cygwin.mk b/mk/platform/Cygwin.mk index ae24bfc7e54..1836b8158c5 100644 --- a/mk/platform/Cygwin.mk +++ b/mk/platform/Cygwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Cygwin.mk,v 1.5 2013/02/21 11:19:27 obache Exp $ +# $NetBSD: Cygwin.mk,v 1.6 2013/02/22 13:39:31 obache Exp $ # # Variable definitions for the Windows with Cygwin. @@ -54,7 +54,8 @@ PKGDIRMODE?= 775 # ROOT_USER might be numeric in the special case of Administrator; canonify it: ROOT_CMD?= ${SU} - "$$(${ID} -un ${ROOT_USER})" -c ROOT_USER?= ${BINOWN} -ROOT_GROUP?= ${:!${ID} -g Administrators!} +ROOT_GROUP?= Administrators +_IS_ROOT_CMD?= ( ${ID} -nG | ${GREP} -q 'Administrators' ) TOUCH_FLAGS?= ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` |