From e41f215770c7f5d8ee9d420e9f8b22f1c7f7c5ca Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 14 Jan 2013 14:30:24 +0100 Subject: [systemd] update to version 197, integrated udev. --- remote/tools/systemd/data/debug-shell.service | 34 ------------- .../data/etc/systemd/system/debug-shell.service | 34 +++++++++++++ .../data/etc/systemd/system/network@.service | 13 +++++ .../sysinit.target.wants/debug-shell.service | 1 + remote/tools/systemd/data/network@.service | 13 ----- .../data/usr/lib/udev/rules.d/99-systemd.rules | 55 ++++++++++++++++++++++ 6 files changed, 103 insertions(+), 47 deletions(-) delete mode 100644 remote/tools/systemd/data/debug-shell.service create mode 100644 remote/tools/systemd/data/etc/systemd/system/debug-shell.service create mode 100644 remote/tools/systemd/data/etc/systemd/system/network@.service create mode 120000 remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service delete mode 100644 remote/tools/systemd/data/network@.service create mode 100644 remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules (limited to 'remote/tools/systemd/data') diff --git a/remote/tools/systemd/data/debug-shell.service b/remote/tools/systemd/data/debug-shell.service deleted file mode 100644 index 063d4995..00000000 --- a/remote/tools/systemd/data/debug-shell.service +++ /dev/null @@ -1,34 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Early root shell on tty9 FOR DEBUGGING ONLY -Documentation=man:sushell(8) -DefaultDependencies=no -IgnoreOnIsolate=yes - -[Service] -Environment=TERM=linux -EnvironmentPath=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/openslx/sbin:/openslx/bin:/openslx/usr/sbin:/openslx/usr/bin -ExecStart=/openslx/bin/ash -Restart=always -RestartSec=0 -StandardInput=tty -TTYPath=/dev/tty9 -TTYReset=yes -TTYVHangup=yes -KillMode=process -IgnoreSIGPIPE=no -# bash ignores SIGTERM -KillSignal=SIGHUP - -# Unset locale for the console getty since the console has problems -# displaying some internationalized messages. -Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION= - -[Install] -WantedBy=sysinit.target diff --git a/remote/tools/systemd/data/etc/systemd/system/debug-shell.service b/remote/tools/systemd/data/etc/systemd/system/debug-shell.service new file mode 100644 index 00000000..063d4995 --- /dev/null +++ b/remote/tools/systemd/data/etc/systemd/system/debug-shell.service @@ -0,0 +1,34 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Early root shell on tty9 FOR DEBUGGING ONLY +Documentation=man:sushell(8) +DefaultDependencies=no +IgnoreOnIsolate=yes + +[Service] +Environment=TERM=linux +EnvironmentPath=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/openslx/sbin:/openslx/bin:/openslx/usr/sbin:/openslx/usr/bin +ExecStart=/openslx/bin/ash +Restart=always +RestartSec=0 +StandardInput=tty +TTYPath=/dev/tty9 +TTYReset=yes +TTYVHangup=yes +KillMode=process +IgnoreSIGPIPE=no +# bash ignores SIGTERM +KillSignal=SIGHUP + +# Unset locale for the console getty since the console has problems +# displaying some internationalized messages. +Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION= + +[Install] +WantedBy=sysinit.target diff --git a/remote/tools/systemd/data/etc/systemd/system/network@.service b/remote/tools/systemd/data/etc/systemd/system/network@.service new file mode 100644 index 00000000..01f3a526 --- /dev/null +++ b/remote/tools/systemd/data/etc/systemd/system/network@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Setup Network Connection +Wants=network.target +Before=network.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/openslx/bin/ip link set dev %I up +ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -t 8 -s /etc/udhcpc.default.script -i %I + +[Install] +WantedBy=multi-user.target diff --git a/remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service b/remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service new file mode 120000 index 00000000..699b56ac --- /dev/null +++ b/remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service @@ -0,0 +1 @@ +../debug-shell.service \ No newline at end of file diff --git a/remote/tools/systemd/data/network@.service b/remote/tools/systemd/data/network@.service deleted file mode 100644 index 01f3a526..00000000 --- a/remote/tools/systemd/data/network@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Setup Network Connection -Wants=network.target -Before=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/openslx/bin/ip link set dev %I up -ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -t 8 -s /etc/udhcpc.default.script -i %I - -[Install] -WantedBy=multi-user.target diff --git a/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules new file mode 100644 index 00000000..52377d1f --- /dev/null +++ b/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules @@ -0,0 +1,55 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +ACTION=="remove", GOTO="systemd_end" + +SUBSYSTEM=="tty", KERNEL=="tty[0-9]|tty1[0-2]", TAG+="systemd" +SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*", TAG+="systemd" + +KERNEL=="vport*", TAG+="systemd" + +SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd" +SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" + +# Ignore encrypted devices with no identified superblock on it, since +# we are probably still calling mke2fs or mkswap on it. + +SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" + +# We need a hardware independent way to identify network devices. We +# use the /sys/subsystem path for this. Current vanilla kernels don't +# actually support that hierarchy right now, however upcoming kernels +# will. HAL and udev internally support /sys/subsystem already, hence +# it should be safe to use this here, too. This is mostly just an +# identification string for systemd, so whether the path actually is +# accessible or not does not matter as long as it is unique and in the +# filesystem namespace. +# +# 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", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network@$name.service" +SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k" + +SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}="bluetooth.target" +ENV{ID_SMARTCARD_READER}=="*?", TAG+="systemd", ENV{SYSTEMD_WANTS}="smartcard.target" +SUBSYSTEM=="sound", KERNEL=="card*", TAG+="systemd", ENV{SYSTEMD_WANTS}="sound.target" + +SUBSYSTEM=="printer", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target" +SUBSYSTEM=="usb", KERNEL=="lp*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target" +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target" + +# Apply sysctl variables to network devices (and only to those) as they appear. + +SUBSYSTEM=="net", KERNEL!="lo", 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. + +SUBSYSTEM=="module", KERNEL=="fuse", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}="sys-fs-fuse-connections.mount" +SUBSYSTEM=="module", KERNEL=="configfs", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}="sys-kernel-config.mount" + +LABEL="systemd_end" -- cgit v1.2.3-55-g7522