diff options
| author | tv <tv@pkgsrc.org> | 2004-03-11 17:29:11 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-03-11 17:29:11 +0000 |
| commit | cee9b8562cbefd533b74200516bf41065cebf6c9 (patch) | |
| tree | 7bac9839cc0f44034f4a509e98a9c2decdabc063 /bootstrap | |
| parent | ee0078c4a4bd562f3f736772cc920465be8e3ffb (diff) | |
| download | pkgsrc-cee9b8562cbefd533b74200516bf41065cebf6c9.tar.gz | |
Parameterize the root user, and provide an alternative implementation
of the is_root() function for Interix only.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 21 | ||||
| -rw-r--r-- | bootstrap/mods/mk/bsd.own.mk.in | 16 |
2 files changed, 24 insertions, 13 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 2370f4af12b..15f2663c170 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.2 2004/03/11 13:08:06 grant Exp $ +# $NetBSD: bootstrap,v 1.3 2004/03/11 17:29:11 tv Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -172,6 +172,7 @@ echo_msg "bootstrap command: $0 $@" echo_msg "bootstrap started: $build_start" overpath="" +root_user=root case "$opsys" in Darwin) root_group=wheel @@ -274,7 +275,13 @@ AIX) set_opsys=no ;; Interix) - ignoreusercheck=yes + is_root () { + if id -Gn | grep -q +Administrators; then + return 1 + fi + return 0 + } + root_user=`id -un` root_group=+Administrators need_pax=no need_mtree=yes @@ -335,7 +342,7 @@ done is_root if [ $? = 1 ]; then - user=root + user=$root_user group=$root_group else if [ $ignoreusercheck = "no" ]; then @@ -429,10 +436,14 @@ if [ -f mods/mk/$opsys.bsd.man.mk ] ; then run_cmd "$cpprog mods/mk/$opsys.bsd.man.mk $prefix/share/mk/bsd.man.mk" fi -if [ -f mods/mk/$opsys.bsd.prog.mk ] ; then +if [ -f mods/mk/$opsys.bsd.own.mk ] ; then run_cmd "$cpprog mods/mk/$opsys.bsd.own.mk $prefix/share/mk/bsd.own.mk" else - run_cmd "$sedprog -e 's|@ROOT_GROUP@|'$root_group'|g' mods/mk/bsd.own.mk.in > $prefix/share/mk/bsd.own.mk" + run_cmd "$sedprog -e 's|@ROOT_GROUP@|'$root_group'|g;s|@ROOT_USER@|'$root_user'|g' mods/mk/bsd.own.mk.in > $prefix/share/mk/bsd.own.mk" +fi + +if [ -f mods/mk/$opsys.bsd.prog.mk ] ; then + run_cmd "$cpprog mods/mk/$opsys.bsd.prog.mk $prefix/share/mk/bsd.prog.mk" fi if [ -f mods/mk/$opsys.bsd.sys.mk ]; then diff --git a/bootstrap/mods/mk/bsd.own.mk.in b/bootstrap/mods/mk/bsd.own.mk.in index 22d1f185e6d..17f4ab76bd7 100644 --- a/bootstrap/mods/mk/bsd.own.mk.in +++ b/bootstrap/mods/mk/bsd.own.mk.in @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk.in,v 1.1.1.1 2004/03/11 13:04:00 grant Exp $ +# $NetBSD: bsd.own.mk.in,v 1.2 2004/03/11 17:29:11 tv Exp $ .if !defined(_BSD_OWN_MK_) _BSD_OWN_MK_=1 @@ -18,7 +18,7 @@ BSDSRCDIR?= /usr/src BSDOBJDIR?= /usr/obj BINGRP?= @ROOT_GROUP@ -BINOWN?= root +BINOWN?= @ROOT_USER@ BINMODE?= 555 NONBINMODE?= 444 @@ -27,13 +27,13 @@ NONBINMODE?= 444 MANDIR?= /usr/share/man MANGRP?= @ROOT_GROUP@ -MANOWN?= root +MANOWN?= @ROOT_USER@ MANMODE?= ${NONBINMODE} MANINSTALL?= maninstall catinstall INFODIR?= /usr/share/info INFOGRP?= @ROOT_GROUP@ -INFOOWN?= root +INFOOWN?= @ROOT_USER@ INFOMODE?= ${NONBINMODE} LIBDIR?= /usr/lib @@ -45,22 +45,22 @@ LIBMODE?= ${NONBINMODE} DOCDIR?= /usr/share/doc HTMLDOCDIR?= /usr/share/doc/html DOCGRP?= @ROOT_GROUP@ -DOCOWN?= root +DOCOWN?= @ROOT_USER@ DOCMODE?= ${NONBINMODE} NLSDIR?= /usr/share/nls NLSGRP?= @ROOT_GROUP@ -NLSOWN?= root +NLSOWN?= @ROOT_USER@ NLSMODE?= ${NONBINMODE} KMODDIR?= /usr/lkm KMODGRP?= @ROOT_GROUP@ -KMODOWN?= root +KMODOWN?= @ROOT_USER@ KMODMODE?= ${NONBINMODE} LOCALEDIR?= /usr/share/locale LOCALEGRP?= @ROOT_GROUP@ -LOCALEOWN?= root +LOCALEOWN?= @ROOT_USER@ LOCALEMODE?= ${NONBINMODE} COPY?= -c |