search for: print_uptime

...February 2016 14:22:34 Richard W.M. Jones wrote: > --- > init/init.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/init/init.c b/init/init.c > index 25d6bc6..38392c4 100644 > --- a/init/init.c > +++ b/init/init.c > @@ -94,6 +94,15 @@ main () > print_uptime (); > fprintf (stderr, "supermin: ext2 mini initrd starting up: " > PACKAGE_VERSION > +#if defined(__dietlibc__) > + " dietlibc" > +#elif defined(__GLIBC__) > + " glibc" This needs to be put as last, as libc impleme...

This patch is the minimum possible to add virtio-scsi support to febootstrap. Problem: SCSI devices are detected asynchronously after the Linux kernel module is loaded. The usual solutions to this involve scsi_wait_scan (deprecated apparently) or udev. However febootstrap doesn't use udev, and adding it is a ton of work with a very uncertain outcome. So the minimum possible change is to

Various patches to make supermin quieter. By outputting fewer messages on the fast path, we use the slow emulated UART less, and this improves boot times. Also remove some kernel modules that we cannot or should not be using, which also improves boot times. Rich.

v1 -> v2: - If we split out the init program into a separate init/ directory, that makes it much easier to build against an alternate libc. I tried to build against uClibc, but uClibc requires an entire build chain, which looked like it was going to be a massive ballache. Rich.

...in C. - * Copyright (C) 2009-2014 Red Hat Inc. + * Copyright (C) 2009-2016 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -80,6 +80,7 @@ static void mount_proc (void); static void print_uptime (void); static void read_cmdline (void); static void insmod (const char *filename); +static void delete_initramfs_files (void); static void show_directory (const char *dir); static char cmdline[1024]; @@ -264,9 +265,12 @@ main () exit (EXIT_FAILURE); } + if (!quiet) + fprintf (s...

....c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/helper/init.c b/helper/init.c index 0ca3135..2b5dacf 100644 --- a/helper/init.c +++ b/helper/init.c @@ -163,8 +163,10 @@ main () chdir ("/"); - /* Run /init from ext2 filesystem. */ + mount_proc (); print_uptime (); + + /* Run /init from ext2 filesystem. */ execl ("/init", "init", NULL); perror ("execl: /init"); -- 1.7.5.3

--- init/init.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/init/init.c b/init/init.c index 25d6bc6..38392c4 100644 --- a/init/init.c +++ b/init/init.c @@ -94,6 +94,15 @@ main () print_uptime (); fprintf (stderr, "supermin: ext2 mini initrd starting up: " PACKAGE_VERSION +#if defined(__dietlibc__) + " dietlibc" +#elif defined(__GLIBC__) + " glibc" +#elif defined(__NEWLIB_H__) + " newlib" +#elif defined(...

...r ("/"); mount_proc (); + if (mount ("tmpfs", "/run", "tmpfs", + MS_NOEXEC|MS_NOSUID, "size=10%,mode=0755") == -1) { + perror ("mount: /run"); + exit (EXIT_FAILURE); + } +y mkdir ("/run/lock", 01777); print_uptime (); /* Run /init from ext2 filesystem. */

--- configure.ac | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index da03c9f..7606bca 100644 --- a/configure.ac +++ b/configure.ac @@ -68,7 +68,8 @@ dnl For ArchLinux handler. AC_CHECK_PROG(PACMAN,[pacman],[pacman],[no]) dnl Required programs, libraries. -AC_PATH_PROG([INSMODSTATIC],[insmod.static],[no])

...> -#ifdef HAVE_ZLIB_STATIC -#include <zlib.h> -#endif - -#ifdef HAVE_LZMA_STATIC -#include <lzma.h> -#endif - /* Maximum time to wait for the root device to appear (seconds). * * On slow machines with lots of disks (Koji running the 255 disk test @@ -102,12 +94,6 @@ main () print_uptime (); fprintf (stderr, "supermin: ext2 mini initrd starting up: " PACKAGE_VERSION -#ifdef HAVE_ZLIB_STATIC - " zlib" -#endif -#ifdef HAVE_LZMA_STATIC - " xz" -#endif "\n"); read_cmdline (); @@ -283,20 +269,6 @...

Allow an alternate libc, such as dietlibc, to be used for the init binary in the supermin appliance. Rich.

Joseph, Please try my modified versions of these patches. These are compile-tested on Fedora and they don't break any existing functionality, but I don't have either urpmi nor a statically-linked xz so I cannot fully test them. I have also fixed detection of zlib (2/3). Rich.

Matthew Daley (13): libxl: fix unsigned less-than-0 comparison in e820_sanitize libxl: check for xc_domain_setmaxmem failure in libxl__build_pre libxl: correct file open success check in libxl__device_pci_reset libxl: don''t leak p in libxl__wait_for_backend libxl: remove unsigned less-than-0 comparison libxl: actually abort if initializing a ctx''s lock fails libxl:

...t.c' || echo './'`init.c init.c: In function ???main???: init.c:106:9: warning: ignoring return value of ???fgets???, declared with attribute warn_unused_result init.c:146:9: warning: ignoring return value of ???chdir???, declared with attribute warn_unused_result init.c: In function ???print_uptime???: init.c:191:9: warning: ignoring return value of ???fgets???, declared with attribute warn_unused_result mv -f .deps/init-init.Tpo .deps/init-init.Po gcc -std=gnu99 -static -g -O2 -all-static -o init init-init.o strip --strip-all init objcopy -I binary -B i386 -O elf64-x86-64 init ext2init.o...

...NVAL: - return "Invalid parameters"; - default: - return strerror(err); - } -} - -/* Leave this enabled for now. When we get more confident in the boot - * process we can turn this off or make it configurable. - */ -#define verbose 1 - -static void mount_proc (void); -static void print_uptime (void); -static void read_cmdline (void); -static void insmod (const char *filename); -static void show_directory (const char *dir); - -static char cmdline[1024]; -static char line[1024]; - -int -main () -{ - mount_proc (); - - print_uptime (); - fprintf (stderr, "supermin: ext2 mini initrd...