From b55845f7d0e3c81f1936d471370dcb40822463b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Sun, 6 Apr 2008 15:55:23 +0200 Subject: Remove old initrd hacks We haven't been using initrd for a while, so these hacks are unnecessary. The "encrypted root device hack" was obsoleted by proper udev rules long ago. The code to umount and free the initrd is not critical, so if somebody insists on using initrd, it can be done in rc.local. --- rc.sysinit | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'rc.sysinit') diff --git a/rc.sysinit b/rc.sysinit index b6797cb..15bb06a 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -137,13 +137,6 @@ if [ -d /sys/class/net/lo ]; then fi fi -# If using an encrypted root fs, we should find the root dev in the initrd -# FIXME: obsoleted by initramfs and udev -if [ -e /initrd/dev/mapper/root ]; then - /bin/mkdir /dev/mapper 2>/dev/null - /bin/cp -a /initrd/dev/mapper/root /dev/mapper/root -fi - # If necessary, find md devices and manually assemble RAID arrays if [ -f /etc/mdadm.conf -a "$(/bin/grep ^ARRAY /etc/mdadm.conf 2>/dev/null)" ]; then # udev won't create these md nodes, so we do it ourselves @@ -156,15 +149,6 @@ if [ -f /etc/mdadm.conf -a "$(/bin/grep ^ARRAY /etc/mdadm.conf 2>/dev/null)" ]; status "Activating RAID arrays" /sbin/mdadm --assemble --scan fi -# Unmount and free up the old initrd if it exists -# FIXME: obsoleted by initramfs -if [ -f /initrd/linuxrc ]; then - stat_busy "Freeing memory from Initial Ramdisk" - /bin/umount /initrd 2>/dev/null - /sbin/blockdev --flushbufs /dev/rd/0 2>/dev/null - stat_done -fi - if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then if [ -x /sbin/lvm -a -d /sys/block ]; then # Kernel 2.6.x, LVM2 groups -- cgit v1.2.3