Author: justin
Date: 2005-10-01 04:50:04 -0600 (Sat, 01 Oct 2005)
New Revision: 810
Modified:
x86/trunk/initramfs/init.c
x86/trunk/packages/pango/Makefile
x86/trunk/packages/udev/Makefile
Log:
Merged r805, r806 and r809 from utf8-newmake branch to trunk.
Modified: x86/trunk/initramfs/init.c
===================================================================
--- x86/trunk/initramfs/init.c 2005-10-01 09:40:02 UTC (rev 809)
+++ x86/trunk/initramfs/init.c 2005-10-01 10:50:04 UTC (rev 810)
@@ -19,14 +19,11 @@
NULL,
};
-char *init_envp[10] = { "HOME=/", "TERM=linux", NULL, };
-char *init_argv[10] = { "init", NULL, };
-
const char *lfscd;
int mountlfscd(void);
-int main(void)
+int main(int argc, char * argv[], char * envp[])
{
int i, fd, ffd;
struct loop_info loopinfo;
@@ -150,7 +147,7 @@
/* We're done! Pass control to sysvinit. */
printf("Starting init...\n");
- i = execve("/sbin/init", init_argv, init_envp);
+ i = execve("/sbin/init", argv, envp);
if (i<0)
printf("Failed to start init: %s :(\n", strerror(errno));
Modified: x86/trunk/packages/pango/Makefile
===================================================================
--- x86/trunk/packages/pango/Makefile 2005-10-01 09:40:02 UTC (rev 809)
+++ x86/trunk/packages/pango/Makefile 2005-10-01 10:50:04 UTC (rev 810)
@@ -20,7 +20,7 @@
$(std_build)
compile-stage2:
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --sysconfdir=/etc
make $(PM)
make install
Modified: x86/trunk/packages/udev/Makefile
===================================================================
--- x86/trunk/packages/udev/Makefile 2005-10-01 09:40:02 UTC (rev 809)
+++ x86/trunk/packages/udev/Makefile 2005-10-01 10:50:04 UTC (rev 810)
@@ -24,9 +24,12 @@
$(std_build)
compile-stage2:
- make
- make install
+ make EXTRAS=extras/run_directory/
+ make EXTRAS=extras/run_directory/ install
+ # Udev-070 Makefile has a bug here
+ install -m755 extras/run_directory/udev_run_hotplugd /sbin
cp $(SRC)/$(CONFIG1) /etc/udev/rules.d/25-lfs.rules
+ echo 'RUN+="/sbin/udev_run_hotplugd"' >>/etc/udev/rules.d/25-lfs.rules
install -m644 -D docs/writing_udev_rules/index.html \
/usr/share/doc/$(DIR)/index.html
/sbin/udevstart
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
