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/base/base.conf | 3 +- remote/tools/busybox/busybox.build | 2 +- remote/tools/plymouth/plymouth.build | 2 +- 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 ++++++++++++++++++++++ remote/tools/systemd/systemd.build | 11 ++--- remote/tools/systemd/systemd.conf | 47 +++++++++++++----- .../system/basic.target.wants/udev-trigger.service | 1 - .../systemd/system/basic.target.wants/udev.service | 1 - .../sockets.target.wants/udev-control.socket | 1 - .../system/sockets.target.wants/udev-kernel.socket | 1 - .../data/etc/systemd/system/udev-control.socket | 8 ---- .../data/etc/systemd/system/udev-kernel.socket | 9 ---- .../data/etc/systemd/system/udev-settle.service | 25 ---------- .../data/etc/systemd/system/udev-trigger.service | 10 ---- .../udev/data/etc/systemd/system/udev.service | 14 ------ .../udev/data/lib/udev/rules.d/99-systemd.rules | 55 ---------------------- remote/tools/udev/udev.build | 35 -------------- remote/tools/udev/udev.conf | 20 -------- 23 files changed, 144 insertions(+), 251 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 delete mode 120000 remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev-trigger.service delete mode 120000 remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev.service delete mode 120000 remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-control.socket delete mode 120000 remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-kernel.socket delete mode 100644 remote/tools/udev/data/etc/systemd/system/udev-control.socket delete mode 100644 remote/tools/udev/data/etc/systemd/system/udev-kernel.socket delete mode 100644 remote/tools/udev/data/etc/systemd/system/udev-settle.service delete mode 100644 remote/tools/udev/data/etc/systemd/system/udev-trigger.service delete mode 100644 remote/tools/udev/data/etc/systemd/system/udev.service delete mode 100644 remote/tools/udev/data/lib/udev/rules.d/99-systemd.rules delete mode 100644 remote/tools/udev/udev.build delete mode 100644 remote/tools/udev/udev.conf (limited to 'remote/tools') diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf index 72330a55..24ca5442 100644 --- a/remote/tools/base/base.conf +++ b/remote/tools/base/base.conf @@ -12,7 +12,8 @@ REQUIRED_BINARIES=" bash ldd strace blkid - modprobe" + modprobe + rsyslogd" REQUIRED_LIBRARIES=" libcap libcidn libcom_err diff --git a/remote/tools/busybox/busybox.build b/remote/tools/busybox/busybox.build index 0194bab7..050da667 100644 --- a/remote/tools/busybox/busybox.build +++ b/remote/tools/busybox/busybox.build @@ -18,7 +18,7 @@ build() { if [ ! -e .built ]; then cd src - make + make -j5 [ ! -d $TOOL_DIR/$TOOL/build/$TARGET_DIR ] && mkdir -p $TOOL_DIR/$TOOL/build/$TARGET_DIR make CONFIG_PREFIX=$TOOL_DIR/$TOOL/build/$TARGET_DIR install cd - diff --git a/remote/tools/plymouth/plymouth.build b/remote/tools/plymouth/plymouth.build index 43b0e838..fd54d876 100644 --- a/remote/tools/plymouth/plymouth.build +++ b/remote/tools/plymouth/plymouth.build @@ -25,7 +25,7 @@ build() { cd src/$VERSION ./configure --enable-systemd-integration --disable-gtk --prefix="" - make + make -j5 [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR DESTDIR=$BUILDDIR make install cd - 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" diff --git a/remote/tools/systemd/systemd.build b/remote/tools/systemd/systemd.build index 14cef7e1..c77033ac 100644 --- a/remote/tools/systemd/systemd.build +++ b/remote/tools/systemd/systemd.build @@ -26,7 +26,7 @@ build () { if [ ! -e .built ]; then cd src/$VERSION ./configure --disable-manpages - make + make -j5 [ ! -d $TOOL_DIR/$TOOL/build ] && mkdir -p $TOOL_DIR/$TOOL/build DESTDIR=$TOOL_DIR/$TOOL/build make install cd - @@ -35,14 +35,9 @@ build () { } post_copy() { - # debug shell on tty9 - [ ! -d $INIT_DIR/etc/systemd/system/sysinit.target.wants ] && mkdir -p $INIT_DIR/etc/systemd/system/sysinit.target.wants - cp $TOOL_DIR/$TOOL/data/debug-shell.service $INIT_DIR/etc/systemd/system - ln -s ../debug-shell.service $INIT_DIR/etc/systemd/system/sysinit.target.wants + # copy static data files + cp -r $TOOL_DIR/$TOOL/data/* $INIT_DIR # dont clear systemd log at startup sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" $INIT_DIR/usr/lib/systemd/system/getty@.service - - # copy custom network@.service - cp $TOOL_DIR/$TOOL/data/network@.service $INIT_DIR/etc/systemd/system } diff --git a/remote/tools/systemd/systemd.conf b/remote/tools/systemd/systemd.conf index e4effae2..1ac80876 100644 --- a/remote/tools/systemd/systemd.conf +++ b/remote/tools/systemd/systemd.conf @@ -1,4 +1,4 @@ -VERSION=systemd-43 +VERSION=systemd-197 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz DEPS=" intltool gperf @@ -8,27 +8,34 @@ DEPS=" intltool libudev-dev libdbus-1-dev libkmod-dev" -REQUIRED_BINARIES=" systemd +REQUIRED_BINARIES=" hostnamectl + journalctl + localectl + loginctl systemctl - systemd-ask-password systemd-analyze + systemd-ask-password systemd-cat systemd-cgls systemd-cgtop - systemd-journalctl - systemd-loginctl + systemd-coredumpctl + systemd-delta + systemd-detect-virt + systemd-inhibit systemd-machine-id-setup systemd-notify systemd-nspawn systemd-stdio-bridge systemd-tmpfiles systemd-tty-ask-password-agent + timedatectl + udevadm systemd systemd-ac-power systemd-binfmt + systemd-bootchart systemd-cgroups-agent systemd-coredump - systemd-detect-virt systemd-fsck systemd-hostnamed systemd-initctl @@ -39,24 +46,38 @@ REQUIRED_BINARIES=" systemd systemd-multi-seat-x systemd-quotacheck systemd-random-seed - systemd-readahead-collect - systemd-readahead-replay - systemd-remount-api-vfs + systemd-readahead + systemd-remount-fs systemd-reply-password systemd-shutdown systemd-shutdownd + systemd-sleep systemd-sysctl systemd-timedated systemd-timestamp - systemd-uaccess + systemd-udevd systemd-update-utmp systemd-user-sessions - systemd-vconsole-setup" + systemd-vconsole-setup + systemd-fstab-generator + systemd-getty-generator + systemd-rc-local-generator + systemd-system-update-generator + accelerometer + ata_id + cdrom_id + collect + keymap + mtd_probe + scsi_id + v4l_id" REQUIRED_DIRECTORIES=" /usr/lib /usr/etc /usr/include /usr/share/dbus-1 /usr/share/polkit-1 /etc/dbus-1/system.d - /lib/udev/rules.d" -REQUIRED_FILES=" /usr/share/systemd/kbd-model-map" + /usr/lib/udev/rules.d" +REQUIRED_FILES=" /usr/share/systemd/kbd-model-map + /usr/lib/udev/findkeyboards + /usr/lib/udev/keyboard-force-release.sh" diff --git a/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev-trigger.service b/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev-trigger.service deleted file mode 120000 index 3df21468..00000000 --- a/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev-trigger.service +++ /dev/null @@ -1 +0,0 @@ -../udev-trigger.service \ No newline at end of file diff --git a/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev.service b/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev.service deleted file mode 120000 index d94dbc16..00000000 --- a/remote/tools/udev/data/etc/systemd/system/basic.target.wants/udev.service +++ /dev/null @@ -1 +0,0 @@ -../udev.service \ No newline at end of file diff --git a/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-control.socket b/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-control.socket deleted file mode 120000 index 24d13e63..00000000 --- a/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-control.socket +++ /dev/null @@ -1 +0,0 @@ -../udev-control.socket \ No newline at end of file diff --git a/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-kernel.socket b/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-kernel.socket deleted file mode 120000 index c12bc879..00000000 --- a/remote/tools/udev/data/etc/systemd/system/sockets.target.wants/udev-kernel.socket +++ /dev/null @@ -1 +0,0 @@ -../udev-kernel.socket \ No newline at end of file diff --git a/remote/tools/udev/data/etc/systemd/system/udev-control.socket b/remote/tools/udev/data/etc/systemd/system/udev-control.socket deleted file mode 100644 index 858ddffd..00000000 --- a/remote/tools/udev/data/etc/systemd/system/udev-control.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=udev Control Socket -DefaultDependencies=no -ConditionCapability=CAP_MKNOD - -[Socket] -Service=udev.service -ListenSequentialPacket=/run/udev/control diff --git a/remote/tools/udev/data/etc/systemd/system/udev-kernel.socket b/remote/tools/udev/data/etc/systemd/system/udev-kernel.socket deleted file mode 100644 index 1c554537..00000000 --- a/remote/tools/udev/data/etc/systemd/system/udev-kernel.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=udev Kernel Socket -DefaultDependencies=no -ConditionCapability=CAP_MKNOD - -[Socket] -Service=udev.service -ReceiveBuffer=134217728 -ListenNetlink=kobject-uevent 1 diff --git a/remote/tools/udev/data/etc/systemd/system/udev-settle.service b/remote/tools/udev/data/etc/systemd/system/udev-settle.service deleted file mode 100644 index 5ebad476..00000000 --- a/remote/tools/udev/data/etc/systemd/system/udev-settle.service +++ /dev/null @@ -1,25 +0,0 @@ -# This service is usually not enabled by default. If enabled, it -# acts as a barrier for basic.target -- so all later services will -# wait for udev completely finishing its coldplug run. -# -# If needed, to work around broken or non-hotplug-aware services, -# it might be enabled unconditionally, or pulled-in on-demand by -# the services that assume a fully populated /dev at startup. It -# should not be used or pulled-in ever on systems without such -# legacy services running. - -[Unit] -Description=udev Wait for Complete Device Initialization -DefaultDependencies=no -Wants=udev.service -After=udev-trigger.service -Before=basic.target - -[Service] -Type=oneshot -TimeoutSec=180 -RemainAfterExit=yes -ExecStart=/sbin/udevadm settle - -[Install] -WantedBy=basic.target diff --git a/remote/tools/udev/data/etc/systemd/system/udev-trigger.service b/remote/tools/udev/data/etc/systemd/system/udev-trigger.service deleted file mode 100644 index 88ec5acc..00000000 --- a/remote/tools/udev/data/etc/systemd/system/udev-trigger.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=udev Coldplug all Devices -Wants=udev.service -After=udev-kernel.socket udev-control.socket -DefaultDependencies=no - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/sbin/udevadm trigger --type=subsystems --action=add ; /sbin/udevadm trigger --type=devices --action=add diff --git a/remote/tools/udev/data/etc/systemd/system/udev.service b/remote/tools/udev/data/etc/systemd/system/udev.service deleted file mode 100644 index 12bb582a..00000000 --- a/remote/tools/udev/data/etc/systemd/system/udev.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=udev Kernel Device Manager -Wants=udev-control.socket udev-kernel.socket -After=udev-control.socket udev-kernel.socket -Before=basic.target -DefaultDependencies=no -ConditionCapability=CAP_MKNOD - -[Service] -Type=notify -OOMScoreAdjust=-1000 -Sockets=udev-control.socket udev-kernel.socket -Restart=on-failure -ExecStart=/sbin/udevd diff --git a/remote/tools/udev/data/lib/udev/rules.d/99-systemd.rules b/remote/tools/udev/data/lib/udev/rules.d/99-systemd.rules deleted file mode 100644 index 52377d1f..00000000 --- a/remote/tools/udev/data/lib/udev/rules.d/99-systemd.rules +++ /dev/null @@ -1,55 +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 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" diff --git a/remote/tools/udev/udev.build b/remote/tools/udev/udev.build deleted file mode 100644 index b3dc35f2..00000000 --- a/remote/tools/udev/udev.build +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -install_dependencies() { - echo "No dependencies." -} - -fetch_source() { - echo "Extracting from running system..." -} - -build() { - - BUILDDIR=$TOOL_DIR/$TOOL/build - - COPYLIST="list_dpkg_output" - [ -e $COPYLIST ] && rm $COPYLIST - - for FILE in $(dpkg -L udev | grep -v share/doc | grep -v share/man) - do - [ ! -d $FILE ] && echo $FILE >> $COPYLIST - done - - # prepare target dir & copy there - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR - tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR -} - -post_copy() { - - # copy custom systemd files - SYSTEMDDIR=$INIT_DIR/etc/systemd/system - [ ! -d $SYSTEMDDIR ] && mkdir -p $SYSTEMDDIR - cp -r $TOOL_DIR/$TOOL/data/* $INIT_DIR - -} diff --git a/remote/tools/udev/udev.conf b/remote/tools/udev/udev.conf deleted file mode 100644 index a0a8f5e3..00000000 --- a/remote/tools/udev/udev.conf +++ /dev/null @@ -1,20 +0,0 @@ -REQUIRED_BINARIES=" accelerometer - scsi_id - v4l_id - firmware - udev-acl - keymap - ata_id - mtd_probe - write_cd_rules - write_net_rules - pci-db - cdrom_id - usb-db - collect - udevadm - udevd" -REQUIRED_DIRECTORIES=" /etc/udev - /lib/udev" -REQUIRED_FILES=" /usr/lib/ConsoleKit/run-seat.d/udev-acl.ck - /lib/udev/findkeyboards" -- cgit v1.2.3-55-g7522