From 074ab58c616a00374c828d1d388880521bab6183 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 8 Jun 2011 17:04:58 -0400 Subject: install/base: cleanup and simplify * Create only the directories that are necessary. If others are needed, they'll be created along the way. As part of this, we create /new_root sooner in init, so it's less jarring to the user if they request a break. Signed-off-by: Dave Reisner --- init | 2 +- install/base | 34 ++++++++++++---------------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/init b/init index b9ea04e..332b4de 100644 --- a/init +++ b/init @@ -4,6 +4,7 @@ . /init_functions +mkdir -p /new_root /bin/mount -t proc proc /proc -o nosuid,noexec,nodev /bin/mount -t sysfs sys /sys -o nosuid,noexec,nodev if grep -q devtmpfs /proc/filesystems 2>/dev/null; then @@ -81,7 +82,6 @@ if [ "${break}" = "y" ]; then fi # Mount root at /new_root -mkdir -p /new_root ${mount_handler} /new_root [ -z "${init}" ] && init="/sbin/init" diff --git a/install/base b/install/base index 40f9c25..d5fcef7 100644 --- a/install/base +++ b/install/base @@ -1,18 +1,9 @@ -# vim:set ft=sh: +#!/bin/bash -build() -{ - add_dir "/proc" - add_dir "/sys" - add_dir "/dev" - add_dir "/bin" - add_dir "/sbin" - add_dir "/lib" - add_dir "/usr" - add_dir "/usr/bin" - add_dir "/usr/lib" - add_dir "/usr/sbin" - add_dir "/run" +build() { + for dir in proc sys dev run /usr/{bin,sbin}; do + add_dir "/$dir" + done add_binary /lib/initcpio/busybox /bin/busybox add_binary /sbin/modprobe @@ -20,16 +11,15 @@ build() add_file "/lib/initcpio/init_functions" "/init_functions" add_file "/lib/initcpio/init" "/init" - add_file "${CONFIG}" "/config" + add_file "$CONFIG" "/config" add_file "/etc/modprobe.d/usb-load-ehci-first.conf" - SCRIPT="" } -help () -{ -cat <