From ed09edb1c061fd222c1b0e1e92a44ebe55bbc921 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 28 Jul 2012 00:42:55 +0200 Subject: [PATCH] Resolve cryptic awk-based code docuplication --- defaults/initrd.scripts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index ac32c8a..082d44d 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -298,6 +298,11 @@ run_shell() { /bin/ash } +fs_type_in_use() { + fs_type=$1 + cut -d ' ' -f 3 < /proc/mounts | fgrep -q "${fs_type}" +} + mount_devfs () { # Use devtmpfs if enabled in kernel, # else tmpfs. Always run mdev just in case @@ -307,13 +312,13 @@ mount_devfs () { fi # Options copied from /etc/init.d/udev-mount, should probably be kept in sync - if awk 'BEGIN{m=0;} /devtmpfs/{if($3 == "devtmpfs") {m=1;} } END { exit m;}' /proc/mounts; then + if ! fs_type_in_use devtmpfs; then mount -t $devfs -o "exec,nosuid,mode=0755,size=10M" udev /dev \ || bad_msg "Failed to mount /dev as ${devfs}" fi # http://git.busybox.net/busybox/plain/docs/mdev.txt - if awk 'BEGIN{m=0;} /devpts/{if($3 == "devpts") {m=1;} } END { exit m;}' /proc/mounts; then + if ! fs_type_in_use devpts; then mkdir -m 0755 /dev/pts mount -t devpts -o gid=5,mode=0620 devpts /dev/pts || bad_msg "Failed to mount /dev/pts" fi -- 2.26.2