diff options
| author | rbalocca <rbalocca@fugazi.vyatta.com> | 2007-12-18 14:18:24 -0800 |
|---|---|---|
| committer | rbalocca <rbalocca@fugazi.vyatta.com> | 2007-12-18 14:18:24 -0800 |
| commit | 64a8cfa9effac219e51498c3b8ef43437ad0396a (patch) | |
| tree | fb11fa4d01b3dbe1f0f60e838b4ec450cbf31a64 /etc/bash_completion.d/20vyatta-cfg | |
| parent | 65db98116efa3c311c798f05f4f6ec97e9b6d643 (diff) | |
| parent | 7966b8cf00e08548447e551a3fcfde40aa06cc59 (diff) | |
| download | vyatta-cfg-64a8cfa9effac219e51498c3b8ef43437ad0396a.tar.gz vyatta-cfg-64a8cfa9effac219e51498c3b8ef43437ad0396a.zip | |
Merge branch 'master' into glendale
Diffstat (limited to 'etc/bash_completion.d/20vyatta-cfg')
| -rw-r--r-- | etc/bash_completion.d/20vyatta-cfg | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg index 78f2e0a..bc9088f 100644 --- a/etc/bash_completion.d/20vyatta-cfg +++ b/etc/bash_completion.d/20vyatta-cfg @@ -941,12 +941,18 @@ make_vyatta_config_dir () sudo chgrp ${DEF_GROUP} $1 } +if grep -q union=aufs /proc/cmdline || grep -q aufs /proc/filesystems ; then + export UNIONFS=aufs +else + export UNIONFS=unionfs +fi + make_vyatta_config_dir $VYATTA_ACTIVE_CONFIGURATION_DIR make_vyatta_config_dir $VYATTA_CHANGES_ONLY_DIR make_vyatta_config_dir $VYATTA_CONFIG_TMP if [ ! -d $VYATTA_TEMP_CONFIG_DIR ]; then make_vyatta_config_dir $VYATTA_TEMP_CONFIG_DIR - sudo mount -t unionfs -o dirs=${VYATTA_CHANGES_ONLY_DIR}=rw:/opt/vyatta/config/active=ro unionfs ${VYATTA_TEMP_CONFIG_DIR} + sudo mount -t $UNIONFS -o dirs=${VYATTA_CHANGES_ONLY_DIR}=rw:/opt/vyatta/config/active=ro $UNIONFS ${VYATTA_TEMP_CONFIG_DIR} fi # disallow 'Ctrl-D' exit, since we need special actions on 'exit' @@ -976,3 +982,7 @@ complete -F vyatta_config_complete edit complete -F vyatta_config_complete exit complete -F vyatta_run_complete run +# Local Variables: +# mode: shell-script +# sh-indentation: 4 +# End: |