slitaz-vz rev 5

Tiny edits
author Paul Issott <paul@slitaz.org>
date Mon Mar 26 21:42:12 2012 +0100 (2012-03-26)
parents 53a1af07cb88
children d8fc6f00bb20
files base-scripts/Makefile.vz base-scripts/local.sh base-scripts/setup base-scripts/vzconf.sh
line diff
     1.1 --- a/base-scripts/Makefile.vz	Thu Mar 01 15:13:33 2012 +0100
     1.2 +++ b/base-scripts/Makefile.vz	Mon Mar 26 21:42:12 2012 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # Build Slitaz template for OpenVZ
     1.5  #
     1.6  # 2011/01 Eric Joseph-Alexandre <erjo@slitaz.org> - 
     1.7 -# Publish under GNU General Public License.
     1.8 +# Published under GNU General Public License.
     1.9  
    1.10  MIRROR+=http://mirror.slitaz.org/iso/
    1.11  VERSION+=3.0
     2.1 --- a/base-scripts/local.sh	Thu Mar 01 15:13:33 2012 +0100
     2.2 +++ b/base-scripts/local.sh	Mon Mar 26 21:42:12 2012 +0100
     2.3 @@ -51,6 +51,6 @@
     2.4          sqlite3  /usr/share/ovz-web-panel/db/production.sqlite3 "insert into hardware_servers(host,auth_key) values('localhost','"$(echo $RAND_KEY)"')"      
     2.5          /usr/bin/ruby /usr/share/ovz-web-panel/utils/hw-daemon/hw-daemon.rb start 
     2.6  	
     2.7 -	# Create slitaz-vz will prevent this configs. 
     2.8 +	# Create slitaz-vz will prevent this config. 
     2.9  	date > /var/lib/slitaz-vz
    2.10  fi
     3.1 --- a/base-scripts/setup	Thu Mar 01 15:13:33 2012 +0100
     3.2 +++ b/base-scripts/setup	Mon Mar 26 21:42:12 2012 +0100
     3.3 @@ -142,10 +142,10 @@
     3.4   	until [ $ret -eq 1 ];do
     3.5      	$DIALOG --title "$MENU_TITLE" \
     3.6          	--backtitle "$BACKTITLE" --clear \
     3.7 -        	--cancel-label "Quitter" \
     3.8 +        	--cancel-label "Quit" \
     3.9          	--colors \
    3.10          	--menu "$TAZ_CMD_MSG" 15 50 40\
    3.11 -        	"adress"  	"  Network settings" \
    3.12 +        	"address"  	"  Network settings" \
    3.13          	"hostname"  	"  Set your hostname" \
    3.14          	2> $OUT
    3.15      	ret=$?
    3.16 @@ -166,8 +166,8 @@
    3.17  	PASSWORD=`$DIALOG --backtitle "$BACKTITLE" --title "Set password" --clear \
    3.18   		--separate-widget "$SEP" \
    3.19   		--insecure --passwordbox "Enter new password for user below: \n\n" 10 50 \
    3.20 -		--title "Confirme password" \
    3.21 -        --insecure --passwordbox "Confirme new password for user below: \n\n"	10 50 2>&1 1>&3`
    3.22 +		--title "Confirm password" \
    3.23 +        --insecure --passwordbox "Confirm new password for user below: \n\n"	10 50 2>&1 1>&3`
    3.24  	ret=$?
    3.25  	exec 3>&-
    3.26  	if [ -z "${PASSWORD}" ]; then
    3.27 @@ -176,7 +176,7 @@
    3.28  		PASS1="$(echo $PASSWORD | cut -d ' ' -f1)"
    3.29  		PASS2="$(echo $PASSWORD | cut -d ' ' -f2)"
    3.30  		if [ "$PASS1" != "$PASS2" ]; then
    3.31 -			msg "Passwords don't match.\nNothing change."
    3.32 +			msg "Passwords don't match.\nNothing changed."
    3.33  		else
    3.34  			echo  "root:$PASS1" | chpasswd -m
    3.35  		fi
    3.36 @@ -192,12 +192,12 @@
    3.37  until [ $retval -eq 1 ];do
    3.38  	$DIALOG --title "$MENU_TITLE" \
    3.39  		--backtitle "$BACKTITLE" --clear \
    3.40 -		--cancel-label "Quitter" \
    3.41 +		--cancel-label "Quit" \
    3.42  		--colors \
    3.43  		--menu "$TAZ_CMD_MSG" 15 50 40\
    3.44  		"keymap"  		"  Keyboard mapping" \
    3.45  		"locale"      	"  Language setting" \
    3.46 -		"network"   	"  Netwok configuration" \
    3.47 +		"network"   	"  Network configuration" \
    3.48  		"password" 		"  Change root password" \
    3.49  		2> $OUT
    3.50  	
     4.1 --- a/base-scripts/vzconf.sh	Thu Mar 01 15:13:33 2012 +0100
     4.2 +++ b/base-scripts/vzconf.sh	Mon Mar 26 21:42:12 2012 +0100
     4.3 @@ -21,7 +21,7 @@
     4.4  
     4.5  CONFIG_DIR=/var/lib/slitaz-vz
     4.6  
     4.7 -# Get real network device name from stored config if exist. 
     4.8 +# Get real network device name from stored config if exists. 
     4.9  if [ -f $CONFIG_DIR/network/interfaces ]; then
    4.10  	BRIDGE=$(grep ^BRIDGE $CONFIG_DIR/network/interfaces | sed 's/.*"\(.*\)"/\1/')
    4.11  	IFACE=$(grep ^INTERFACE $CONFIG_DIR/network/interfaces | sed 's/.*"\(.*\)"/\1/')
    4.12 @@ -29,13 +29,13 @@
    4.13  	BRIDGE=br0
    4.14  	IFACE=$(grep ^INTERFACE /etc/network.conf | sed 's/.*"\(.*\)"/\1/')
    4.15  	
    4.16 -	# Store interface infos for the next boot in hd mode
    4.17 +	# Store interface info for the next boot in hd mode
    4.18  	mkdir -p $CONFIG_DIR/network
    4.19  	echo "BRIDGE=\"$BRIDGE\"" > $CONFIG_DIR/network/interfaces
    4.20  	echo "INTERFACE=\"$IFACE\"" >> $CONFIG_DIR/network/interfaces
    4.21  fi
    4.22  
    4.23 -# Set Brigde configuration
    4.24 +# Set Bridge configuration
    4.25  if [ -x /usr/sbin/brctl ]; then
    4.26  	if (/usr/sbin/brctl addbr $BRIDGE); then
    4.27  		/sbin/ifconfig $IFACE down