diff options
Diffstat (limited to 'remote/modules/systemd')
| -rw-r--r-- | remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules | 2 | ||||
| -rw-r--r-- | remote/modules/systemd/systemd.build | 4 | ||||
| -rw-r--r-- | remote/modules/systemd/systemd.conf | 7 | ||||
| -rw-r--r-- | remote/modules/systemd/systemd.conf.zypper | 7 |
4 files changed, 13 insertions, 7 deletions
diff --git a/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules index d18123fd..3a64e06e 100644 --- a/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules +++ b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules @@ -31,7 +31,7 @@ SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_T # # http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742 -SUBSYSTEM=="net", KERNEL!="lo|vmnet*", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service" +SUBSYSTEM=="net", KERNEL!="lo|vmnet*|eth*", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service" SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k" SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}="bluetooth.target" diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index d3a58363..a84cc7b3 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -18,7 +18,7 @@ build () { pinfo "Building systemd" cd "${MODULE_DIR}/src/$REQUIRED_VERSION" pinfo "calling configure" - ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python || perror "configure failed." + ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid || perror "configure failed." pinfo "calling make" make || perror "make failed." pinfo "calling make install" @@ -34,7 +34,7 @@ build () { post_copy() { # dont clear systemd log at startup - sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service" + sed -i "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service" #old agetty version doesn't support --noclear option in getty service if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ]; diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf index 7f469be6..19e4084e 100644 --- a/remote/modules/systemd/systemd.conf +++ b/remote/modules/systemd/systemd.conf @@ -24,14 +24,17 @@ REQUIRED_DISABLED_SERVICES=" systemd-initctl.socket swap.target " -REQUIRED_INSTALLED_PACKAGES=" intltool +REQUIRED_INSTALLED_PACKAGES=" + intltool gperf dbus pkg-config libcap-dev libudev-dev libdbus-1-dev - xsltproc" + xsltproc + libblkid-dev +" REQUIRED_BINARIES=" hostnamectl journalctl localectl diff --git a/remote/modules/systemd/systemd.conf.zypper b/remote/modules/systemd/systemd.conf.zypper index 60038937..f727789c 100644 --- a/remote/modules/systemd/systemd.conf.zypper +++ b/remote/modules/systemd/systemd.conf.zypper @@ -1,7 +1,10 @@ -REQUIRED_INSTALLED_PACKAGES=" intltool +REQUIRED_INSTALLED_PACKAGES=" + intltool gperf pkg-config libcap-devel libudev-devel dbus-1-devel - libxslt-tools" + libxslt-tools + libblkid-devel +" |