Author: alexander
Date: 2007-08-15 22:57:42 -0600 (Wed, 15 Aug 2007)
New Revision: 2029
Modified:
trunk/packages/initramfs/Makefile
trunk/packages/initramfs/init.in
Log:
Fixed booting the linux64 kernel
Modified: trunk/packages/initramfs/Makefile
===================================================================
--- trunk/packages/initramfs/Makefile 2007-08-15 23:12:04 UTC (rev 2028)
+++ trunk/packages/initramfs/Makefile 2007-08-16 04:57:42 UTC (rev 2029)
@@ -26,7 +26,7 @@
cp /etc/udev/udev.conf $(WDIR)/etc/udev/udev.conf
cp /etc/udev/rules.d/{05-*,2*,60-*} $(WDIR)/etc/udev/rules.d
sed -i 's/, *GROUP="[^"]*"//' $(WDIR)/etc/udev/rules.d/*
- sed s/@VERSION@/$(VERSION)/ init.in >$(WDIR)/init
+ sed -e s/@VERSION@/$(VERSION)/ -e s/@LINKER@/$(LINKER)/ init.in
>$(WDIR)/init
chmod 755 $(WDIR)/init
cp fakecd.iso.head $(WDIR)
mknod -m 640 $(WDIR)/dev/console c 5 1
Modified: trunk/packages/initramfs/init.in
===================================================================
--- trunk/packages/initramfs/init.in 2007-08-15 23:12:04 UTC (rev 2028)
+++ trunk/packages/initramfs/init.in 2007-08-16 04:57:42 UTC (rev 2029)
@@ -18,12 +18,6 @@
nodhcp=0
cdtype=
-case `uname -m` in
- i[3456]86) LINKER="ld-linux.so.2" ;;
-
- x86_64) LINKER="ld-linux-x86-64.so.2" ;;
-esac
-
find_cd() {
for SYS in /sys/block/hd* /sys/block/sr* ; do
[ ! -d "$SYS" ] && continue
@@ -344,5 +338,5 @@
cd /.root
# Clean up and free some memory
rm -rf /bin /sbin /lib /sys /proc /dev /.tmpfs /init /fakecd.iso.head
-./lib/${LINKER} --library-path ./lib ./bin/mount -n --move . /
-exec ../lib/${LINKER} --library-path ./lib ./usr/sbin/chroot . "$init" "$@"
+./lib/@LINKER@ --library-path ./lib ./bin/mount -n --move . /
+exec ../lib/@LINKER@ --library-path ./lib ./usr/sbin/chroot . "$init" "$@"
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
