diff options
| author | Jonathan Bauer | 2014-01-14 16:55:16 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-01-14 16:55:16 +0100 |
| commit | 9a38bc2009cd1f2e958a1a9e101164e0d1f1ccea (patch) | |
| tree | 8214cafd1060dc47e2680fb0782c3f0bad2d16dc | |
| parent | [rootfs-stage31] fix wrong permissions of files extracted from the (diff) | |
| parent | <system startup> rework dhcp request: try to get an address (and dns/hostname... (diff) | |
| download | tm-scripts-9a38bc2009cd1f2e958a1a9e101164e0d1f1ccea.tar.gz tm-scripts-9a38bc2009cd1f2e958a1a9e101164e0d1f1ccea.tar.xz tm-scripts-9a38bc2009cd1f2e958a1a9e101164e0d1f1ccea.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
5 files changed, 7 insertions, 3 deletions
diff --git a/remote/modules/sshd/data/etc/systemd/system/network.target.wants/sshd.service b/remote/modules/sshd/data/etc/systemd/system/network.target.wants/sshd.service new file mode 120000 index 00000000..d41264ec --- /dev/null +++ b/remote/modules/sshd/data/etc/systemd/system/network.target.wants/sshd.service @@ -0,0 +1 @@ +../sshd.service
\ No newline at end of file diff --git a/remote/modules/systemd/data/etc/systemd/system/network-interface@.service b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service index 77bbd287..73cc6239 100644 --- a/remote/modules/systemd/data/etc/systemd/system/network-interface@.service +++ b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service @@ -1,6 +1,6 @@ [Unit] Description=Brings interface %i up -Wants=udhcpc@%i.service sshd.service +Wants=udhcpc@%i.service Before=udhcpc@%i.service [Service] diff --git a/remote/modules/systemd/data/etc/systemd/system/sysinit.target.wants/udhcpc@br0.service b/remote/modules/systemd/data/etc/systemd/system/sysinit.target.wants/udhcpc@br0.service new file mode 120000 index 00000000..dff66b14 --- /dev/null +++ b/remote/modules/systemd/data/etc/systemd/system/sysinit.target.wants/udhcpc@br0.service @@ -0,0 +1 @@ +../udhcpc@.service
\ No newline at end of file diff --git a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service index 0b198476..6547de5b 100644 --- a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service +++ b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service @@ -1,5 +1,7 @@ [Unit] Description=DHCP Client +DefaultDependencies=no +Before=sysinit.target [Service] Type=forking 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 8c54da70..c148de7a 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=="br0", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service" +#SUBSYSTEM=="net", KERNEL=="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" @@ -44,7 +44,7 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??: # Apply sysctl variables to network devices (and only to those) as they appear. -SUBSYSTEM=="net", KERNEL=="br0", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/proc/sys/net/ipv4/conf/$name --prefix=/proc/sys/net/ipv4/neigh/$name --prefix=/proc/sys/net/ipv6/conf/$name --prefix=/proc/sys/net/ipv6/neigh/$name" +#SUBSYSTEM=="net", KERNEL=="eth*", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/proc/sys/net/ipv4/conf/$name --prefix=/proc/sys/net/ipv4/neigh/$name --prefix=/proc/sys/net/ipv6/conf/$name --prefix=/proc/sys/net/ipv6/neigh/$name" # Asynchronously mount file systems implemented by these modules as # soon as they are loaded. |