Remove code to check for host kernel LOOP support for gentoo bug #275757

diff --git a/ChangeLog b/ChangeLog
index f56fdbf021e3055e550ac168df12d93dc7b68cf9..9effb022474badcbb88d446d41ff32359053ce10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  04 Jul 2009; Andrew Gaffney <agaffney@gentoo.org> gen_funcs.sh, genkernel:
+  Remove code to check for host kernel LOOP support for gentoo bug #275757
+
   28 Jun 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/modprobe,
   genkernel.conf:
   Restore BOOTLOADER="grub" example line in genkernel.conf for gentoo bug

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 00416650a0afbf8d8cb7d0553f35dd562a8dfb9a..b93e35240dc898f01eee6046d9da1c304526edb8 100755 (executable)
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -236,23 +236,6 @@ gen_die() {
        exit 1
 }
 
-has_loop() {
-       if [ -e /var/log/dmesg ]
-       then
-               cat /var/log/dmesg | egrep -q '^loop:'
-       else
-               dmesg | egrep -q '^loop:'
-       fi
-       if [ -e '/dev/loop0' -o -e '/dev/loop/0' -a ${PIPESTATUS[1]} ]
-       then
-               # We found a standard dev loop device, assume loop is compiled into the
-               # kernel or the module is loaded
-               return 0
-       else
-               return 1
-       fi
-}
-
 isBootRO()
 {
        return $(awk '( $2 == "'${BOOTDIR}'" && $4 ~ /(^|,)ro(,|$)/){ I=1; exit }END{print !I }' /proc/mounts);

diff --git a/genkernel b/genkernel
index a28f6e16addaa27797250eb9c4cc3d7e60fd801b..1a1bf134f76709903680aade65e873015038ebfc 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -129,23 +129,6 @@ dump_debugcache
 
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
 
-if [ "${BUILD_RAMDISK}" -ne '0' ]
-then
-       if ! has_loop
-       then
-               modprobe loop 2>/dev/null
-               sleep 3
-               if ! has_loop
-               then
-                       print_error 1 'The build-host kernel does not appear to have loop device support.'
-                       print_error 1 'Please load loop support before running genkernel!'
-                       gen_die 'Load loop support!'
-               else
-                       print_info 1 'loop: "loop" module loaded successfully...'
-               fi
-       fi
-fi
-
 # Check BOOTDIR is mounted
 if isTrue ${CMD_NOINSTALL}
 then