From owner-svn-soc-all@FreeBSD.ORG Sun Jun 22 21:03:11 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 285D4D20 for ; Sun, 22 Jun 2014 21:03:11 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EFD0625F0 for ; Sun, 22 Jun 2014 21:03:10 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5ML3AOW003976 for ; Sun, 22 Jun 2014 21:03:10 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5ML393v003569 for svn-soc-all@FreeBSD.org; Sun, 22 Jun 2014 21:03:09 GMT (envelope-from kczekirda@FreeBSD.org) Date: Sun, 22 Jun 2014 21:03:09 GMT Message-Id: <201406222103.s5ML393v003569@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r269883 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts others tools/mfsbsd/customfiles/etc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2014 21:03:11 -0000 Author: kczekirda Date: Sun Jun 22 21:03:09 2014 New Revision: 269883 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269883 Log: users Added: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/etc/usersconfig Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script soc2014/kczekirda/pxe-fai-head/others/template.input Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script ============================================================================== --- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Sun Jun 22 21:03:02 2014 (r269882) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Sun Jun 22 21:03:09 2014 (r269883) @@ -78,6 +78,7 @@ # DNS2V6 # ROOTPWHASH +# USERSCONFIG ############################################################ GLOBALS @@ -176,6 +177,14 @@ echo "echo '$ROOTPWHASH' | pw user mod root -H 0" >> /tmp/bsdinstall-installscript-ab fi +# Users +if [ -n "$USERSCONFIG" ]; then + if [ ! -f /tmp/bsdinstall-installscript-ab ]; then + echo "#!/bin/sh" > /tmp/bsdinstall-installscript-ab + fi + echo "adduser -f $USERSCONFIG" >> /tmp/bsdinstall-installscript-ab +fi + # Make partitions rm -f $PATH_FSTAB touch $PATH_FSTAB Modified: soc2014/kczekirda/pxe-fai-head/others/template.input ============================================================================== --- soc2014/kczekirda/pxe-fai-head/others/template.input Sun Jun 22 21:03:02 2014 (r269882) +++ soc2014/kczekirda/pxe-fai-head/others/template.input Sun Jun 22 21:03:09 2014 (r269883) @@ -24,6 +24,7 @@ #DNS1V6="2001:4860:4860::8888" #DNS2V6="2001:4860:4860::8844" ROOTPWHASH='$6$Qb2inVrU65.r4Dx5$DaHdU2P1ipFMLZ8J5xJk8DDtC88rE87qo7du6CBvNgyit8RezQ2qkPe83X4KgTCTEtXGrMaMKZ1.W4xg1yz0z/' +USERS="/etc/usersconfig" #!/bin/sh echo "Installation complete, running in host system" Added: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/etc/usersconfig ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/etc/usersconfig Sun Jun 22 21:03:09 2014 (r269883) @@ -0,0 +1 @@ +test::::::Test User::/bin/csh:$6$1600DQdexR3/w33x$co/QX4V85F1Nqv/wlpV2LKX45t/dwrTAPeWVv2RkZ9hNHpySvYudkOe3iTuhwWjpk5svHrmu4zAQqqh0JO8tl/