Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a '-s' option which will cause mdsetimage to write back the 

actual image size copied back into the kernel.
This commit is contained in:
thorpej 2002-02-23 02:30:37 +00:00
parent c4f3ebe67c
commit 2365d7ec78
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/usr.sbin/mdsetimage/mdsetimage.8
View File

@ -1,4 +1,4 @@
.\" $NetBSD: mdsetimage.8,v 1.1 2001/10/22 03:19:29 simonb Exp $
.\" $NetBSD: mdsetimage.8,v 1.2 2002/02/23 02:30:37 thorpej Exp $
.\"
.\" Copyright (c) 1996 Christopher G. Demetriou
.\" All rights reserved.
@ -36,6 +36,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl b Ar bfdname
.Op Fl s
.Op Fl v
.Ar kernel
.Ar image
@ -56,6 +57,13 @@ To recognize kernel executable format, the
flag specifies BFD name of kernel.
.Pp
If the
.Fl s
flags is given,
.Nm
will write back the actual disk image size back into
.Ar kernel .
.Pp
If the
.Fl v
flag is given,
.Nm

32
gnu/usr.sbin/mdsetimage/mdsetimage.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mdsetimage.c,v 1.4 2002/01/31 22:43:36 tv Exp $ */
/* $NetBSD: mdsetimage.c,v 1.5 2002/02/23 02:30:37 thorpej Exp $ */
/* from: NetBSD: mdsetimage.c,v 1.15 2001/03/21 23:46:48 cgd Exp $ */
/*
@ -38,7 +38,7 @@ __COPYRIGHT(
#endif /* not lint */
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: mdsetimage.c,v 1.4 2002/01/31 22:43:36 tv Exp $");
__RCSID("$NetBSD: mdsetimage.c,v 1.5 2002/02/23 02:30:37 thorpej Exp $");
#endif /* not lint */
#if HAVE_CONFIG_H
@ -77,6 +77,7 @@ static void usage __P((void)) __attribute__((noreturn));
static int find_md_root __P((bfd *, struct symbols symbols[]));
int verbose;
int setsize;
static const char *progname;
#undef setprogname
@ -91,7 +92,7 @@ main(argc, argv)
{
int ch, kfd, fsfd, rv;
struct stat ksb, fssb;
size_t md_root_offset;
size_t md_root_offset, md_root_size_offset;
u_int32_t md_root_size;
const char *kfile, *fsfile;
char *mappedkfile;
@ -101,11 +102,14 @@ main(argc, argv)
setprogname(argv[0]);
while ((ch = getopt(argc, argv, "b:v")) != -1)
while ((ch = getopt(argc, argv, "b:sv")) != -1)
switch (ch) {
case 'b':
bfdname = optarg;
break;
case 's':
setsize = 1;
break;
case 'v':
verbose = 1;
break;
@ -151,8 +155,9 @@ main(argc, argv)
fprintf(stderr, "mapped %s\n", kfile);
md_root_offset = md_root_symbols[X_MD_ROOT_IMAGE].offset;
md_root_size = bfd_get_32(abfd,
&mappedkfile[md_root_symbols[X_MD_ROOT_SIZE].offset]);
md_root_size_offset = md_root_symbols[X_MD_ROOT_SIZE].offset;
md_root_size = bfd_get_32(abfd, &mappedkfile[md_root_size_offset]);
munmap(mappedkfile, ksb.st_size);
if ((fsfd = open(fsfile, O_RDONLY, 0)) == -1)
@ -193,7 +198,20 @@ main(argc, argv)
}
if (verbose)
fprintf(stderr, "done copying image\n");
if (setsize) {
char buf[sizeof(uint32_t)];
if (verbose)
fprintf(stderr, "setting md_root_size to %llu\n",
(unsigned long long) fssb.st_size);
if (lseek(kfd, md_root_size_offset, SEEK_SET) !=
md_root_size_offset)
err(1, "seek %s", kfile);
bfd_put_32(abfd, fssb.st_size, buf);
if (write(kfd, buf, sizeof(buf)) != sizeof(buf))
err(1, "write %s", kfile);
}
close(fsfd);
close(kfd);