Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=24530c32103fdbfa8c31302983ee7fa0148e8460
commit 24530c32103fdbfa8c31302983ee7fa0148e8460
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sun May 29 03:29:27 2011 +0200
No longer depend on rc.udev
diff --git a/Makefile b/Makefile
index ac37a39..b97e044 100644
--- a/Makefile
+++ b/Makefile
@@ -530,10 +530,9 @@ endif
udev:
$(CLEANUP)
- mkdir -p udev/{proc,sys,dev}
+ mkdir -p udev/{proc,sys,dev,run}
$(UNPACK)
cp -a $(BDIR)/{etc,lib,sbin} udev/
- sed -i 's|^mount /|#mount /|;s/mount none/#mount none/;s|! \[ `pidof -o
.*` \]|true|' udev/etc/rc.d/rc.udev
eject:
$(CLEANUP)
diff --git a/gui/start.sh b/gui/start.sh
index 5fbce01..389203a 100644
--- a/gui/start.sh
+++ b/gui/start.sh
@@ -25,7 +25,10 @@ modprobe -q ehci-hcd
modprobe -q ohci-hcd
modprobe -q uhci-hcd
echo -e "\033[1;6;34m* Detecting hardware - This can take some time..\033[0m"
-/etc/rc.d/rc.udev
+udevd --daemon
+udevadm trigger --type=subsystems
+udevadm trigger --type=devices
+udevadm settle
## Ugly hack for gparted witch use hal when a new partition is created but we
don't have hal here :).
## Creating all possible nodes do the trick.
diff --git a/src/plugins/hotplug.c b/src/plugins/hotplug.c
index 4400105..a14bf1c 100644
--- a/src/plugins/hotplug.c
+++ b/src/plugins/hotplug.c
@@ -62,6 +62,7 @@ int run(GList **config)
fw_system("mount -t proc none /proc");
fw_system("mount -t sysfs none /sys");
fw_system("mount -t tmpfs none /tmp");
+ fw_system("mount -t tmpfs none /run");
fw_system("ln -sf /proc/self/mounts /etc/mtab");
fw_system("modprobe isofs");
fw_system("modprobe ntfs");
@@ -73,7 +74,10 @@ int run(GList **config)
fw_system("modprobe -q uhci-hcd");
// the real hw detect
- fw_system("/etc/rc.d/rc.udev");
+ fw_system("udevd --daemon");
+ fw_system("udevadm trigger --type=subsystems");
+ fw_system("udevadm trigger --type=devices");
+ fw_system("udevadm settle");
fw_system("setterm -blank 0");
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
