aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2008-07-28 16:18:04 -0700
committerChris Gianelloni <wolf31o2@gentoo.org>2008-07-28 16:18:04 -0700
commitd5b1e6a9852b18010f24c2f47edfff5daa221cf1 (patch)
treefd8e8f42b4b88465e41fab06419fab89373e87a0 /defaults/linuxrc
parentMoving files from generic to defaults, since they are the defaults used globa... (diff)
downloadgenkernel-d5b1e6a9852b18010f24c2f47edfff5daa221cf1.tar.gz
genkernel-d5b1e6a9852b18010f24c2f47edfff5daa221cf1.tar.bz2
genkernel-d5b1e6a9852b18010f24c2f47edfff5daa221cf1.zip
Removed all references to an initrd and renamed most initr{d,amfs} stuff to simply 'ramdisk' to simplify things for the future.
Diffstat (limited to 'defaults/linuxrc')
-rw-r--r--defaults/linuxrc9
1 files changed, 4 insertions, 5 deletions
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 780b7075..784fa66b 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -220,7 +220,7 @@ then
# Always eval doload=...
modules_load ${MDOLIST}
else
- good_msg 'Skipping module load; no modules in the initrd!'
+ good_msg 'Skipping module load; no modules in the ramdisk!'
fi
# Delay if needed for USB hardware
@@ -576,7 +576,7 @@ then
then
sleep 10
fi
- mkdir initrd proc tmp sys 2>/dev/null
+ mkdir initramfs proc tmp sys 2>/dev/null
chmod 1777 tmp
#UML=`cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||'`
@@ -607,7 +607,6 @@ fi
verbose_kmsg
-# There used to be some initrd/2.4 code here, but it's gone now :
echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}"
if [ ! -e "${CHROOT}/dev/console" ] || [ ! -e "${CHROOT}/dev/null" ]
then
@@ -620,8 +619,8 @@ fi
cd "${CHROOT}"
mkdir "${CHROOT}/proc" "${CHROOT}/sys" 2>/dev/null
echo -ne "${BOLD}.${NORMAL}"
-umount /sys || echo '*: Failed to unmount the initrd /sys!'
-umount /proc || echo '*: Failed to unmount the initrd /proc!'
+umount /sys || echo '*: Failed to unmount the ramdisk /sys!'
+umount /proc || echo '*: Failed to unmount the ramdisk /proc!'
echo -e "${BOLD}.${NORMAL}"
exec switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}"