From c804df9243698882e475ed12acdfbc7b12d58702 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Wed, 6 Jul 2011 16:20:11 +0200 Subject: [PATCH] simplify base --- lib/initcpio/install/arch_base | 7 +++---- usr/share/archboot/base/init | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/initcpio/install/arch_base b/lib/initcpio/install/arch_base index 07565e321..7b546def0 100644 --- a/lib/initcpio/install/arch_base +++ b/lib/initcpio/install/arch_base @@ -6,9 +6,6 @@ build () BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano nc printf tail tee test tr tty uptime w who wc which whoami xargs yes syslog-ng syslog-ng-ctl loggen pdbtool update-patterndb bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk parted gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vim lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip wget top sdparm tput ifconfig ln losetup mkdir mkfifo mknod readlink echo gunzip zcat reset swapoff halt telinit awk dir reboot poweroff pidof nc lzcat lzcmp lzdiff lzegrep lzfgrep lzgrep lzless lzma lzmadec lzmore unlzma unxz xz xzcat xzdec switch_root false pivot_root sleep arch ctrlaltdel raw gdisk sgdisk fixparts findmnt lsblk swaplabel cal chkdupexe chrt col colcrt colrm column cytune ddate fallocate flock getopt hexdump i386 ionice ipcmk ipcrm ipcs isosize line linux32 linux64 look lscpu mcookie namei pg rename renice rev script scriptreplay setarch setsid setterm tailf taskset ul unshare uuidgen whereis write addpart delpart fdformat ldattach partx readprofile rtcwake tunelp uuidd sysctl pgrep pkill pmap pwdx skill slabtop snice tload vmstat watch file eject volname keyctl request-key" ### setting up base structure - add_dir "/proc" - add_dir "/sys" - add_dir "/dev" add_dir "/mnt" add_dir "/media" add_dir "/tmp" @@ -18,7 +15,9 @@ build () add_dir "/var/log" add_dir "/addons" add_dir "/home" - add_dir "/run" + for dir in proc sys dev run; do + add_dir "/$dir" + done ### adding needed programs from running system add_file "${CONFIG}" "/config" diff --git a/usr/share/archboot/base/init b/usr/share/archboot/base/init index 45058adbd..4491db977 100755 --- a/usr/share/archboot/base/init +++ b/usr/share/archboot/base/init @@ -4,6 +4,7 @@ ln -s /bin/bash /bin/sh ln -s /sbin/modprobe /bin/modprobe +mkdir -p /new_root /bin/mount -t proc proc /proc -o nosuid,noexec,nodev /bin/mount -t sysfs sys /sys -o nosuid,noexec,nodev @@ -90,7 +91,6 @@ else fi # Mount root at /new_root - mkdir -p /new_root ${mount_handler} /new_root [ -z "${init}" ] && init="/sbin/init"