diff options
| author | Kim <UnicronNL@users.noreply.github.com> | 2017-03-30 14:35:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-30 14:35:10 +0200 |
| commit | 41b7c32e9db6c8e0fb33274e25b26a492eefb5d3 (patch) | |
| tree | 9aedd5c71039eb3113df0a56b73e8477035e4293 /etc | |
| parent | 4eec4c493f6eae0394c8c27cf69122c18a9e7a32 (diff) | |
| download | vyatta-cfg-41b7c32e9db6c8e0fb33274e25b26a492eefb5d3.tar.gz vyatta-cfg-41b7c32e9db6c8e0fb33274e25b26a492eefb5d3.zip | |
cleanup mount functions
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/init.d/vyatta-router | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/init.d/vyatta-router b/etc/init.d/vyatta-router index 89b721a..8888fa9 100755 --- a/etc/init.d/vyatta-router +++ b/etc/init.d/vyatta-router @@ -117,10 +117,10 @@ load_bootfile () # bind_mount_boot () { - persist_path=`/opt/vyatta/sbin/vyos-persistpath` + persist_path=$(/opt/vyatta/sbin/vyos-persistpath) if [ $? == 0 ]; then if [ -e $persist_path/boot ]; then - image_name=`cat /proc/cmdline | sed -e s+^.*vyos-union=/boot/++ | sed -e 's/ .*$//'` + image_name=$(cat /proc/cmdline | sed -e s+^.*vyos-union=/boot/++ | sed -e 's/ .*$//') if [ -n "$image_name" ]; then mount --bind $persist_path/boot/$image_name /boot @@ -152,14 +152,14 @@ bind_mount_boot () # mount_slash_config () { - mounted=`mount | grep /opt/vyatta/etc/config` + mounted=$(mount | grep /opt/vyatta/etc/config) -if [ -z "$mounted" ]; then + if [ -z "$mounted" ]; then if [ ! -d /config ]; then mkdir /config fi mount --bind /opt/vyatta/etc/config /config -else + else if [ ! -d /config ]; then mkdir /config mount --bind /opt/vyatta/etc/config /config |