From 9f85179b7fd706ddc9b5386dfae3514f16ca26f9 Mon Sep 17 00:00:00 2001 From: Thomas Bächler Date: Tue, 5 Jan 2010 23:56:23 +0100 Subject: Start moving from klibc to glibc+busybox Remove klibc-isms from base and init (except kinit, which will be done in a later commit) Install busybox to the initramfs and change /init so it can be used with busybox --- install/base | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'install/base') diff --git a/install/base b/install/base index 0fdc120..43fc1cb 100644 --- a/install/base +++ b/install/base @@ -5,24 +5,21 @@ install () 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_device "/dev/null" c 1 3 add_device "/dev/zero" c 1 5 add_device "/dev/console" c 5 1 add_device "/dev/mem" c 1 1 - for f in $(find /lib -name klibc-*.so); do - add_file ${f} - done - - for f in /usr/lib/klibc/bin/*; do - add_file ${f} /bin/$(basename ${f}) - done - for f in /usr/lib/klibc/sbin/*; do - add_file ${f} /sbin/$(basename ${f}) - done - # add symlink for compatibility - add_symlink2 /bin/modprobe /sbin/modprobe + add_binary /lib/initcpio/busybox /bin/busybox + add_binary /sbin/modprobe add_file "/lib/initcpio/init_functions" "/init_functions" add_file "/lib/initcpio/init" "/init" -- cgit v1.2.3-24-g4f1b