# HG changeset patch # User Paul Issott # Date 1332794532 -3600 # Node ID 7ce131de8af61758bc1732eea0b9c0c0c5c2e0e0 # Parent 53a1af07cb88f92621812d3734e977a6b70ca41b Tiny edits diff -r 53a1af07cb88 -r 7ce131de8af6 base-scripts/Makefile.vz --- a/base-scripts/Makefile.vz Thu Mar 01 15:13:33 2012 +0100 +++ b/base-scripts/Makefile.vz Mon Mar 26 21:42:12 2012 +0100 @@ -1,7 +1,7 @@ # Build Slitaz template for OpenVZ # # 2011/01 Eric Joseph-Alexandre - -# Publish under GNU General Public License. +# Published under GNU General Public License. MIRROR+=http://mirror.slitaz.org/iso/ VERSION+=3.0 diff -r 53a1af07cb88 -r 7ce131de8af6 base-scripts/local.sh --- a/base-scripts/local.sh Thu Mar 01 15:13:33 2012 +0100 +++ b/base-scripts/local.sh Mon Mar 26 21:42:12 2012 +0100 @@ -51,6 +51,6 @@ sqlite3 /usr/share/ovz-web-panel/db/production.sqlite3 "insert into hardware_servers(host,auth_key) values('localhost','"$(echo $RAND_KEY)"')" /usr/bin/ruby /usr/share/ovz-web-panel/utils/hw-daemon/hw-daemon.rb start - # Create slitaz-vz will prevent this configs. + # Create slitaz-vz will prevent this config. date > /var/lib/slitaz-vz fi diff -r 53a1af07cb88 -r 7ce131de8af6 base-scripts/setup --- a/base-scripts/setup Thu Mar 01 15:13:33 2012 +0100 +++ b/base-scripts/setup Mon Mar 26 21:42:12 2012 +0100 @@ -142,10 +142,10 @@ until [ $ret -eq 1 ];do $DIALOG --title "$MENU_TITLE" \ --backtitle "$BACKTITLE" --clear \ - --cancel-label "Quitter" \ + --cancel-label "Quit" \ --colors \ --menu "$TAZ_CMD_MSG" 15 50 40\ - "adress" " Network settings" \ + "address" " Network settings" \ "hostname" " Set your hostname" \ 2> $OUT ret=$? @@ -166,8 +166,8 @@ PASSWORD=`$DIALOG --backtitle "$BACKTITLE" --title "Set password" --clear \ --separate-widget "$SEP" \ --insecure --passwordbox "Enter new password for user below: \n\n" 10 50 \ - --title "Confirme password" \ - --insecure --passwordbox "Confirme new password for user below: \n\n" 10 50 2>&1 1>&3` + --title "Confirm password" \ + --insecure --passwordbox "Confirm new password for user below: \n\n" 10 50 2>&1 1>&3` ret=$? exec 3>&- if [ -z "${PASSWORD}" ]; then @@ -176,7 +176,7 @@ PASS1="$(echo $PASSWORD | cut -d ' ' -f1)" PASS2="$(echo $PASSWORD | cut -d ' ' -f2)" if [ "$PASS1" != "$PASS2" ]; then - msg "Passwords don't match.\nNothing change." + msg "Passwords don't match.\nNothing changed." else echo "root:$PASS1" | chpasswd -m fi @@ -192,12 +192,12 @@ until [ $retval -eq 1 ];do $DIALOG --title "$MENU_TITLE" \ --backtitle "$BACKTITLE" --clear \ - --cancel-label "Quitter" \ + --cancel-label "Quit" \ --colors \ --menu "$TAZ_CMD_MSG" 15 50 40\ "keymap" " Keyboard mapping" \ "locale" " Language setting" \ - "network" " Netwok configuration" \ + "network" " Network configuration" \ "password" " Change root password" \ 2> $OUT diff -r 53a1af07cb88 -r 7ce131de8af6 base-scripts/vzconf.sh --- a/base-scripts/vzconf.sh Thu Mar 01 15:13:33 2012 +0100 +++ b/base-scripts/vzconf.sh Mon Mar 26 21:42:12 2012 +0100 @@ -21,7 +21,7 @@ CONFIG_DIR=/var/lib/slitaz-vz -# Get real network device name from stored config if exist. +# Get real network device name from stored config if exists. if [ -f $CONFIG_DIR/network/interfaces ]; then BRIDGE=$(grep ^BRIDGE $CONFIG_DIR/network/interfaces | sed 's/.*"\(.*\)"/\1/') IFACE=$(grep ^INTERFACE $CONFIG_DIR/network/interfaces | sed 's/.*"\(.*\)"/\1/') @@ -29,13 +29,13 @@ BRIDGE=br0 IFACE=$(grep ^INTERFACE /etc/network.conf | sed 's/.*"\(.*\)"/\1/') - # Store interface infos for the next boot in hd mode + # Store interface info for the next boot in hd mode mkdir -p $CONFIG_DIR/network echo "BRIDGE=\"$BRIDGE\"" > $CONFIG_DIR/network/interfaces echo "INTERFACE=\"$IFACE\"" >> $CONFIG_DIR/network/interfaces fi -# Set Brigde configuration +# Set Bridge configuration if [ -x /usr/sbin/brctl ]; then if (/usr/sbin/brctl addbr $BRIDGE); then /sbin/ifconfig $IFACE down