Author: Andy Green Date: Thu Jan 21 13:56:59 2021 +0000 Wconversion fix centos7 diff --git a/READMEs/README-systemd-nspawn.md b/READMEs/README-systemd-nspawn.md index 37fcedb..449bd03 100644 --- a/READMEs/README-systemd-nspawn.md +++ b/READMEs/README-systemd-nspawn.md @@ -161,6 +161,12 @@ Container # apt install sudo make git gcc cmake net-tools libssl-dev vim libc6-i Container # dnf install sudo make git gcc gcc-c++ cmake net-tools dhclient openssl-devel vim glibc.i686 dbus mbedtls-devel glib2-devel libevent-devel libev-devel libuv-devel libmount-devel sqlite-devel libgit2 libgit2-devel dbus systemd-container vim libpkgconf procps-ng ``` +### Specific to Centos 7 + +``` +Container # dnf install sudo make git gcc gcc-c++ cmake net-tools dhclient openssl-devel vim glibc.i686 dbus glib2-devel libevent-devel libev-devel sqlite-devel libgit2 dbus systemd-container vim libpkgconf rpm-build systemd-networkd systemd-resolved +``` + ### Specific to Centos 8 Centos / RHEL 8 simply doesn't provide some -devel packages like mbedtls, libgit2... diff --git a/assets/linux-centos-7.svg b/assets/linux-centos-7.svg new file mode 100644 index 0000000..1d515f2 --- /dev/null +++ b/assets/linux-centos-7.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + 7 + + diff --git a/src/server/s-comms.c b/src/server/s-comms.c index e4727f1..b3cc6e6 100644 --- a/src/server/s-comms.c +++ b/src/server/s-comms.c @@ -245,7 +245,7 @@ sais_event_db_delete_database(struct vhd *vhd, const char *event_uuid) lws_snprintf(filepath, sizeof(filepath), "%s-event-%s.sqlite3-wal", vhd->sqlite3_path_lhs, saf); - r |= (char)!!unlink(filepath); + r = (char)(r | !!unlink(filepath)); lws_snprintf(filepath, sizeof(filepath), "%s-event-%s.sqlite3-shm", vhd->sqlite3_path_lhs, saf);