loginhsh: enable network by default

bin/loginhsh

@@ -42,11 +42,11 @@ phelp()
 	echog "Extra options:"
 	echog "   -d           print hasher dir only"
 	echog "   -s           do not install stuffs (extra packages)"
-	echog "   -M??         binary repository name (obsoleted)"
-	echog "   -x           allow run X program (obsoleted)"
+	echog "   -n           disable network"
 }
 
-while getopts :chitodvqr:b:p:sxXY opt; do
+SHARENETWORK="1"
+while getopts :chitondvqr:b:p:sXY opt; do
     case $opt in
 	h) phelp; exit 0;;
 	t) TESTMODE=1 ;;
@@ -57,10 +57,10 @@ while getopts :chitodvqr:b:p:sxXY opt; do
 	b) BINARYREPONAME="$OPTARG" ;;
 	r) RUNCOMMAND="$OPTARG" ;;
 	p) HASHERPOSTFIX="$OPTARG" ;;
+	n) SHARENETWORK="" ;;
 	s) SKIPSTUFFS=s ;;
 	X) ALLOWX=-X ;;
 	Y) ALLOWX=-Y ;;
-	x) ALLOWX=-Y ;;
 	v) VERBOSE="-v" ;;
 	o) ROOTER="--rooter" ;;
     +?) echog "$name: options should not be preceded by a '+'." 1>&2; exit 2;;
@@ -117,10 +117,12 @@ if [ ! -d $HASHERDIR ] || [ "$INITIALIZE" = "1" ] ; then
 	docmd $HSH $VERBOSE $HASHERARG --initroot-only $HASHERDIR || fatal "Cannot initialize hasher"
 fi
 
-SHELLHASHERARG="--mountpoints=/proc"
+SHELLHASHERARG="--mountpoints=/proc,/dev/shm"
 
 check_locking
 
+[ -n "$SHARENETWORK" ] && export share_network=1
+
 UTILPKG=''
 
 if [ -n "$QUIETMODE" ] ; then
@@ -165,5 +167,10 @@ if [ -n "$RUNCOMMAND" ] ; then
 	exit
 fi
 
+
+if [ -n "$SHARENETWORK" ] ; then
+	$HSH-run $HASHERDIR --rooter -- sh -c 'cat >/etc/resolv.conf' </etc/resolv.conf
+fi
+
 echog "You are in hasher shell"
 docmd $HSH-shell $HASHERDIR $SHELLHASHERARG $ROOTER --wait-lock --shell

bin/runinhsh

@@ -70,4 +70,4 @@ esac
 HASHERNAME=$(echo "$COMMAND $PACKAGES" | md5sum)
 
 showcmd $ETERBUILDBIN/loginhsh -Y -t -p $HASHERNAME $PLATFORM -r "$COMMAND $OPTIONS" $PACKAGES
-share_network=1 $ETERBUILDBIN/loginhsh -Y -t -p $HASHERNAME $PLATFORM -r "$COMMAND $OPTIONS" $PACKAGES
+$ETERBUILDBIN/loginhsh -Y -t -p $HASHERNAME $PLATFORM -r "$COMMAND $OPTIONS" $PACKAGES