diff --git a/srcpkgs/systemd/files/udev.initramfs-bottom b/srcpkgs/systemd/files/udev.initramfs-bottom deleted file mode 100644 index d16bd96c6d..0000000000 --- a/srcpkgs/systemd/files/udev.initramfs-bottom +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -e -# initramfs premount script for udev - -PREREQ="" - -# Output pre-requisites -prereqs() -{ - echo "$PREREQ" -} - -case "$1" in - prereqs) - prereqs - exit 0 - ;; -esac - - -# Make the udev daemon exit. -udevadm control --exit - -# Clean up udev state stuff. -udevadm info --cleanup-db - -# Move /dev to the real filesystem -mount -n -o move /dev ${rootmnt}/dev diff --git a/srcpkgs/systemd/files/udev.initramfs-hook b/srcpkgs/systemd/files/udev.initramfs-hook deleted file mode 100644 index 05d5d7da88..0000000000 --- a/srcpkgs/systemd/files/udev.initramfs-hook +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -e -# initramfs hook for udev - -MINKVER="2.6.24" -PREREQ="" - -# Output pre-requisites -prereqs() -{ - echo "$PREREQ" -} - -case "$1" in - prereqs) - prereqs - exit 0 - ;; -esac - - -. /usr/share/initramfs-tools/hook-functions - -# Copy across the udev binaries -copy_exec /lib/systemd/systemd-udevd /sbin -copy_exec /usr/bin/udevadm /sbin - -# Copy udev configuration -mkdir -p ${DESTDIR}/etc/udev -cp -p /etc/udev/udev.conf ${DESTDIR}/etc/udev - -# Only copy across relevant rules -mkdir -p ${DESTDIR}/lib/udev/rules.d - -UDEV_RULES=" -50-udev-default.rules 60-persistent-storage.rules -80-drivers.rules 95-udev-late.rules" - -for f in ${UDEV_RULES}; do - cp -p /lib/udev/rules.d/$f ${DESTDIR}/lib/udev/rules.d -done - -# Copy across helpers the rules need -mkdir -p ${DESTDIR}/lib/udev -copy_exec /lib/udev/ata_id /lib/udev -copy_exec /lib/udev/cdrom_id /lib/udev -copy_exec /lib/udev/scsi_id /lib/udev diff --git a/srcpkgs/systemd/files/udev.initramfs-inittop b/srcpkgs/systemd/files/udev.initramfs-inittop deleted file mode 100644 index 5153407a72..0000000000 --- a/srcpkgs/systemd/files/udev.initramfs-inittop +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -e -# initramfs premount script for udev - -PREREQ="" - -# Output pre-requisites -prereqs() -{ - echo "$PREREQ" -} - -case "$1" in - prereqs) - prereqs - exit 0 - ;; -esac - - -# Start the udev daemon to process events -systemd-udevd --daemon --resolve-names=never - -# Iterate sysfs and fire off everything; if we include a rule for it then -# it'll get handled; otherwise it'll get handled later when we do this again -# in the main boot sequence. -udevadm trigger --action=add --type=subsystems -udevadm trigger --action=add --type=devices -udevadm settle diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index d76d455bd0..16be19ecac 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -1,7 +1,7 @@ # Template file for 'systemd' pkgname=systemd version=183 -revision=1 +revision=2 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--with-distro=other --with-rootprefix= --enable-plymouth @@ -81,8 +81,7 @@ post_install() { sed -i -e "s|/sbin/sulogin|/bin/sh|" \ ${DESTDIR}/lib/systemd/system/${f}.service done - # Install and enable local-d.service for multi-user.target - # by default. + # Install and enable local-d.service for multi-user.target by default. vinstall ${FILESDIR}/local-d.service 644 lib/systemd/system ln -sf /lib/systemd/system/local-d.service \ ${DESTDIR}/lib/systemd/system/multi-user.target.wants/local-d.service diff --git a/srcpkgs/systemd/udev.template b/srcpkgs/systemd/udev.template index a47f46678b..9c1af76656 100644 --- a/srcpkgs/systemd/udev.template +++ b/srcpkgs/systemd/udev.template @@ -21,13 +21,6 @@ do_install() { udev-trigger.service udev-settle.service; do vmove lib/systemd/system/systemd-${f} lib/systemd/system done - # initramfs-tools support. - vinstall ${FILESDIR}/udev.initramfs-hook 755 \ - usr/share/initramfs-tools/hooks udev - vinstall ${FILESDIR}/udev.initramfs-bottom 755 \ - usr/share/initramfs-tools/scripts/init-bottom udev - vinstall ${FILESDIR}/udev.initramfs-inittop 755 \ - usr/share/initramfs-tools/scripts/init-top udev # Create /sbin/udev symlink just for compatibility. vmkdir sbin ln -sf /lib/systemd/systemd-udevd ${DESTDIR}/sbin/udevd