diff --git a/elements/ramdisk/extra-data.d/scripts/init b/elements/ramdisk/extra-data.d/scripts/init index fcdd0d3f..2bba45c4 100755 --- a/elements/ramdisk/extra-data.d/scripts/init +++ b/elements/ramdisk/extra-data.d/scripts/init @@ -27,13 +27,7 @@ source /init-func PATH=/sbin:/bin:/usr/bin:/usr/sbin export PATH -mkdir -p /proc -mkdir -p /sys -mkdir -p /dev -mkdir -p /boot -mkdir -p /etc -mkdir -p /mnt -mkdir -p /lib/modules +mkdir -p /proc /sys /dev /boot /etc /mnt /lib/modules mount -t proc proc /proc @@ -70,8 +64,7 @@ if [ "$UDEVD_VERSION" != "" -a $UDEVD_VERSION -gt 175 ]; then mount -t devtmpfs none /dev mkdir -p /run mount -t tmpfs -o "nosuid,size=20%,mode=0755" tmpfs /run - mkdir -p /run/lock - mkdir -p /run/udev + mkdir -p /run/{lock,udev} else echo "Using old-style udevd setup" mount -t tmpfs none /dev @@ -93,7 +86,6 @@ else mknod /dev/tty c 5 0 mknod -m 0600 /dev/console c 5 1 mknod -m 0666 /dev/ptmx c 5 2 - mkdir -p /dev/.udev mkdir -p /dev/.udev/data fi diff --git a/lib/ramdisk-functions b/lib/ramdisk-functions index eb38a16f..e41691af 100644 --- a/lib/ramdisk-functions +++ b/lib/ramdisk-functions @@ -39,16 +39,10 @@ function cleanup () { function create_ramdisk_base () { echo "Creating base system" - mkdir -p "$TMP_MOUNT_PATH/bin" + mkdir -p "${TMP_MOUNT_PATH}/"{bin,lib/modules,etc/udev} ln -s bin "$TMP_MOUNT_PATH/sbin" - mkdir -p "$TMP_MOUNT_PATH/lib" - mkdir -p "$TMP_MOUNT_PATH/lib/modules" - mkdir -p "$TMP_MOUNT_PATH/etc" - mkdir -p "$TMP_MOUNT_PATH/etc/udev" # cjk adding for discovery support - mkdir -p "$TMP_MOUNT_PATH/var/lib/dhcp" - mkdir -p "$TMP_MOUNT_PATH/var/run" - mkdir -p "$TMP_MOUNT_PATH/lib/udev/rules.d" + mkdir -p "${TMP_MOUNT_PATH}/"{lib/udev/rules.d,var/{lib/dhcp,run}} DISTRO=`lsb_release -si` || true @@ -132,7 +126,7 @@ function copy_required_libs() { if [ "$ref" != "$dest" ]; then local link_path=$TMP_MOUNT_PATH/$ref if ! [ -e "$link_path" -o -L "$link_path" ]; then - mkdir -p `dirname "$link_path"` + mkdir -p $(dirname "$link_path") ln -s "$dest" "$link_path" fi fi