diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-08-04 22:35:47 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-08-04 22:35:47 +0200 |
| commit | ef76c2a1b9076cff19691b63fe03b2e9c2e2fccb (patch) | |
| tree | 484e0b40fc9cea58688d42546aa46dc33d38fe38 | |
| parent | 7ba8b208375073b6aaaacf10b38950d5f7a39ead (diff) | |
| download | vyatta-cfg-ef76c2a1b9076cff19691b63fe03b2e9c2e2fccb.tar.gz vyatta-cfg-ef76c2a1b9076cff19691b63fe03b2e9c2e2fccb.zip | |
T668: do not mount /config since it's already done by an initramfs script.
| -rwxr-xr-x | etc/init.d/vyatta-router | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/etc/init.d/vyatta-router b/etc/init.d/vyatta-router index 630a972..b26c01f 100755 --- a/etc/init.d/vyatta-router +++ b/etc/init.d/vyatta-router @@ -150,32 +150,6 @@ bind_mount_boot () fi } -# -# On live booted machines (i.e. systems booted from LiveCD and systems -# booted from images), the /opt/vyatta/etc/config directory is bind -# mounted to /config. We want all machines to have the config directory -# mounted under /config because it is a more convenient location. So we -# bind mount /opt/vyatta/etc/config to /config here if it has not already -# been done. -# -mount_slash_config () -{ - mounted=$(mount | grep /opt/vyatta/etc/config) - - if [ -z "$mounted" ]; then - if [ ! -d /config ]; then - mkdir /config - fi - mount --bind /opt/vyatta/etc/config /config - else - if [ ! -d /config ]; then - mkdir /config - mount --bind /opt/vyatta/etc/config /config - fi - fi - chgrp -R ${GROUP} /config -} - start () { log_action_begin_msg "Mounting VyOS Config" @@ -192,8 +166,6 @@ start () disabled bootfile || init_bootfile - mount_slash_config - log_daemon_msg "Starting VyOS router" disabled migrate || migrate_bootfile |