diff options
author | Rick Balocca <rbalocca@vyatta.com> | 2008-10-30 14:44:57 -0700 |
---|---|---|
committer | Rick Balocca <rbalocca@vyatta.com> | 2008-10-30 14:44:57 -0700 |
commit | 760b722ba1cb9d1f69e0753e13e2002611c3033e (patch) | |
tree | ef688d4d9144e5955c595bbafc8b9361792a74c1 /scripts/install-system | |
parent | 841e41f385ca960fb703ff612b014d7e57560b3e (diff) | |
parent | 81bd193daacbf4b1f3ee74fe940151ac90174870 (diff) | |
download | vyatta-cfg-quagga-760b722ba1cb9d1f69e0753e13e2002611c3033e.tar.gz vyatta-cfg-quagga-760b722ba1cb9d1f69e0753e13e2002611c3033e.zip |
Merge branch 'islavista' into jenner
Conflicts:
scripts/standalone_root_pw_reset
Diffstat (limited to 'scripts/install-system')
-rwxr-xr-x | scripts/install-system | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/install-system b/scripts/install-system index 23109bea..2ac202f2 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -839,7 +839,7 @@ copy_config () { set_encrypted_password() { sed -i \ - -e "/ user $1 {/,/}/s/encrypted-password .*\$/encrypted-password: \"$2\"/" $3 + -e "/ user $1 {/,/}/s/encrypted-password .*\$/encrypted-password \"$2\"/" $3 } change_password() { |