diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2006-07-25 13:54:22 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2006-07-25 13:54:22 -0700 |
| commit | c207061be252e6684e23bdbadc6eb0f50f559217 (patch) | |
| tree | b694788108634597c5e7c87714392f67f24003b7 | |
| parent | 3a327b6ef57224327425426e4c73b44c72d7e870 (diff) | |
| parent | 73657c7c093152449deaabfff6141927bd64b1a8 (diff) | |
| download | klibc-c207061be252e6684e23bdbadc6eb0f50f559217.tar.gz | |
Merge with git://charm.itp.tuwien.ac.at/mattems/klibc/.git#maksklibc-1.4.13
| -rw-r--r-- | usr/kinit/Kbuild | 3 | ||||
| -rw-r--r-- | usr/kinit/resume/resumelib.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/usr/kinit/Kbuild b/usr/kinit/Kbuild index 37b35cf1c5bbc..59db29bfb58fa 100644 --- a/usr/kinit/Kbuild +++ b/usr/kinit/Kbuild @@ -4,8 +4,7 @@ static-y := kinit kinit-y := kinit.o do_mounts.o ramdisk_load.o initrd.o -kinit-y += name_to_dev.o devname.o -kinit-y += getarg.o getintfile.o open.o readfile.o xpio.o +kinit-y += getintfile.o open.o readfile.o xpio.o kinit-y += do_mounts_md.o do_mounts_mtd.o nfsroot.o kinit-y += ipconfig/ diff --git a/usr/kinit/resume/resumelib.c b/usr/kinit/resume/resumelib.c index bd328bd032bbb..ce5c2b219e2ff 100644 --- a/usr/kinit/resume/resumelib.c +++ b/usr/kinit/resume/resumelib.c @@ -74,7 +74,7 @@ int resume(const char *resume_file) failure: if (powerfd >= 0) close(powerfd); - fprintf(stderr, "Resume failed, doing normal boot...\n"); + fprintf(stderr, "kinit: No resume image, doing normal boot...\n"); return -1; fail_r: |