Commit 5a4fc205 authored by jan.koester's avatar jan.koester
Browse files

test

parent 31a8eaa0
Loading
Loading
Loading
Loading
+3 −0
Changes for CMakeLists.txt: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink syslite
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink syslitectl
    \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/sbin/coredumpctl)")

# kmod's place for a package's modprobe.d files
install(FILES data/modprobe.d/bonding.conf DESTINATION lib/modprobe.d)

install(TARGETS sysbus EXPORT sysbusTargets ARCHIVE DESTINATION lib)
install(DIRECTORY include/sysbus DESTINATION include)
install(EXPORT sysbusTargets NAMESPACE sysbus:: DESTINATION lib/cmake/sysbus
+3 −2
Changes for src/network.cpp: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -598,8 +598,9 @@ void NetworkManager::applyAll() {
    // Add 127.0.0.1/8 to lo
    addAddress("lo", "127.0.0.1/8");

    // The built-in bonding driver creates bond0 at boot (max_bonds
    // defaults to 1); without a .netdev and without members it's not ours
    // The bonding driver creates bond0 when it starts (max_bonds defaults
    // to 1; as a module, /usr/lib/modprobe.d/bonding.conf sets 0); without
    // a .netdev and without members it's not ours
    if (!findNetDev("bond0") && linkKind("bond0") == "bond" &&
        readSysfs("bond0", "bonding/slaves").empty()) {
        std::string why;