From 70847429fa8f13796d6baa748bdc7f5e12bc0e93 Mon Sep 17 00:00:00 2001 From: Suresh Sundriyal <247110+sureshsundriyal@users.noreply.github.com> Date: Sun, 20 Sep 2020 19:25:05 -0700 Subject: [PATCH 1/2] [freebsd] Remove the use of basename from log_msg. Fix --- src/base/lnav_log.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/base/lnav_log.cc b/src/base/lnav_log.cc index 02a73bad..66eb4636 100644 --- a/src/base/lnav_log.cc +++ b/src/base/lnav_log.cc @@ -41,7 +41,6 @@ #include #include #include -#include #include #include @@ -274,7 +273,7 @@ void log_msg(lnav_log_level_t level, const char *src_file, int line_number, localtm.tm_sec, (int)(curr_time.tv_usec / 1000), LEVEL_NAMES[to_underlying(level)], - basename((char *)src_file), + src_file, line_number); rc = vsnprintf(&line[prefix_size], MAX_LOG_LINE_SIZE - prefix_size, fmt, args); From 46e97f67dfb6e7c0702cd7edb154acdd83eae86b Mon Sep 17 00:00:00 2001 From: Suresh Sundriyal <247110+sureshsundriyal@users.noreply.github.com> Date: Sun, 20 Sep 2020 20:04:14 -0700 Subject: [PATCH 2/2] [freebsd] Update the vagrant box Also update the boot_time since the newer version of FreeBSD image seems to take a lot longer to come up. --- release/vagrant-static/Vagrantfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release/vagrant-static/Vagrantfile b/release/vagrant-static/Vagrantfile index 73086998..cd27d6e3 100644 --- a/release/vagrant-static/Vagrantfile +++ b/release/vagrant-static/Vagrantfile @@ -22,11 +22,12 @@ Vagrant.configure(2) do |config| freebsd.vm.network "private_network", :type => 'dhcp' freebsd.vm.provision "shell", path:"pkg.sh" freebsd.vm.provision "shell", path:"provision.sh" - freebsd.vm.box = "freebsd/FreeBSD-11.2-RELEASE" - freebsd.vm.box_version = "2018.06.22" + freebsd.vm.box = "freebsd/FreeBSD-12.1-RELEASE" + freebsd.vm.box_version = "2019.11.01" freebsd.vm.synced_folder ".", "/vagrant", type: "nfs" freebsd.ssh.shell = "sh" freebsd.vm.base_mac = "080027D14C66" + freebsd.vm.boot_timeout = 1200 end config.vm.define :musl do |musl|