diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-02-29 12:04:31 -0800 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-02-29 12:04:31 -0800 |
| commit | 2f77f4b1b863fc84e71b1fe210661edf88c18c78 (patch) | |
| tree | f0008d43e910a835df3b6a91dbe3efec21ba28cb | |
| parent | d7cc44b09cdc3bcdb83f77750e42d0f0dee838c3 (diff) | |
| parent | 6d47ae87c9d2d2f9dbc3bbea10114e618272a29a (diff) | |
| download | vyatta-cfg-2f77f4b1b863fc84e71b1fe210661edf88c18c78.tar.gz vyatta-cfg-2f77f4b1b863fc84e71b1fe210661edf88c18c78.zip | |
Merge branch 'glendale'
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | etc/default/vyatta-cfg | 4 | ||||
| -rwxr-xr-x | scripts/vyatta-config-loader.pl | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 1d04e20..c317ca4 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Depends: bash (>= 3.1), procps (>= 1:3.2.7-3), vyatta-quagga | quagga, coreutils (>= 5.97-5.3), + bsdutils, vyatta-op, vyatta-config-migrate, dhcp3-client | vyatta-dhcp3-client diff --git a/etc/default/vyatta-cfg b/etc/default/vyatta-cfg index dfb4006..ef02233 100644 --- a/etc/default/vyatta-cfg +++ b/etc/default/vyatta-cfg @@ -33,6 +33,10 @@ for g in "${groups[@]}"; do is_users=1 fi done +# root is also admin +if [ "$(id -u)" == 0 ]; then + is_admin=1 +fi # check level from high to low if [ $is_admin == 1 ]; then declare -x -r VYATTA_USER_LEVEL_DIR=${vyatta_sysconfdir}/shell/level/admin diff --git a/scripts/vyatta-config-loader.pl b/scripts/vyatta-config-loader.pl index 035d2af..370a669 100755 --- a/scripts/vyatta-config-loader.pl +++ b/scripts/vyatta-config-loader.pl @@ -9,7 +9,7 @@ use VyattaConfigLoad; umask 0002; if (!open(OLDOUT, ">&STDOUT") || !open(OLDERR, ">&STDERR") - || !open(STDOUT, ">/var/log/config-boot.log") + || !open(STDOUT, "|/usr/bin/logger -t config-loader -p local0.debug") || !open(STDERR, ">&STDOUT")) { print STDERR "Cannot dup STDOUT/STDERR: $!\n"; exit 1; |