summaryrefslogtreecommitdiffstats
path: root/appliance
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2009-06-29 22:56:54 +0200
committerRichard Jones <rjones@trick.home.annexia.org>2009-06-30 09:48:27 +0100
commit284797c1561e5e089986027d469bd16ee1a983df (patch)
tree8c67a9d9ca1f06ed8992e889dd47dba282b11ad6 /appliance
parentb4fade6392ccb2961f0d7e2bf45dfc2e20333aed (diff)
downloadlibguestfs-284797c1561e5e089986027d469bd16ee1a983df.tar.gz
libguestfs-284797c1561e5e089986027d469bd16ee1a983df.tar.xz
libguestfs-284797c1561e5e089986027d469bd16ee1a983df.zip
Use udev if available (Guido Gunter).
Added support for Fedora's udev (Richard Jones).
Diffstat (limited to 'appliance')
-rwxr-xr-xappliance/init47
-rw-r--r--appliance/packagelist.in2
2 files changed, 30 insertions, 19 deletions
diff --git a/appliance/init b/appliance/init
index 770e5585..b573c46d 100755
--- a/appliance/init
+++ b/appliance/init
@@ -4,29 +4,38 @@ echo Starting /init script ...
PATH=/sbin:/usr/sbin:$PATH
-mount -t tmpfs none /dev
-mkdir /dev/pts /dev/shm /dev/mapper
-# 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
-
mount -t proc /proc /proc
mount -t sysfs /sys /sys
-mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts
-ln -sf /proc/self/fd/0 /dev/stdin
-ln -sf /proc/self/fd/1 /dev/stdout
-ln -sf /proc/self/fd/2 /dev/stderr
+if [ -x /etc/init.d/udev ]; then
+ /etc/init.d/udev start
+elif [ -x /sbin/start_udev ]; then
+ /sbin/start_udev
+else
+ echo No udev, 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
+ modprobe dm_mod ||:
+fi
-modprobe virtio_pci
-modprobe virtio_net
-modprobe dm_mod ||:
+mount
+ls -l /dev
/sbin/ifconfig lo 127.0.0.1
/sbin/ifconfig eth0 10.0.2.10
diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index 6b9d3e2c..9dbef118 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -15,11 +15,13 @@
MAKEDEV
ntfsprogs
scrub
+ udev
util-linux-ng
#elif DEBIAN == 1
bsdmainutils
iproute
libaugeas0
+ udev
util-linux
#endif