summaryrefslogtreecommitdiffstats
path: root/init_functions
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-04-28 18:10:32 +0200
committerDave Reisner <dreisner@archlinux.org>2012-04-28 19:18:30 +0200
commita1753c140be6138a2313966ba3f0efec5497417d (patch)
treefc5c8572b66ee584677e76d5841a4145f76c7ed0 /init_functions
parent3fee30c50cb02ef69d8122ece5445ed546800b77 (diff)
downloadmkinitcpio-a1753c140be6138a2313966ba3f0efec5497417d.tar.gz
mkinitcpio-a1753c140be6138a2313966ba3f0efec5497417d.tar.xz
init_functions: remove non-devtmpfs case
devtmpfs is no longer supported elsewhere, so this is essentially dead code. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'init_functions')
-rw-r--r--init_functions8
1 files changed, 2 insertions, 6 deletions
diff --git a/init_functions b/init_functions
index 0654020..60532d2 100644
--- a/init_functions
+++ b/init_functions
@@ -179,19 +179,15 @@ resolve_device() {
[ -n "$dev" ] && device=$dev
case $device in
+ # path to kernel named block device
/dev/*)
if poll_device "$device" "$rootdelay"; then
echo "$device"
return 0
fi
-
- # block device, e.g. (/dev/sda1) -> /sys/class/block/sda1/dev
- if [ -e /sys/class/block/${device:5}/dev ]; then
- IFS=':' read major minor < "/sys/class/block/${device:5}/dev"
- fi
;;
+ # hex encoded major/minor, such as from LILO
[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]|[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F])
- # hex encoded major/minor, such as from LILO
major=$(( 0x0$device >> 8 ))
minor=$(( 0x0$device & 0xff ))
;;