diff --git a/appliance/init b/appliance/init index f91050f09..f44da526d 100755 --- a/appliance/init +++ b/appliance/init @@ -36,49 +36,21 @@ mkdir -p /run/lock # devtmpfs is required since udev 176 mount -t devtmpfs /dev /dev -if [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then - if type service >/dev/null 2>&1; then - service udev start - else - /etc/init.d/udev start - fi -elif [ -x /sbin/start_udev ] && /sbin/start_udev; then - : -else - # Find udevd and run it directly. - for f in /sbin/udevd /lib/udev/udevd \ - /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd \ - /usr/lib/udev/udevd; do - if [ -x "$f" ]; then UDEVD="$f"; fi - done - if [ -n "$UDEVD" ]; then - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - $UDEVD --daemon - udevadm trigger - udevadm settle --timeout=600 - else - echo No udevd, creating /dev manually. - mount -t tmpfs none /dev - mkdir /dev/pts /dev/shm /dev/mapper - mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts - # Must do each MAKEDEV individually, because if one device fails, - # MAKEDEV will quit without creating the rest (RHBZ#507374). - for dev in mem null port zero core full ram tty console fd \ - hda hdb hdc hdd sda sdb sdc sdd loop sd; do - MAKEDEV $dev ||: - done - mknod /dev/ptmx c 5 2; chmod 0666 /dev/ptmx - mknod /dev/random c 1 8; chmod 0666 /dev/random - mknod /dev/urandom c 1 9; chmod 0444 /dev/urandom - ln -sf /proc/self/fd/0 /dev/stdin - ln -sf /proc/self/fd/1 /dev/stdout - ln -sf /proc/self/fd/2 /dev/stderr - - modprobe virtio_pci - modprobe virtio_net - fi +# Find udevd and run it directly. +for f in /sbin/udevd /lib/udev/udevd \ + /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd \ + /usr/lib/udev/udevd; do + if [ -x "$f" ]; then UDEVD="$f"; fi +done +if [ -z "$UDEVD" ]; then + echo "udev not found! Things will probably not work ..." fi +echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug +$UDEVD --daemon +udevadm trigger +udevadm settle --timeout=600 + if grep -sq selinux=1 /proc/cmdline; then mount -t selinuxfs none /sys/fs/selinux fi diff --git a/appliance/packagelist.in b/appliance/packagelist.in index 8a4a5ead0..aecf55a01 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -41,7 +41,6 @@ kernel libcap libldm /* only Fedora has this for now, but we should add it to others later*/ - MAKEDEV nilfs-utils ntfsprogs ntfs-3g