CVS commit: src/distrib/utils/sysinst/arch/alpha
Module Name:src Committed By: tsutsui Date: Mon Jun 2 15:03:47 UTC 2014 Modified Files: src/distrib/utils/sysinst/arch/alpha: md.c Log Message: Apply patch in PR port-alpha/48697 (with some tweaks). Tru64 UNIX's disklabel is the same format as BSD disklabel, and it seems Tru64 stores incorrect geometry values in d_nsectors (sectors/track) and d_secpercyl (sectors/cylinder). d_secperunit seems always reliable so use it to get dlsec (sectors/track) and dlcylsize (sectors/cylinder) values. Should be pulled up to netbsd-6 branches. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/distrib/utils/sysinst/arch/alpha/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/alpha/md.c diff -u src/distrib/utils/sysinst/arch/alpha/md.c:1.52 src/distrib/utils/sysinst/arch/alpha/md.c:1.53 --- src/distrib/utils/sysinst/arch/alpha/md.c:1.52 Sat Feb 15 19:45:43 2014 +++ src/distrib/utils/sysinst/arch/alpha/md.c Mon Jun 2 15:03:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.52 2014/02/15 19:45:43 tsutsui Exp $ */ +/* $NetBSD: md.c,v 1.53 2014/06/02 15:03:47 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -85,19 +85,19 @@ md_get_info(void) dlcyl = disklabel.d_ncylinders; dlhead = disklabel.d_ntracks; - dlsec = disklabel.d_nsectors; sectorsize = disklabel.d_secsize; - dlcylsize = disklabel.d_secpercyl; + dlsize = disklabel.d_secperunit; /* - * Compute whole disk size. Take max of (dlcyl*dlhead*dlsec) - * and secperunit, just in case the disk is already labelled. - * (If our new label's RAW_PART size ends up smaller than the - * in-core RAW_PART size value, updating the label will fail.) + * Tru64 UNIX's disklabel is the same format as BSD disklabel, + * and it seems Tru64 stores incorrect geometry values in + * d_nsectors (sectors/track) and d_secpercyl (sectors/cylinder). + * d_secperunit seems always reliable so use it to get + * dlsec (sectors/track) and dlcylsize (sectors/cylinder) values. + * See PR/48697 for details. */ - dlsize = dlcyl*dlhead*dlsec; - if (disklabel.d_secperunit > dlsize) - dlsize = disklabel.d_secperunit; + dlsec = dlsize / (dlhead * dlcyl); + dlcylsize = dlsec * dlhead; return 1; }
CVS commit: src/distrib/utils/sysinst/arch/vax
Module Name:src
Committed By: martin
Date: Wed May 28 11:16:03 UTC 2014
Modified Files:
src/distrib/utils/sysinst/arch/vax: md.c
Log Message:
Enable swap during sysinst as early as possible
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/utils/sysinst/arch/vax/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/vax/md.c
diff -u src/distrib/utils/sysinst/arch/vax/md.c:1.40 src/distrib/utils/sysinst/arch/vax/md.c:1.41
--- src/distrib/utils/sysinst/arch/vax/md.c:1.40 Sat Feb 15 19:45:43 2014
+++ src/distrib/utils/sysinst/arch/vax/md.c Wed May 28 11:16:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.40 2014/02/15 19:45:43 tsutsui Exp $ */
+/* $NetBSD: md.c,v 1.41 2014/05/28 11:16:03 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -143,6 +143,9 @@ md_pre_disklabel(void)
int
md_post_disklabel(void)
{
+ if (get_ramsize() <= 32)
+ set_swap(diskdev, bsdlabel);
+
return 0;
}
@@ -179,6 +182,9 @@ md_cleanup_install(void)
int
md_pre_update(void)
{
+ if (get_ramsize() <= 32)
+ set_swap(diskdev, NULL);
+
return 1;
}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Wed Feb 19 12:14:41 UTC 2014
Modified Files:
src/distrib/utils/sysinst: bsddisklabel.c
src/distrib/utils/sysinst/arch/luna68k: md.c md.h msg.md.en
Log Message:
Improve luna68k md part of sysinst.
- setup a boot UFS partition and install native bootloader
- add messages how to setup NVRAM variables for firmware to load bootloader
- enable swap on <= 32MB machines
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/distrib/utils/sysinst/bsddisklabel.c
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/luna68k/md.c \
src/distrib/utils/sysinst/arch/luna68k/md.h
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/luna68k/msg.md.en
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/bsddisklabel.c
diff -u src/distrib/utils/sysinst/bsddisklabel.c:1.59 src/distrib/utils/sysinst/bsddisklabel.c:1.60
--- src/distrib/utils/sysinst/bsddisklabel.c:1.59 Mon Nov 4 20:07:49 2013
+++ src/distrib/utils/sysinst/bsddisklabel.c Wed Feb 19 12:14:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.59 2013/11/04 20:07:49 christos Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.60 2014/02/19 12:14:40 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -594,7 +594,12 @@ make_bsd_partitions(void)
i = (i + dlcylsize * sectorsize - 1) / (dlcylsize * sectorsize);
i *= dlcylsize;
}
+#if defined(PART_BOOT_FFS)
+ bsdlabel[PART_BOOT].pi_fstype = FS_BSDFFS;
+ bsdlabel[PART_BOOT].pi_flags = PIF_NEWFS;
+#else
bsdlabel[PART_BOOT].pi_fstype = FS_BOOT;
+#endif
bsdlabel[PART_BOOT].pi_size = i;
#ifdef BOOT_HIGH
bsdlabel[PART_BOOT].pi_offset = ptend - i;
Index: src/distrib/utils/sysinst/arch/luna68k/md.c
diff -u src/distrib/utils/sysinst/arch/luna68k/md.c:1.2 src/distrib/utils/sysinst/arch/luna68k/md.c:1.3
--- src/distrib/utils/sysinst/arch/luna68k/md.c:1.2 Fri Nov 4 11:27:03 2011
+++ src/distrib/utils/sysinst/arch/luna68k/md.c Wed Feb 19 12:14:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2011/11/04 11:27:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.3 2014/02/19 12:14:40 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -38,7 +38,9 @@
#include
#include
#include
+#include
#include
+#include
#include
#include
#include
@@ -49,6 +51,9 @@
#include "msg_defs.h"
#include "menu_defs.h"
+#define PART_BOOT_BSIZE 4096
+#define PART_BOOT_FSIZE 512
+
void
md_init(void)
{
@@ -120,6 +125,16 @@ int
md_check_partitions(void)
{
+ /*
+ * Make sure that a boot partition (old 4.3BSD UFS) is prepared
+ * properly for our native bootloader.
+ */
+ if (bsdlabel[PART_BOOT].pi_fstype != FS_BSDFFS ||
+ (bsdlabel[PART_BOOT].pi_flags & PIF_NEWFS) == 0) {
+ msg_display(MSG_nobootpartdisklabel);
+ process_menu(MENU_ok, NULL);
+ return 0;
+ }
return 1;
}
@@ -140,29 +155,45 @@ int
md_post_disklabel(void)
{
+ if (get_ramsize() <= 32)
+ set_swap(diskdev, bsdlabel);
+
+ return 0;
+}
+
+static int
+copy_bootloader(void)
+{
+ const char *mntdir = "/mnt2";
+
+ msg_display(MSG_copybootloader, diskdev);
+ if (!run_program(RUN_SILENT | RUN_ERROR_OK,
+ "mount /dev/%s%c %s", diskdev, 'a' + PART_BOOT, mntdir)) {
+ mnt2_mounted = 1;
+ run_program(0, "/bin/cp /usr/mdec/boot %s", mntdir);
+ run_program(RUN_SILENT | RUN_ERROR_OK, "umount %s", mntdir);
+ mnt2_mounted = 0;
+ } else {
+ /* XXX print proper error message */
+ return 1;
+ }
return 0;
}
/*
- * hook called after upgrade() or install() has finished setting
- * up the target disk but immediately before the user is given the
- * ``disks are now set up'' message.
- *
- * On the news68k, we use this opportunity to install the boot blocks.
+ * hook called after install() has finished setting up the target disk
+ * but immediately before the user is given the ``disks are now set up''
+ * message.
*/
int
md_post_newfs(void)
{
-#if 0 /* no bootloader (yet) */
- const char *bootfile = "/boot";
- printf(msg_string(MSG_dobootblks), diskdev);
- cp_to_target("/usr/mdec/boot", bootfile);
- sync();
- run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sc %s %s",
- diskdev, "/usr/mdec/bootxx", bootfile);
-#endif
- return 0;
+ if (run_program(RUN_DISPLAY | RUN_PROGRESS,
+ "/sbin/newfs -V2 -O 0 -b %d -f %d /dev/r%s%c",
+ PART_BOOT_BSIZE, PART_BOOT_FSIZE, diskdev, 'a' + PART_BOOT))
+ return 1;
+ return copy_bootloader();
}
int
@@ -179,12 +210,17 @@ md_cleanup_install(void)
#ifndef DEBUG
enable_rc_conf();
#endif
+ msg_display(MSG_howtoboot);
+ process_menu(MENU_ok, NULL);
}
int
md_pre_update(void)
{
+ if (get_ramsize() <= 32)
+ set_swap(diskdev, bsdlabel);
+
return 1;
}
@@ -192,8 +228,26 @@ md_pre_update(void)
int
md_update(void)
{
+ const char *mntdir = "/mnt2";
+ char bootpath[MAXPATHLEN];
+ struct stat sb;
+ bool hasboot = false;
- md_post_newfs();
+ /*
+ * Ch
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: tsutsui
Date: Sat Feb 15 19:45:43 UTC 2014
Modified Files:
src/distrib/utils/sysinst/arch/alpha: md.c
src/distrib/utils/sysinst/arch/landisk: md.c
src/distrib/utils/sysinst/arch/macppc: md.c
src/distrib/utils/sysinst/arch/mipsco: md.c
src/distrib/utils/sysinst/arch/news68k: md.c
src/distrib/utils/sysinst/arch/newsmips: md.c
src/distrib/utils/sysinst/arch/pmax: md.c
src/distrib/utils/sysinst/arch/vax: md.c
Log Message:
Use msg_display(3) rather than printf(3) to print dobootblk messages.
The latter won't show any characters on the sysinst screen
and other ports have used the former.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/arch/alpha/md.c
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.45 -r1.46 src/distrib/utils/sysinst/arch/macppc/md.c
cvs rdiff -u -r1.20 -r1.21 src/distrib/utils/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.34 -r1.35 src/distrib/utils/sysinst/arch/news68k/md.c
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/sysinst/arch/newsmips/md.c
cvs rdiff -u -r1.67 -r1.68 src/distrib/utils/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.39 -r1.40 src/distrib/utils/sysinst/arch/vax/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/alpha/md.c
diff -u src/distrib/utils/sysinst/arch/alpha/md.c:1.51 src/distrib/utils/sysinst/arch/alpha/md.c:1.52
--- src/distrib/utils/sysinst/arch/alpha/md.c:1.51 Fri Nov 4 11:27:01 2011
+++ src/distrib/utils/sysinst/arch/alpha/md.c Sat Feb 15 19:45:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.51 2011/11/04 11:27:01 martin Exp $ */
+/* $NetBSD: md.c,v 1.52 2014/02/15 19:45:43 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -151,7 +151,7 @@ md_post_newfs(void)
char *bootxx;
int error;
- printf(msg_string(MSG_dobootblks), diskdev);
+ msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/boot", "/boot");
bootxx = bootxx_name();
if (bootxx != NULL) {
Index: src/distrib/utils/sysinst/arch/landisk/md.c
diff -u src/distrib/utils/sysinst/arch/landisk/md.c:1.10 src/distrib/utils/sysinst/arch/landisk/md.c:1.11
--- src/distrib/utils/sysinst/arch/landisk/md.c:1.10 Fri Nov 4 11:27:03 2011
+++ src/distrib/utils/sysinst/arch/landisk/md.c Sat Feb 15 19:45:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2011/11/04 11:27:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.11 2014/02/15 19:45:43 tsutsui Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -124,7 +124,7 @@ md_post_newfs(void)
char *bootxx;
int error;
- printf (msg_string(MSG_dobootblks), diskdev);
+ msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/boot", "/boot");
bootxx = bootxx_name();
if (bootxx != NULL) {
Index: src/distrib/utils/sysinst/arch/macppc/md.c
diff -u src/distrib/utils/sysinst/arch/macppc/md.c:1.45 src/distrib/utils/sysinst/arch/macppc/md.c:1.46
--- src/distrib/utils/sysinst/arch/macppc/md.c:1.45 Fri Nov 4 11:27:03 2011
+++ src/distrib/utils/sysinst/arch/macppc/md.c Sat Feb 15 19:45:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.45 2011/11/04 11:27:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.46 2014/02/15 19:45:43 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -175,7 +175,7 @@ md_post_newfs(void)
if (bsdlabel[PART_A].pi_offset != 0)
return 0;
- printf (msg_string(MSG_dobootblks), diskdev);
+ msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/ofwboot", bootfile);
sync();
run_program(RUN_DISPLAY, "/usr/sbin/installboot /dev/r%sa %s %s",
Index: src/distrib/utils/sysinst/arch/mipsco/md.c
diff -u src/distrib/utils/sysinst/arch/mipsco/md.c:1.20 src/distrib/utils/sysinst/arch/mipsco/md.c:1.21
--- src/distrib/utils/sysinst/arch/mipsco/md.c:1.20 Thu Jan 5 21:32:36 2012
+++ src/distrib/utils/sysinst/arch/mipsco/md.c Sat Feb 15 19:45:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.20 2012/01/05 21:32:36 christos Exp $ */
+/* $NetBSD: md.c,v 1.21 2014/02/15 19:45:43 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -160,7 +160,7 @@ md_post_newfs(void)
return 0;
}
- printf(msg_string(MSG_dobootblks), diskdev);
+ msg_display(MSG_dobootblks, diskdev);
cp_to_target("/usr/mdec/boot", "/boot");
if (run_program(RUN_DISPLAY | RUN_NO_CLEAR,
"/usr/mdec/installboot /dev/r%sc /usr/mdec/bootxx_ffs", diskdev))
Index: src/distrib/utils/sysinst/arch/news68k/md.c
diff -u src/distrib/utils/sysinst/arch/news68k/md.c:1.34 src/distrib/utils/sysinst/arch/news68k/md.c:1.35
--- src/distrib/utils/sysinst/arch/news68k/md.c:1.34 Fri Nov 4 11:27:04 2011
+++ src/distrib/utils/sysinst/arch/news68k/md.c Sat Feb 15 19:45:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.34 2011/11/04 11:27:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.35 2014/02/15 19:45:43 tsutsui Ex
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Sat Dec 7 20:40:42 UTC 2013
Modified Files:
src/distrib/utils/sysinst: disks.c
Log Message:
Add a tmpfs for /var/shm on machines with more than 16MB ram to the created
/etc/fstab.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/distrib/utils/sysinst/disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.129 src/distrib/utils/sysinst/disks.c:1.130
--- src/distrib/utils/sysinst/disks.c:1.129 Wed Oct 30 15:37:49 2013
+++ src/distrib/utils/sysinst/disks.c Sat Dec 7 20:40:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.129 2013/10/30 15:37:49 drochner Exp $ */
+/* $NetBSD: disks.c,v 1.130 2013/12/07 20:40:42 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -89,6 +89,8 @@ static void fixsb(const char *, const ch
static const char *disk_names[] = { DISK_NAMES, "vnd", NULL };
+static bool tmpfs_on_var_shm(void);
+
const char *
getfslabelname(uint8_t f)
{
@@ -97,6 +99,24 @@ getfslabelname(uint8_t f)
return fstypenames[f];
}
+/*
+ * Decide wether we want to mount a tmpfs on /var/shm: we do this always
+ * when the machine has more than 16 MB of user memory. On smaller machines,
+ * shm_open() and friends will not perform well anyway.
+ */
+static bool
+tmpfs_on_var_shm()
+{
+ uint64_t ram;
+ size_t len;
+
+ len = sizeof(ram);
+ if (sysctlbyname("hw.usermem64", &ram, &len, NULL, 0))
+ return false;
+
+ return ram > 16UL*1024UL*1024UL;
+}
+
/* from src/sbin/atactl/atactl.c
* extract_string: copy a block of bytes out of ataparams and make
* a proper string out of it, truncating trailing spaces and preserving
@@ -825,10 +845,13 @@ make_fstab(void)
scripting_fprintf(f, "procfs\t\t/proc\tprocfs\trw\n");
scripting_fprintf(f, "/dev/%s\t\t/cdrom\tcd9660\tro,noauto\n",
get_default_cdrom());
+ scripting_fprintf(f, "%stmpfs\t\t/var/shm\ttmpfs\trw,-m1777,-sram%%25\n",
+ tmpfs_on_var_shm() ? "" : "#");
make_target_dir("/kern");
make_target_dir("/proc");
make_target_dir("/dev/pts");
make_target_dir("/cdrom");
+ make_target_dir("/var/shm");
scripting_fprintf(NULL, "EOF\n");
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Sat Dec 7 19:42:36 UTC 2013
Modified Files:
src/distrib/utils/sysinst: util.c
Log Message:
Remove duplicated line for /etc/fstab in file list
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.183 src/distrib/utils/sysinst/util.c:1.184
--- src/distrib/utils/sysinst/util.c:1.183 Sat Mar 23 11:50:02 2013
+++ src/distrib/utils/sysinst/util.c Sat Dec 7 19:42:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.183 2013/03/23 11:50:02 he Exp $ */
+/* $NetBSD: util.c,v 1.184 2013/12/07 19:42:36 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1143,7 +1143,6 @@ struct check_table { unsigned int mode;
{ S_IFDIR, "/dev" },
{ S_IFCHR, "/dev/console" },
/* XXX check for rootdev in target /dev? */
- { S_IFREG, "/etc/fstab" },
{ S_IFREG, "/sbin/fsck" },
{ S_IFREG, "/sbin/fsck_ffs" },
{ S_IFREG, "/sbin/mount" },
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Mon Nov 4 20:07:49 UTC 2013
Modified Files:
src/distrib/utils/sysinst: bsddisklabel.c
Log Message:
fix unitialized variable access
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/distrib/utils/sysinst/bsddisklabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/bsddisklabel.c
diff -u src/distrib/utils/sysinst/bsddisklabel.c:1.58 src/distrib/utils/sysinst/bsddisklabel.c:1.59
--- src/distrib/utils/sysinst/bsddisklabel.c:1.58 Tue Mar 19 18:16:53 2013
+++ src/distrib/utils/sysinst/bsddisklabel.c Mon Nov 4 15:07:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.58 2013/03/19 22:16:53 garbled Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.59 2013/11/04 20:07:49 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -743,8 +743,9 @@ check_partitions(void)
if (bootxx != NULL) {
rv = access(bootxx, R_OK);
free(bootxx);
- }
- if (bootxx == NULL || rv != 0) {
+ } else
+ rv = -1;
+ if (rv != 0) {
process_menu(MENU_ok, deconst(MSG_No_Bootcode));
return 0;
}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: mrg
Date: Wed Oct 30 08:39:01 UTC 2013
Modified Files:
src/distrib/utils/sysinst: disks.c
Log Message:
remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/distrib/utils/sysinst/disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.127 src/distrib/utils/sysinst/disks.c:1.128
--- src/distrib/utils/sysinst/disks.c:1.127 Sat Nov 17 20:34:24 2012
+++ src/distrib/utils/sysinst/disks.c Wed Oct 30 08:39:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.127 2012/11/17 20:34:24 tsutsui Exp $ */
+/* $NetBSD: disks.c,v 1.128 2013/10/30 08:39:01 mrg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -494,13 +494,11 @@ fmt_fspart(menudesc *m, int ptn, void *a
{
unsigned int poffset, psize, pend;
const char *desc;
- static const char *Yes, *No;
+ static const char *Yes;
partinfo *p = bsdlabel + ptn;
- if (Yes == NULL) {
+ if (Yes == NULL)
Yes = msg_string(MSG_Yes);
- No = msg_string(MSG_No);
- }
poffset = p->pi_offset / sizemult;
psize = p->pi_size / sizemult;
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Sun Oct 13 15:32:14 UTC 2013
Modified Files:
src/distrib/utils/sysinst: mbr.c
Log Message:
Fix another botch of my dumb patch in PR/45990; add missing braces.
The offset of MBR partition 0 was unintentionally set to 2048 even on
small (<=128GB) disks. Probably we should rethink the threshold,
but anyway sysinst(8) should follow fdisk(8) default.
http://nxr.NetBSD.org/xref/src/sbin/fdisk/fdisk.c?r=1.145#1199
http://cvsweb.NetBSD.org/bsdweb.cgi/src/sbin/fdisk/fdisk.c#rev1.129
The problem is pointed out and analyzed by Simon Nicolussi in PR/48304.
Should be pulled up to all netbsd-6* branches.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/distrib/utils/sysinst/mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.91 src/distrib/utils/sysinst/mbr.c:1.92
--- src/distrib/utils/sysinst/mbr.c:1.91 Sat May 26 05:09:59 2012
+++ src/distrib/utils/sysinst/mbr.c Sun Oct 13 15:32:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.91 2012/05/26 05:09:59 tsutsui Exp $ */
+/* $NetBSD: mbr.c,v 1.92 2013/10/13 15:32:14 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1890,8 +1890,9 @@ get_ptn_alignment(struct mbr_partition *
}
} else {
/* Use 1MB offset for large (>128GB) disks */
- if (dlsize > 2048 * 1024 * 128)
+ if (dlsize > 2048 * 1024 * 128) {
ptn_alignment = 2048;
ptn_0_offset = 2048;
+ }
}
}
CVS commit: src/distrib/utils/sysinst/arch/landisk
Module Name:src Committed By: tsutsui Date: Tue May 14 13:41:48 UTC 2013 Modified Files: src/distrib/utils/sysinst/arch/landisk: md.h Log Message: Add SET_X11_NOSERVERS for default installation sets. Althrough landisk doesn't have any screen console (except possible udl(4) and ukbd(4)), it's a good environment to build packages binaries for sh3el, including dreamcast. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/landisk/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/landisk/md.h diff -u src/distrib/utils/sysinst/arch/landisk/md.h:1.5 src/distrib/utils/sysinst/arch/landisk/md.h:1.6 --- src/distrib/utils/sysinst/arch/landisk/md.h:1.5 Mon Apr 4 08:30:33 2011 +++ src/distrib/utils/sysinst/arch/landisk/md.h Tue May 14 13:41:48 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.5 2011/04/04 08:30:33 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.6 2013/05/14 13:41:48 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -57,7 +57,7 @@ */ #define SET_KERNEL_1_NAME "kern-GENERIC" -#define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM +#define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM, SET_X11_NOSERVERS /* * Machine-specific command to write a new label to a disk.
CVS commit: src/distrib/utils/sysinst/arch/prep
Module Name:src Committed By: tsutsui Date: Tue May 14 13:15:55 UTC 2013 Modified Files: src/distrib/utils/sysinst/arch/prep: md.h Log Message: Remove pasted but obsolete comments. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/sysinst/arch/prep/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/prep/md.h diff -u src/distrib/utils/sysinst/arch/prep/md.h:1.18 src/distrib/utils/sysinst/arch/prep/md.h:1.19 --- src/distrib/utils/sysinst/arch/prep/md.h:1.18 Tue May 14 13:14:28 2013 +++ src/distrib/utils/sysinst/arch/prep/md.h Tue May 14 13:15:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.18 2013/05/14 13:14:28 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.19 2013/05/14 13:15:55 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -66,12 +66,6 @@ * Default filesets to fetch and install during installation * or upgrade. The standard sets are: * base etc comp games man misc tests text xbase xcomp xetc xfont xserver - * - * i386 has the MD set kern first, because generic kernels are too - * big to fit on install floppies. i386 does not yet include the x sets. - * - * Third entry is the last extension name in the split sets for loading - * from floppy. */ #define SET_KERNEL_1_NAME "kern-GENERIC"
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src Committed By: tsutsui Date: Tue May 14 13:14:28 UTC 2013 Modified Files: src/distrib/utils/sysinst/arch/hp300: md.h src/distrib/utils/sysinst/arch/newsmips: md.h src/distrib/utils/sysinst/arch/prep: md.h Log Message: Use the default MD_SETS_SELECTED for ports which have Xservers. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/arch/hp300/md.h cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/arch/newsmips/md.h cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/arch/prep/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/hp300/md.h diff -u src/distrib/utils/sysinst/arch/hp300/md.h:1.17 src/distrib/utils/sysinst/arch/hp300/md.h:1.18 --- src/distrib/utils/sysinst/arch/hp300/md.h:1.17 Mon Apr 4 08:30:28 2011 +++ src/distrib/utils/sysinst/arch/hp300/md.h Tue May 14 13:14:27 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.17 2011/04/04 08:30:28 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.18 2013/05/14 13:14:27 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -69,8 +69,6 @@ */ #define SET_KERNEL_1_NAME "kern-GENERIC" -#define MD_SETS_VALID SET_KERNEL, SET_SYSTEM, SET_X11_NOSERVERS - /* * Disk names accepted as valid targets for a from-scratch installation. * Index: src/distrib/utils/sysinst/arch/newsmips/md.h diff -u src/distrib/utils/sysinst/arch/newsmips/md.h:1.13 src/distrib/utils/sysinst/arch/newsmips/md.h:1.14 --- src/distrib/utils/sysinst/arch/newsmips/md.h:1.13 Mon Apr 4 08:30:38 2011 +++ src/distrib/utils/sysinst/arch/newsmips/md.h Tue May 14 13:14:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.13 2011/04/04 08:30:38 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.14 2013/05/14 13:14:28 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -57,7 +57,6 @@ * or upgrade. */ #define SET_KERNEL_1_NAME "kern-GENERIC" -#define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM, SET_X11_NOSERVERS /* * Machine-specific command to write a new label to a disk. Index: src/distrib/utils/sysinst/arch/prep/md.h diff -u src/distrib/utils/sysinst/arch/prep/md.h:1.17 src/distrib/utils/sysinst/arch/prep/md.h:1.18 --- src/distrib/utils/sysinst/arch/prep/md.h:1.17 Mon Apr 4 08:30:40 2011 +++ src/distrib/utils/sysinst/arch/prep/md.h Tue May 14 13:14:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.17 2011/04/04 08:30:40 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.18 2013/05/14 13:14:28 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -74,7 +74,6 @@ * from floppy. */ #define SET_KERNEL_1_NAME "kern-GENERIC" -#define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM, SET_X11_NOSERVERS /* * Machine-specific command to write a new label to a disk.
CVS commit: src/distrib/utils/sysinst/arch/luna68k
Module Name:src Committed By: tsutsui Date: Tue May 14 13:08:57 UTC 2013 Modified Files: src/distrib/utils/sysinst/arch/luna68k: md.h Log Message: Use the default MD_SETS_SELECTED in util.c which includes an Xserver set. luna68k has working Xserver so no need to specify md MD_SETS_SELECTED with SET_X11_NOSERVERS. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/luna68k/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/luna68k/md.h diff -u src/distrib/utils/sysinst/arch/luna68k/md.h:1.1 src/distrib/utils/sysinst/arch/luna68k/md.h:1.2 --- src/distrib/utils/sysinst/arch/luna68k/md.h:1.1 Sat Jul 16 15:52:21 2011 +++ src/distrib/utils/sysinst/arch/luna68k/md.h Tue May 14 13:08:57 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2011/07/16 15:52:21 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.2 2013/05/14 13:08:57 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -58,8 +58,6 @@ */ #define SET_KERNEL_1_NAME "kern-GENERIC" -#define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM, SET_X11_NOSERVERS - /* * Machine-specific command to write a new label to a disk. * If not defined, we assume the port does not support disklabels and
CVS commit: src/distrib/utils/sysinst/arch/x68k
Module Name:src
Committed By: isaki
Date: Sun Apr 21 06:24:42 UTC 2013
Modified Files:
src/distrib/utils/sysinst/arch/x68k: md.c
Log Message:
Enable rc_configured=YES in sysinst.
The problem that sed was not contained in ramdisk was already gone.
analized by tsutsui@.
XXX Only hp300 and mvme68k seem to have the same problem.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/utils/sysinst/arch/x68k/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/x68k/md.c
diff -u src/distrib/utils/sysinst/arch/x68k/md.c:1.43 src/distrib/utils/sysinst/arch/x68k/md.c:1.44
--- src/distrib/utils/sysinst/arch/x68k/md.c:1.43 Thu Jan 5 21:32:36 2012
+++ src/distrib/utils/sysinst/arch/x68k/md.c Sun Apr 21 06:24:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.43 2012/01/05 21:32:36 christos Exp $ */
+/* $NetBSD: md.c,v 1.44 2013/04/21 06:24:42 isaki Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -297,7 +297,7 @@ md_post_extract(void)
void
md_cleanup_install(void)
{
-#ifdef notyet /* sed is too large for ramdisk */
+#ifndef DEBUG
enable_rc_conf();
#endif
}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: garbled
Date: Tue Mar 26 20:56:55 UTC 2013
Modified Files:
src/distrib/utils/sysinst: configmenu.c defs.h
src/distrib/utils/sysinst/arch/evbarm: md.c
Log Message:
Add def for KERNEL_9
Get rid of unneeded disklabel -D in md.c
Fix pr/47684 by getting rid of a stupid NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/configmenu.c
cvs rdiff -u -r1.166 -r1.167 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.27 -r1.28 src/distrib/utils/sysinst/arch/evbarm/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/configmenu.c
diff -u src/distrib/utils/sysinst/configmenu.c:1.6 src/distrib/utils/sysinst/configmenu.c:1.7
--- src/distrib/utils/sysinst/configmenu.c:1.6 Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/sysinst/configmenu.c Tue Mar 26 20:56:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.6 2013/03/19 22:16:53 garbled Exp $ */
+/* $NetBSD: configmenu.c,v 1.7 2013/03/26 20:56:54 garbled Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@ configinfo config_list[] = {
{MSG_enable_ntpd, CONFIGOPT_NTPD, "ntpd", toggle_rcvar, NULL},
{MSG_run_ntpdate, CONFIGOPT_NTPDATE, "ntpdate", toggle_rcvar, NULL},
{MSG_enable_mdnsd, CONFIGOPT_MDNSD, "mdnsd", toggle_rcvar, NULL},
- {MSG_add_a_user, CONFIGOPT_ADDUSER, NULL, add_new_user, NULL},
+ {MSG_add_a_user, CONFIGOPT_ADDUSER, NULL, add_new_user, ""},
{NULL, CONFIGOPT_LAST, NULL, NULL, NULL}
};
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.166 src/distrib/utils/sysinst/defs.h:1.167
--- src/distrib/utils/sysinst/defs.h:1.166 Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/sysinst/defs.h Tue Mar 26 20:56:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.166 2013/03/19 22:16:53 garbled Exp $ */
+/* $NetBSD: defs.h,v 1.167 2013/03/26 20:56:54 garbled Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -95,7 +95,8 @@ enum {
SET_KERNEL_6, /* MD kernel... */
SET_KERNEL_7, /* MD kernel... */
SET_KERNEL_8, /* MD kernel... */
-SET_KERNEL_LAST, /* allow 8 kernels */
+SET_KERNEL_9, /* MD kernel... */
+SET_KERNEL_LAST, /* allow 9 kernels */
/* System sets */
SET_BASE, /* base */
Index: src/distrib/utils/sysinst/arch/evbarm/md.c
diff -u src/distrib/utils/sysinst/arch/evbarm/md.c:1.27 src/distrib/utils/sysinst/arch/evbarm/md.c:1.28
--- src/distrib/utils/sysinst/arch/evbarm/md.c:1.27 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/arch/evbarm/md.c Tue Mar 26 20:56:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.27 2013/03/19 22:16:54 garbled Exp $ */
+/* $NetBSD: md.c,v 1.28 2013/03/26 20:56:55 garbled Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -178,11 +178,6 @@ md_pre_disklabel(void)
process_menu(MENU_ok, NULL);
return 1;
}
- /* nuke the disklabel from orbit, because d from the gzimg
- corrupts it hopelessly
- */
- if (boardtype == BOARD_TYPE_RPI)
- run_program(RUN_DISPLAY, "/sbin/disklabel -D %s", diskdev);
return 0;
}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: joerg
Date: Sun Mar 24 20:57:19 UTC 2013
Modified Files:
src/distrib/utils/sysinst: main.c
Log Message:
Cleanup prelim_menu definition.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/distrib/utils/sysinst/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.67 src/distrib/utils/sysinst/main.c:1.68
--- src/distrib/utils/sysinst/main.c:1.67 Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/sysinst/main.c Sun Mar 24 20:57:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.67 2013/03/19 22:16:53 garbled Exp $ */
+/* $NetBSD: main.c,v 1.68 2013/03/24 20:57:19 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -58,7 +58,6 @@ __dead static void miscsighandler(int);
static void ttysighandler(int);
static void cleanup(void);
static void process_f_flag(char *);
-static void prelim_menu(void);
static int exit_cleanly = 0; /* Did we finish nicely? */
FILE *logfp; /* log file */
@@ -138,17 +137,8 @@ init(void)
pkg.xfer_type = pkgsrc.xfer_type = "http";
}
-#ifdef __weak_reference
__weakref_visible void prelim_menu(void)
__weak_reference(md_prelim_menu);
-#endif
-#if 0
-static void
-prelim_menu(void)
-{
- /* do nothing, weak reference stub for md_prelim_menu */
-}
-#endif
int
main(int argc, char **argv)
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: gson
Date: Sat Mar 23 15:53:49 UTC 2013
Modified Files:
src/distrib/utils/sysinst: msg.mi.de msg.mi.es msg.mi.fr msg.mi.pl
Log Message:
Sync non-English messages with the changes of msg.mi.en 1.179 to the
best of my ability.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.50 -r1.51 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.132 -r1.133 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.89 -r1.90 src/distrib/utils/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.73 src/distrib/utils/sysinst/msg.mi.de:1.74
--- src/distrib/utils/sysinst/msg.mi.de:1.73 Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/sysinst/msg.mi.de Sat Mar 23 15:53:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.73 2013/03/19 22:16:53 garbled Exp $ */
+/* $NetBSD: msg.mi.de,v 1.74 2013/03/23 15:53:48 gson Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -833,7 +833,7 @@ message set_X11_prog
{X11 Programmierung}
message set_source
-{Quelltexte}
+{Quelltexte und Debug-Info}
message set_syssrc
{Kernel Quelltexte}
@@ -851,10 +851,10 @@ message set_xsrc
{X11 Quelltexte}
message set_debug
-{Debuggen Sets}
+{Debug-Information}
message set_xdebug
-{Debuggen X11 Sets}
+{X11 Debug-Information}
message cur_distsets_row
{%-27s %3s}
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.50 src/distrib/utils/sysinst/msg.mi.es:1.51
--- src/distrib/utils/sysinst/msg.mi.es:1.50 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/msg.mi.es Sat Mar 23 15:53:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.50 2013/03/19 22:16:54 garbled Exp $ */
+/* $NetBSD: msg.mi.es,v 1.51 2013/03/23 15:53:48 gson Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -797,7 +797,7 @@ message set_X11_prog
{Programación de X11}
message set_source
-{Source sets}
+{Source and debug sets}
message set_syssrc
{Kernel sources}
@@ -815,10 +815,10 @@ message set_xsrc
{X11 sources}
message set_debug
-{debug sets}
+{Debug symbols}
message set_xdebug
-{debug X11 sets}
+{X11 debug symbols}
message cur_distsets_row
{%-27s %3s}
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.132 src/distrib/utils/sysinst/msg.mi.fr:1.133
--- src/distrib/utils/sysinst/msg.mi.fr:1.132 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/msg.mi.fr Sat Mar 23 15:53:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.132 2013/03/19 22:16:54 garbled Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.133 2013/03/23 15:53:48 gson Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -853,7 +853,7 @@ message set_X11_prog
{X11 développement}
message set_source
-{Code source}
+{Code source et débogage}
message set_syssrc
{Sources du noyeau}
@@ -871,10 +871,10 @@ message set_xsrc
{Sources X11}
message set_debug
-{Debug}
+{Symboles de débogage}
message set_xdebug
-{Debug X11}
+{Symboles de débogage X11}
message cur_distsets_row
{%-33s %3s}
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.89 src/distrib/utils/sysinst/msg.mi.pl:1.90
--- src/distrib/utils/sysinst/msg.mi.pl:1.89 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/msg.mi.pl Sat Mar 23 15:53:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.89 2013/03/19 22:16:54 garbled Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.90 2013/03/23 15:53:48 gson Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -774,7 +774,7 @@ message set_X11_prog
{Programowanie X11}
message set_source
-{Source sets}
+{Source and debug sets}
message set_syssrc
{Kernel sources}
@@ -792,10 +792,10 @@ message set_xsrc
{X11 sources}
message set_debug
-{Debug sets}
+{Debug symbols}
message set_xdebug
-{Debug X11 sets}
+{X11 debug symbols}
message cur_distsets_row
{%-30s %3s}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: gson
Date: Sat Mar 23 15:36:43 UTC 2013
Modified Files:
src/distrib/utils/sysinst: msg.mi.en
Log Message:
Fix some nits in the English messages for the recently added debug
sets: rename the "Source sets" group to "Source and debug sets" to
better reflect its current content, describe the indivdual sets as
containing as "debug symbols" instead of "debug sets", and capitalize
them to be consistent with the messages for other sets.
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/distrib/utils/sysinst/msg.mi.en
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.178 src/distrib/utils/sysinst/msg.mi.en:1.179
--- src/distrib/utils/sysinst/msg.mi.en:1.178 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/msg.mi.en Sat Mar 23 15:36:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.178 2013/03/19 22:16:54 garbled Exp $ */
+/* $NetBSD: msg.mi.en,v 1.179 2013/03/23 15:36:43 gson Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -773,7 +773,7 @@ message set_X11_prog
{X11 programming}
message set_source
-{Source sets}
+{Source and debug sets}
message set_syssrc
{Kernel sources}
@@ -791,10 +791,10 @@ message set_xsrc
{X11 sources}
message set_debug
-{debug sets}
+{Debug symbols}
message set_xdebug
-{debug X11 sets}
+{X11 debug symbols}
message cur_distsets_row
{%-27s %3s}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: he
Date: Sat Mar 23 11:50:03 UTC 2013
Modified Files:
src/distrib/utils/sysinst: util.c
src/distrib/utils/sysinst/arch/evbarm: md.h msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Add the ability to install the KUROBOX_PRO kernel.
Adds the ability to handle 9 different kernel sets (was 8).
To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/distrib/utils/sysinst/util.c
cvs rdiff -u -r1.20 -r1.21 src/distrib/utils/sysinst/arch/evbarm/md.h
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/sysinst/arch/evbarm/msg.md.de
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/arch/evbarm/msg.md.en
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/arch/evbarm/msg.md.es \
src/distrib/utils/sysinst/arch/evbarm/msg.md.pl
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/arch/evbarm/msg.md.fr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.182 src/distrib/utils/sysinst/util.c:1.183
--- src/distrib/utils/sysinst/util.c:1.182 Sat Mar 16 22:16:02 2013
+++ src/distrib/utils/sysinst/util.c Sat Mar 23 11:50:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.182 2013/03/16 22:16:02 christos Exp $ */
+/* $NetBSD: util.c,v 1.183 2013/03/23 11:50:02 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -118,6 +118,9 @@ distinfo dist_list[] = {
#ifdef SET_KERNEL_8_NAME
{SET_KERNEL_8_NAME, SET_KERNEL_8, MSG_set_kernel_8, NULL},
#endif
+#ifdef SET_KERNEL_9_NAME
+ {SET_KERNEL_9_NAME, SET_KERNEL_9, MSG_set_kernel_9, NULL},
+#endif
{"modules", SET_MODULES, MSG_set_modules, NULL},
{"base", SET_BASE, MSG_set_base, NULL},
Index: src/distrib/utils/sysinst/arch/evbarm/md.h
diff -u src/distrib/utils/sysinst/arch/evbarm/md.h:1.20 src/distrib/utils/sysinst/arch/evbarm/md.h:1.21
--- src/distrib/utils/sysinst/arch/evbarm/md.h:1.20 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/arch/evbarm/md.h Sat Mar 23 11:50:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.20 2013/03/19 22:16:54 garbled Exp $ */
+/* $NetBSD: md.h,v 1.21 2013/03/23 11:50:03 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -61,6 +61,7 @@
#define SET_KERNEL_6_NAME "kern-TEAMASA_NPWR"
#define SET_KERNEL_7_NAME "kern-TS7200"
#define SET_KERNEL_8_NAME "kern-RPI"
+#define SET_KERNEL_9_NAME "kern-KUROBOX_PRO"
#define SET_KERNEL_RPI SET_KERNEL_8
#define MD_SETS_SELECTED SET_SYSTEM
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.de
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.de:1.12 src/distrib/utils/sysinst/arch/evbarm/msg.md.de:1.13
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.de:1.12 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.de Sat Mar 23 11:50:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.12 2013/03/19 22:16:54 garbled Exp $ */
+/* $NetBSD: msg.md.de,v 1.13 2013/03/23 11:50:03 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -88,6 +88,8 @@ message set_kernel_7
{Kernel (TS7200)}
message set_kernel_8
{Kernel (RPI)}
+message set_kernel_9
+{Kernel (KUROBOX_PRO)}
message nomsdospart
{There is no MSDOS boot partition in the MBR partition table.}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.en
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.en:1.14 src/distrib/utils/sysinst/arch/evbarm/msg.md.en:1.15
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.en:1.14 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.en Sat Mar 23 11:50:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.14 2013/03/19 22:16:54 garbled Exp $ */
+/* $NetBSD: msg.md.en,v 1.15 2013/03/23 11:50:03 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -84,6 +84,8 @@ message set_kernel_7
{Kernel (TS7200)}
message set_kernel_8
{Kernel (RPI)}
+message set_kernel_9
+{Kernel (KUROBOX_PRO)}
message nomsdospart
{There is no MSDOS boot partition in the MBR partition table.}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.es
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.es:1.11 src/distrib/utils/sysinst/arch/evbarm/msg.md.es:1.12
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.es:1.11 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.es Sat Mar 23 11:50:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.11 2013/03/19 22:16:54 garbled Exp $ */
+/* $NetBSD: msg.md.es,v 1.12 2013/03/23 11:50:03 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -87,6 +87,8 @@ message set_kernel_7
{Núcleo (TS7200)}
message set_kernel_8
{N\xfacleo (RPI)}
+message set_kernel_9
+{Núcleo (KUROBOX_PRO)}
message nomsdospart
{There is no MSDOS boot partition in the MBR partition table.}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.pl:1.11 s
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Sat Mar 16 22:16:02 UTC 2013
Modified Files:
src/distrib/utils/sysinst: defs.h util.c
Log Message:
fix debugging sets
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.181 -r1.182 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.164 src/distrib/utils/sysinst/defs.h:1.165
--- src/distrib/utils/sysinst/defs.h:1.164 Sat Mar 16 13:10:16 2013
+++ src/distrib/utils/sysinst/defs.h Sat Mar 16 18:16:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.164 2013/03/16 17:10:16 christos Exp $ */
+/* $NetBSD: defs.h,v 1.165 2013/03/16 22:16:02 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -132,7 +132,7 @@ enum {
/* Debug sets */
SET_DEBUG,
-SET_XDEBUG,
+SET_X11_DEBUG,
SET_LAST,
SET_GROUP, /* Start of submenu */
@@ -160,7 +160,7 @@ enum {
#define SET_SOURCE SET_SYSSRC, SET_SRC, SET_SHARESRC, SET_GNUSRC, SET_XSRC
/* All debug sets */
-#define SET_DEBUGGING SET_DEBUG, SET_XDEBUG
+#define SET_DEBUGGING SET_DEBUG, SET_X11_DEBUG
/* Set list flags */
#define SFLAG_MINIMAL 1
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.181 src/distrib/utils/sysinst/util.c:1.182
--- src/distrib/utils/sysinst/util.c:1.181 Sat Mar 16 13:10:17 2013
+++ src/distrib/utils/sysinst/util.c Sat Mar 16 18:16:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.181 2013/03/16 17:10:17 christos Exp $ */
+/* $NetBSD: util.c,v 1.182 2013/03/16 22:16:02 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -68,7 +68,7 @@
#define MD_SETS_SELECTED_NOX SET_KERNEL_1, SET_SYSTEM, SET_MD
#endif
#ifndef MD_SETS_VALID
-#define MD_SETS_VALID SET_KERNEL, SET_SYSTEM, SET_X11, SET_MD, SET_SOURCE SET_DEBUGGING
+#define MD_SETS_VALID SET_KERNEL, SET_SYSTEM, SET_X11, SET_MD, SET_SOURCE, SET_DEBUGGING
#endif
#define MAX_CD_DEVS 256 /* how many cd drives do we expect to attach */
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Sat Mar 16 17:10:18 UTC 2013
Modified Files:
src/distrib/utils/sysinst: defs.h msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl util.c
Log Message:
add debugging sets
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.71 -r1.72 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.176 -r1.177 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.48 -r1.49 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.130 -r1.131 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.87 -r1.88 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.180 -r1.181 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.163 src/distrib/utils/sysinst/defs.h:1.164
--- src/distrib/utils/sysinst/defs.h:1.163 Fri Jun 22 16:54:39 2012
+++ src/distrib/utils/sysinst/defs.h Sat Mar 16 13:10:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.163 2012/06/22 20:54:39 abs Exp $ */
+/* $NetBSD: defs.h,v 1.164 2013/03/16 17:10:16 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -130,6 +130,10 @@ enum {
SET_GNUSRC,
SET_XSRC,
+/* Debug sets */
+SET_DEBUG,
+SET_XDEBUG,
+
SET_LAST,
SET_GROUP, /* Start of submenu */
SET_GROUP_END, /* End of submenu */
@@ -155,6 +159,9 @@ enum {
/* All source sets */
#define SET_SOURCE SET_SYSSRC, SET_SRC, SET_SHARESRC, SET_GNUSRC, SET_XSRC
+/* All debug sets */
+#define SET_DEBUGGING SET_DEBUG, SET_XDEBUG
+
/* Set list flags */
#define SFLAG_MINIMAL 1
#define SFLAG_NOX 2
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.71 src/distrib/utils/sysinst/msg.mi.de:1.72
--- src/distrib/utils/sysinst/msg.mi.de:1.71 Thu Oct 25 11:05:22 2012
+++ src/distrib/utils/sysinst/msg.mi.de Sat Mar 16 13:10:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.71 2012/10/25 15:05:22 tsutsui Exp $ */
+/* $NetBSD: msg.mi.de,v 1.72 2013/03/16 17:10:16 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -850,6 +850,12 @@ message set_gnusrc
message set_xsrc
{X11 Quelltexte}
+message set_debug
+{Debuggen Sets}
+
+message set_xdebug
+{Debuggen X11 Sets}
+
message cur_distsets_row
{%-27s %3s}
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.176 src/distrib/utils/sysinst/msg.mi.en:1.177
--- src/distrib/utils/sysinst/msg.mi.en:1.176 Thu Oct 25 11:05:22 2012
+++ src/distrib/utils/sysinst/msg.mi.en Sat Mar 16 13:10:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.176 2012/10/25 15:05:22 tsutsui Exp $ */
+/* $NetBSD: msg.mi.en,v 1.177 2013/03/16 17:10:16 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -790,6 +790,12 @@ message set_gnusrc
message set_xsrc
{X11 sources}
+message set_debug
+{debug sets}
+
+message set_xdebug
+{debug X11 sets}
+
message cur_distsets_row
{%-27s %3s}
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.48 src/distrib/utils/sysinst/msg.mi.es:1.49
--- src/distrib/utils/sysinst/msg.mi.es:1.48 Thu Oct 25 11:05:22 2012
+++ src/distrib/utils/sysinst/msg.mi.es Sat Mar 16 13:10:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.48 2012/10/25 15:05:22 tsutsui Exp $ */
+/* $NetBSD: msg.mi.es,v 1.49 2013/03/16 17:10:17 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -814,6 +814,12 @@ message set_gnusrc
message set_xsrc
{X11 sources}
+message set_debug
+{debug sets}
+
+message set_xdebug
+{debug X11 sets}
+
message cur_distsets_row
{%-27s %3s}
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.130 src/distrib/utils/sysinst/msg.mi.fr:1.131
--- src/distrib/utils/sysinst/msg.mi.fr:1.130 Thu Oct 25 11:05:23 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Sat Mar 16 13:10:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.130 2012/10/25 15:05:23 tsutsui Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.131 2013/03/16 17:10:17 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -870,6 +870,12 @@ message set_gnusrc
message set_xsrc
{Sources X11}
+message set_debug
+{Debug}
+
+message set_xdebug
+{Debug X11}
+
message cur_distsets_row
{%-33s %3s}
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.87 src/distrib/utils/sysinst/msg.mi.pl:1.88
--- src/distrib/utils/sysinst/msg.mi.pl:1.87 Thu Oct 25 11:05:23 2012
+++ src/distrib/utils/sysinst/msg.mi.pl Sat Mar 16 13:10:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.87 2012/10/25 15:05:23 tsutsui Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.88 2013/03/16 17:10:17 christos Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Ex
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jakllsch
Date: Tue Nov 20 20:17:43 UTC 2012
Modified Files:
src/distrib/utils/sysinst: bsddisklabel.c
Log Message:
Don't enable WAPBL by default. It's far too dangerous.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/distrib/utils/sysinst/bsddisklabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/bsddisklabel.c
diff -u src/distrib/utils/sysinst/bsddisklabel.c:1.56 src/distrib/utils/sysinst/bsddisklabel.c:1.57
--- src/distrib/utils/sysinst/bsddisklabel.c:1.56 Mon May 30 14:20:48 2011
+++ src/distrib/utils/sysinst/bsddisklabel.c Tue Nov 20 20:17:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.56 2011/05/30 14:20:48 joerg Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.57 2012/11/20 20:17:43 jakllsch Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -126,9 +126,8 @@ save_ptn(int ptn, daddr_t start, daddr_t
}
strlcpy(p->pi_mount, mountpt, sizeof p->pi_mount);
p->pi_flags |= PIF_MOUNT;
- /* Default to logging, UFS2. */
+ /* Default to UFS2. */
if (p->pi_fstype == FS_BSDFFS) {
- p->pi_flags |= PIF_LOG;
#ifdef DEFAULT_UFS2
#ifndef HAVE_UFS2_BOOT
if (strcmp(mountpt, "/") != 0)
CVS commit: src/distrib/utils/sysinst
Module Name:src Committed By: tsutsui Date: Sat Nov 17 20:34:24 UTC 2012 Modified Files: src/distrib/utils/sysinst: disks.c Log Message: Don't show a disk which is mounted as root partition in the "Available disks" list during sysinst procedure to prevent users from shooting their foot in case of installation using install-image on a USB stick. Per suggestion in PR/47195. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/distrib/utils/sysinst/disks.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/disks.c diff -u src/distrib/utils/sysinst/disks.c:1.126 src/distrib/utils/sysinst/disks.c:1.127 --- src/distrib/utils/sysinst/disks.c:1.126 Sat Jun 23 14:06:02 2012 +++ src/distrib/utils/sysinst/disks.c Sat Nov 17 20:34:24 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: disks.c,v 1.126 2012/06/23 14:06:02 christos Exp $ */ +/* $NetBSD: disks.c,v 1.127 2012/11/17 20:34:24 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -377,6 +377,14 @@ get_disks(struct disk_desc *dd) break; continue; } + + /* + * Exclude a disk mounted as root partition, + * in case of install-image on a USB memstick. + */ + if (is_active_rootpart(dd->dd_name, 0)) +continue; + dd->dd_cyl = l.d_ncylinders; dd->dd_head = l.d_ntracks; dd->dd_sec = l.d_nsectors;
CVS commit: src/distrib/utils/sysinst/arch/x68k
Module Name:src Committed By: tsutsui Date: Sat Nov 17 19:35:55 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/x68k: md.h Log Message: Define HAVE_UFS2_BOOT to enable UFS2 root in sysinst. UFS2 support for secondary boot was added on March 2012: http://mail-index.netbsd.org/source-changes/2012/03/20/msg033042.html Note prinary boot_ufs has supported UFS2 since 2003: http://mail-index.netbsd.org/source-changes/2003/04/09/0036.html To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/distrib/utils/sysinst/arch/x68k/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/x68k/md.h diff -u src/distrib/utils/sysinst/arch/x68k/md.h:1.20 src/distrib/utils/sysinst/arch/x68k/md.h:1.21 --- src/distrib/utils/sysinst/arch/x68k/md.h:1.20 Mon Apr 4 08:30:45 2011 +++ src/distrib/utils/sysinst/arch/x68k/md.h Sat Nov 17 19:35:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.20 2011/04/04 08:30:45 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.21 2012/11/17 19:35:55 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -60,6 +60,9 @@ #define DEFUSRSIZE 70 /* Default /usr size, if /home */ #define XNEEDMB 35 /* Extra megs for full X installation */ +/* have support for booting from UFS2 */ +#define HAVE_UFS2_BOOT + /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are:
CVS commit: src/distrib/utils/sysinst/arch/i386
Module Name:src Committed By: christos Date: Mon Nov 5 01:25:26 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/i386: md.c Log Message: add missing include file. To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 src/distrib/utils/sysinst/arch/i386/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/i386/md.c diff -u src/distrib/utils/sysinst/arch/i386/md.c:1.129 src/distrib/utils/sysinst/arch/i386/md.c:1.130 --- src/distrib/utils/sysinst/arch/i386/md.c:1.129 Fri Nov 4 07:27:03 2011 +++ src/distrib/utils/sysinst/arch/i386/md.c Sun Nov 4 20:25:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.129 2011/11/04 11:27:03 martin Exp $ */ +/* $NetBSD: md.c,v 1.130 2012/11/05 01:25:25 christos Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -45,6 +45,7 @@ #include #include #include +#include #include "defs.h" #include "md.h"
CVS commit: src/distrib/utils/sysinst/arch/x68k
Module Name:src Committed By: tsutsui Date: Sat Nov 3 15:40:58 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/x68k: Makefile Removed Files: src/distrib/utils/sysinst/arch/x68k: menus.md.es menus.md.pl msg.md.de msg.md.es msg.md.pl Log Message: Remove unused non-en translation messages. (src/distrib/x68k/floppies/ramdisk/Makefile specifies list.sysinst.en) To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/x68k/Makefile cvs rdiff -u -r1.2 -r0 src/distrib/utils/sysinst/arch/x68k/menus.md.es cvs rdiff -u -r1.5 -r0 src/distrib/utils/sysinst/arch/x68k/menus.md.pl \ src/distrib/utils/sysinst/arch/x68k/msg.md.de cvs rdiff -u -r1.4 -r0 src/distrib/utils/sysinst/arch/x68k/msg.md.es cvs rdiff -u -r1.9 -r0 src/distrib/utils/sysinst/arch/x68k/msg.md.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/x68k/Makefile diff -u src/distrib/utils/sysinst/arch/x68k/Makefile:1.10 src/distrib/utils/sysinst/arch/x68k/Makefile:1.11 --- src/distrib/utils/sysinst/arch/x68k/Makefile:1.10 Sat Feb 19 17:00:40 2005 +++ src/distrib/utils/sysinst/arch/x68k/Makefile Sat Nov 3 15:40:58 2012 @@ -1,11 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2005/02/19 17:00:40 dsl Exp $ +# $NetBSD: Makefile,v 1.11 2012/11/03 15:40:58 tsutsui Exp $ # # Makefile for x68k # -# Note: we have no french or german messages, because x68k console does not -# support ISO-8859-1 (right half) character set. - -LANGUAGES= en pl +LANGUAGES= # no translations .include "../../Makefile.inc"
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Thu Oct 25 15:05:23 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.de msg.mi.en msg.mi.es msg.mi.fr
msg.mi.pl util.c
src/distrib/utils/sysinst/arch/amd64: Makefile
src/distrib/utils/sysinst/arch/i386: Makefile
Log Message:
Make the default choice of "Install from" menu to use the sets
in the default file system (assuming which come with the CD/USB image)
and skip distmedium menu if the root file system is not md(4).
Also change "CD-ROM / DVD" menu option accordingly on ports which
have install images. PR/47038
XXX: still no responsible maintainer of non-en translations
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.175 -r1.176 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.47 -r1.48 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.129 -r1.130 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.86 -r1.87 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.179 -r1.180 src/distrib/utils/sysinst/util.c
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/amd64/Makefile
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/arch/i386/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.70 src/distrib/utils/sysinst/msg.mi.de:1.71
--- src/distrib/utils/sysinst/msg.mi.de:1.70 Fri Jul 6 21:10:56 2012
+++ src/distrib/utils/sysinst/msg.mi.de Thu Oct 25 15:05:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.70 2012/07/06 21:10:56 jdf Exp $ */
+/* $NetBSD: msg.mi.de,v 1.71 2012/10/25 15:05:22 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -976,7 +976,11 @@ message Select_medium {Medium auswählen}
message ftp {FTP}
message http {HTTP}
message nfs {NFS}
+.if HAVE_INSTALL_IMAGE
+message cdrom {CD-ROM / DVD / install image media} /* XXX translation */
+.else
message cdrom {CD-ROM / DVD}
+.endif
message floppy {Diskette}
message local_fs {Ungemountetes Dateisysytem}
message local_dir {Lokales Verzeichnis}
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.175 src/distrib/utils/sysinst/msg.mi.en:1.176
--- src/distrib/utils/sysinst/msg.mi.en:1.175 Fri Jul 6 21:10:56 2012
+++ src/distrib/utils/sysinst/msg.mi.en Thu Oct 25 15:05:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.175 2012/07/06 21:10:56 jdf Exp $ */
+/* $NetBSD: msg.mi.en,v 1.176 2012/10/25 15:05:22 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -916,7 +916,11 @@ message Select_medium {Install from}
message ftp {FTP}
message http {HTTP}
message nfs {NFS}
+.if HAVE_INSTALL_IMAGE
+message cdrom {CD-ROM / DVD / install image media}
+.else
message cdrom {CD-ROM / DVD}
+.endif
message floppy {Floppy}
message local_fs {Unmounted fs}
message local_dir {Local directory}
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.47 src/distrib/utils/sysinst/msg.mi.es:1.48
--- src/distrib/utils/sysinst/msg.mi.es:1.47 Sat Sep 15 17:56:28 2012
+++ src/distrib/utils/sysinst/msg.mi.es Thu Oct 25 15:05:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.47 2012/09/15 17:56:28 jdf Exp $ */
+/* $NetBSD: msg.mi.es,v 1.48 2012/10/25 15:05:22 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -942,7 +942,11 @@ message Select_medium {Seleccione el med
message ftp {FTP}
message http {HTTP}
message nfs {NFS}
+.if HAVE_INSTALL_IMAGE
+message cdrom {CD-ROM / DVD / install image media} /* XXX translation */
+.else
message cdrom {CD-ROM / DVD}
+.endif
message floppy {Disquete}
message local_fs {Sistema de archivos desmontado}
message local_dir {Directorio Local}
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.129 src/distrib/utils/sysinst/msg.mi.fr:1.130
--- src/distrib/utils/sysinst/msg.mi.fr:1.129 Fri Jul 6 21:10:56 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Thu Oct 25 15:05:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.129 2012/07/06 21:10:56 jdf Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.130 2012/10/25 15:05:23 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1014,7 +1014,11 @@ message Select_medium {Sélection du médi
message ftp {FTP}
message http {HTTP}
message nfs {NFS}
+.if HAVE_INSTALL_IMAGE
+message cdrom {CD-ROM / DVD / install image media} /* XXX translation */
+.else
message cdrom {CD-ROM / DVD}
+.endif
message floppy {Disquette}
message local_fs {Système de fichiers non-monté}
message local_dir {Répertoire local monté}
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.86 src/distrib/utils/sysinst/msg.mi.pl:1.87
--- src/distrib/utils/sysinst/msg.mi.pl:1.86 Fri Jul 6 21:10:56 2012
+++ src/distrib/utils/sysinst/m
CVS commit: src/distrib/utils/sysinst/arch/i386
Module Name:src
Committed By: tsutsui
Date: Wed Oct 24 11:36:02 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/i386: msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Log Message:
Remove useless md_may_remove_boot_medium messages. PR/47039
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/utils/sysinst/arch/i386/msg.md.de
cvs rdiff -u -r1.63 -r1.64 src/distrib/utils/sysinst/arch/i386/msg.md.en
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/arch/i386/msg.md.es
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/arch/i386/msg.md.fr
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/sysinst/arch/i386/msg.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/i386/msg.md.de
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.de:1.23 src/distrib/utils/sysinst/arch/i386/msg.md.de:1.24
--- src/distrib/utils/sysinst/arch/i386/msg.md.de:1.23 Tue May 15 08:47:53 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.de Wed Oct 24 11:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.23 2012/05/15 08:47:53 martin Exp $ */
+/* $NetBSD: msg.md.de,v 1.24 2012/10/24 11:36:02 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,8 +39,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{Wenn Sie von einer Diskette oder einem USB Laufwerk gebootet haben,
-können Sie diese(s) jetzt entfernen.
+{
}
message Keyboard_type {Tastaturschema}
Index: src/distrib/utils/sysinst/arch/i386/msg.md.en
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.en:1.63 src/distrib/utils/sysinst/arch/i386/msg.md.en:1.64
--- src/distrib/utils/sysinst/arch/i386/msg.md.en:1.63 Sat Mar 3 03:06:30 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.en Wed Oct 24 11:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.63 2012/03/03 03:06:30 tsutsui Exp $ */
+/* $NetBSD: msg.md.en,v 1.64 2012/10/24 11:36:02 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,8 +39,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{If you booted from removable media such as a USB drive or floppy disk, you
-may now remove the device.
+{
}
message Keyboard_type {Keyboard type}
Index: src/distrib/utils/sysinst/arch/i386/msg.md.es
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.es:1.14 src/distrib/utils/sysinst/arch/i386/msg.md.es:1.15
--- src/distrib/utils/sysinst/arch/i386/msg.md.es:1.14 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.es Wed Oct 24 11:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.14 2012/03/01 16:22:15 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.15 2012/10/24 11:36:02 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,7 +39,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{Si ha iniciado desde disquette, ahora deberia retirar el disco.
+{
}
message Keyboard_type {Tipo de teclado}
Index: src/distrib/utils/sysinst/arch/i386/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.fr:1.51 src/distrib/utils/sysinst/arch/i386/msg.md.fr:1.52
--- src/distrib/utils/sysinst/arch/i386/msg.md.fr:1.51 Mon Apr 4 08:30:32 2011
+++ src/distrib/utils/sysinst/arch/i386/msg.md.fr Wed Oct 24 11:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.51 2011/04/04 08:30:32 mbalmer Exp $ */
+/* $NetBSD: msg.md.fr,v 1.52 2012/10/24 11:36:02 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,8 +39,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{Si vous avez démarré sur un média amovible (clé USB, disquette...), vous
-pouvez maintenant le retirer.
+{
}
message Keyboard_type {Type de clavier}
Index: src/distrib/utils/sysinst/arch/i386/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.36 src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.37
--- src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.36 Sat Mar 3 02:41:25 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.pl Wed Oct 24 11:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.36 2012/03/03 02:41:25 tsutsui Exp $ */
+/* $NetBSD: msg.md.pl,v 1.37 2012/10/24 11:36:02 tsutsui Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.24 2001/01/27 07:34:39 jmc Exp */
@@ -41,7 +41,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{Jesli uruchomiles komputer z dyskietki, mozesz ja teraz wyciagnac.
+{
}
message Keyboard_type {Keyboard type}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jdf
Date: Sun Sep 23 17:37:51 UTC 2012
Modified Files:
src/distrib/utils/sysinst: net.c
Log Message:
Prevent sysinst from setting an fqdn in rc.conf when the user entered no domain
(i.e., sets only the hostname). Fix for PR install/46946.
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/distrib/utils/sysinst/net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/net.c
diff -u src/distrib/utils/sysinst/net.c:1.132 src/distrib/utils/sysinst/net.c:1.133
--- src/distrib/utils/sysinst/net.c:1.132 Tue May 1 18:28:47 2012
+++ src/distrib/utils/sysinst/net.c Sun Sep 23 17:37:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.132 2012/05/01 18:28:47 riz Exp $ */
+/* $NetBSD: net.c,v 1.133 2012/09/23 17:37:51 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -435,9 +435,9 @@ recombine_host_domain(void)
strlcpy(recombined, net_host, sizeof(recombined));
- if (l <= 0 ||
+ if (strlen(net_domain) != 0 && (l <= 0 ||
net_host[l - 1] != '.' ||
- strcasecmp(net_domain, net_host + l) != 0) {
+ strcasecmp(net_domain, net_host + l) != 0)) {
/* net_host isn't an FQDN. */
strlcat(recombined, ".", sizeof(recombined));
strlcat(recombined, net_domain, sizeof(recombined));
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jdf
Date: Sat Sep 15 17:56:28 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.es
Log Message:
Add Spanish translations for sysinst's new configuration menu, plus adding a few
that were left previously.
Translation provided by jmmv.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/utils/sysinst/msg.mi.es
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.46 src/distrib/utils/sysinst/msg.mi.es:1.47
--- src/distrib/utils/sysinst/msg.mi.es:1.46 Fri Jul 6 21:10:56 2012
+++ src/distrib/utils/sysinst/msg.mi.es Sat Sep 15 17:56:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.46 2012/07/06 21:10:56 jdf Exp $ */
+/* $NetBSD: msg.mi.es,v 1.47 2012/09/15 17:56:28 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -125,7 +125,7 @@ sus discos.)
}
message mount_failed
-{Mounting %s failed. Continue?
+{No se ha podido montar %s. ¿Desea continuar?
}
message nodisk
@@ -703,8 +703,9 @@ message makedev
}
message badfs
-{Parece que /dev/%s%c no es un sistema de archivos BSD o el fsck no ha sido
-correcto. ¿Continuar? (Error número %d.)
+{Parece ser que /dev/%s%c no es un sistema de archivos BSD o bien el
+fsck ha fallado. ¿Desea montarlo de todos modos? (Código de error:
+%d.)
}
message rootmissing
@@ -920,8 +921,7 @@ message Upgrade_NetBSD_on_a_hard_disk {A
message Re_install_sets_or_install_additional_sets {Reinstalar conjuntos o instalar conjuntos adicionales}
message Reboot_the_computer {Reiniciar la computadora}
message Utility_menu {Menú de utilidades}
-/* XXX */
-message Config_menu {Menú de configuracion}
+message Config_menu {Menu de configuración}
message exit_utility_menu {Exit}
message NetBSD_VERSION_Utilities {Utilidades de NetBSD-@@VERSION@@}
message Run_bin_sh {Ejecutar /bin/sh}
@@ -1013,63 +1013,74 @@ actualizar /etc/mailer.conf usted mismo
de correo electrónico se envíen correctamente.}
message license
-{To use the network interface %s, you must agree to the license in
-file %s.
-To view this file now, you can type ^Z, look at the contents of
-the file and then type "fg" to resume.}
+{Para usar la interfaz de red %s, debe de aceptar la licencia en el archivo %s.
+Para ver este archivo ahora, pulse ^Z, mire el contendido del archivo, y luego
+teclee "fg" para continuar la instalación.}
message binpkg
-{To configure the binary package system, please choose the network location
-to fetch packages from. Once your system comes up, you can use 'pkgin'
-to install additional packages, or remove packages.}
-
+{Para configurar el sistema de paquetes binários, por favor escoja el
+sitio de red desde el cual descargar los paquetes. Una vez el sistema
+arranque, puede usar 'pkgin' para instalar paquetes adicionales, o
+eliminar paquetes ya instalados.}
+
message pkgpath
-{The following are the protocol, host, directory, user, and password that
-will be used. If "user" is "ftp", then the password is not needed.
+{Las siguientes entradas representan el protocolo, la máquina, el
+directorio, el usuario y la contraseña que se usarán. Si el "usuario"
+es "ftp", entonces la contraseña es opcional.
}
-message rcconf_backup_failed {Making backup of rc.conf failed. Continue?}
-message rcconf_backup_succeeded {rc.conf backup saved to %s.}
-message rcconf_restore_failed {Restoring backup rc.conf failed.}
-message rcconf_delete_failed {Deleting old %s entry failed.}
-message Pkg_dir {Package directory}
+message rcconf_backup_failed
+{Error al intentar hacer una cópia de seguridad de rc.conf. ¿Desea continuar?}
+message rcconf_backup_succeeded
+{La cópia de seguridad de rc.conf se ha guardado en %s.}
+message rcconf_restore_failed
+{La recuperación de rc.conf desde su cópia de seguridad ha fallado.}
+message rcconf_delete_failed {La eliminación del viejo %s ha fallado.}
+message Pkg_dir {Directorio del paquete}
message configure_prior {configure a prior installation of}
-message configure {configure}
-message change {change}
-message password_set {password set}
-message YES {YES}
+message configure {Configurar}
+message change {Cambiar}
+message password_set {Contraseña configurada}
+message YES {SI}
message NO {NO}
-message DONE {DONE}
-message abandoned {Abandoned}
-message empty {***EMPTY***}
-message timezone {Timezone}
-message change_rootpw {Change root password}
-message enable_binpkg {Enable installation of binary packages}
-message enable_sshd {Enable sshd}
-message enable_ntpd {Enable ntpd}
-message run_ntpdate {Run ntpdate at boot}
-message enable_mdnsd {Enable mdnsd}
-message configmenu {Configure the additional items as needed.}
-message doneconfig {Finished configuring}
-message Install_pkgin {Install pkgin and update package summary}
+message DONE {HECHO}
+message abandoned {Abandonado}
+m
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: joerg
Date: Thu Jul 19 06:07:21 UTC 2012
Modified Files:
src/distrib/utils/sysinst: util.c
Log Message:
Ensure that bakname and tempname have a defined value, even if the first
asprintf failed.
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.178 src/distrib/utils/sysinst/util.c:1.179
--- src/distrib/utils/sysinst/util.c:1.178 Tue May 8 13:51:34 2012
+++ src/distrib/utils/sysinst/util.c Thu Jul 19 06:07:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.178 2012/05/08 13:51:34 martin Exp $ */
+/* $NetBSD: util.c,v 1.179 2012/07/19 06:07:21 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1455,7 +1455,7 @@ del_rc_conf(const char *value)
{
FILE *fp, *nfp;
char buf[4096]; /* Ridiculously high, but should be enough in any way */
- char *rcconf, *tempname, *bakname;
+ char *rcconf, *tempname = NULL, *bakname = NULL;
char *cp;
int done = 0;
int fd;
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jdf
Date: Fri Jul 6 21:10:57 UTC 2012
Modified Files:
src/distrib/utils/sysinst: menus.mi msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl
Log Message:
Add translations for "Config menu" (was hardcoded before), best guesses for
French and Spanish.
Add translations for Polish config menu entries (provided by Marcin Piotr
Pawlowski).
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/utils/sysinst/menus.mi
cvs rdiff -u -r1.69 -r1.70 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.174 -r1.175 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.45 -r1.46 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.128 -r1.129 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.85 -r1.86 src/distrib/utils/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/menus.mi
diff -u src/distrib/utils/sysinst/menus.mi:1.46 src/distrib/utils/sysinst/menus.mi:1.47
--- src/distrib/utils/sysinst/menus.mi:1.46 Sat Apr 7 19:02:57 2012
+++ src/distrib/utils/sysinst/menus.mi Fri Jul 6 21:10:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.46 2012/04/07 19:02:57 jdf Exp $ */
+/* $NetBSD: menus.mi,v 1.47 2012/07/06 21:10:56 jdf Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -162,7 +162,7 @@ menu netbsd, title MSG_NetBSD_VERSION_In
option MSG_Reboot_the_computer, exit,
action (endwin) { system("/sbin/reboot -q"); };
option MSG_Utility_menu, sub menu utility;
- option "Config menu", action { do_configmenu(); };
+ option MSG_Config_menu, action { do_configmenu(); };
menu utility, title MSG_NetBSD_VERSION_Utilities, exit,
exitstring MSG_exit_utility_menu;
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.69 src/distrib/utils/sysinst/msg.mi.de:1.70
--- src/distrib/utils/sysinst/msg.mi.de:1.69 Fri Jul 6 09:12:16 2012
+++ src/distrib/utils/sysinst/msg.mi.de Fri Jul 6 21:10:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.69 2012/07/06 09:12:16 wiz Exp $ */
+/* $NetBSD: msg.mi.de,v 1.70 2012/07/06 21:10:56 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -955,6 +955,7 @@ message Upgrade_NetBSD_on_a_hard_disk {A
message Re_install_sets_or_install_additional_sets {Erneute Installation oder zusätzliche Pakete installieren}
message Reboot_the_computer {Computer neu starten}
message Utility_menu {Extras}
+message Config_menu {Konfigurationsmenü}
message exit_utility_menu {Zurück zum Hauptmenü}
message NetBSD_VERSION_Utilities {NetBSD-@@VERSION@@ Extras}
message Run_bin_sh {Ausführen von /bin/sh}
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.174 src/distrib/utils/sysinst/msg.mi.en:1.175
--- src/distrib/utils/sysinst/msg.mi.en:1.174 Fri Jul 6 09:12:16 2012
+++ src/distrib/utils/sysinst/msg.mi.en Fri Jul 6 21:10:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.174 2012/07/06 09:12:16 wiz Exp $ */
+/* $NetBSD: msg.mi.en,v 1.175 2012/07/06 21:10:56 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -895,6 +895,7 @@ message Upgrade_NetBSD_on_a_hard_disk {U
message Re_install_sets_or_install_additional_sets {Re-install sets or install additional sets}
message Reboot_the_computer {Reboot the computer}
message Utility_menu {Utility menu}
+message Config_menu {Config menu}
message exit_utility_menu {Back to main menu}
message NetBSD_VERSION_Utilities {NetBSD-@@VERSION@@ Utilities}
message Run_bin_sh {Run /bin/sh}
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.45 src/distrib/utils/sysinst/msg.mi.es:1.46
--- src/distrib/utils/sysinst/msg.mi.es:1.45 Fri Jul 6 09:12:17 2012
+++ src/distrib/utils/sysinst/msg.mi.es Fri Jul 6 21:10:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.45 2012/07/06 09:12:17 wiz Exp $ */
+/* $NetBSD: msg.mi.es,v 1.46 2012/07/06 21:10:56 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -920,6 +920,8 @@ message Upgrade_NetBSD_on_a_hard_disk {A
message Re_install_sets_or_install_additional_sets {Reinstalar conjuntos o instalar conjuntos adicionales}
message Reboot_the_computer {Reiniciar la computadora}
message Utility_menu {Menú de utilidades}
+/* XXX */
+message Config_menu {Menú de configuracion}
message exit_utility_menu {Exit}
message NetBSD_VERSION_Utilities {Utilidades de NetBSD-@@VERSION@@}
message Run_bin_sh {Ejecutar /bin/sh}
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.128 src/distrib/utils/sysinst/msg.mi.fr:1.129
--- src/distrib/utils/sysinst/msg.mi.fr:1.128 Fri Jul 6 09:12:17 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Fri Jul 6 21:10:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.128 2012/07/06 09:12:17 wiz Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.129 2012/07/06 21:10:56 jdf Exp $ */
/*
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: wiz
Date: Fri Jul 6 09:12:17 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.de msg.mi.en msg.mi.es msg.mi.fr
msg.mi.pl
Log Message:
>From Bug Hunting:
- add `-D' argument to `usage' lines;
- sort options;
- fix argument names and / or translations thereof.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.173 -r1.174 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.44 -r1.45 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.127 -r1.128 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.84 -r1.85 src/distrib/utils/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.68 src/distrib/utils/sysinst/msg.mi.de:1.69
--- src/distrib/utils/sysinst/msg.mi.de:1.68 Mon May 21 22:38:25 2012
+++ src/distrib/utils/sysinst/msg.mi.de Fri Jul 6 09:12:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.68 2012/05/21 22:38:25 jdf Exp $ */
+/* $NetBSD: msg.mi.de,v 1.69 2012/07/06 09:12:16 wiz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -35,7 +35,7 @@
/* MI Message catalog -- German, machine independent */
message usage
-{Aufruf: sysinst [-r Release] [-f Definitionsdatei]
+{Aufruf: sysinst [-D] [-f Definitionsdatei] [-r Version]
}
/*
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.173 src/distrib/utils/sysinst/msg.mi.en:1.174
--- src/distrib/utils/sysinst/msg.mi.en:1.173 Mon May 21 22:38:25 2012
+++ src/distrib/utils/sysinst/msg.mi.en Fri Jul 6 09:12:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.173 2012/05/21 22:38:25 jdf Exp $ */
+/* $NetBSD: msg.mi.en,v 1.174 2012/07/06 09:12:16 wiz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -35,7 +35,7 @@
/* MI Message catalog -- english, machine independent */
message usage
-{usage: sysinst [-r release] [-f definition-file]
+{usage: sysinst [-D] [-f definition_file] [-r release]
}
message sysinst_message_language
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.44 src/distrib/utils/sysinst/msg.mi.es:1.45
--- src/distrib/utils/sysinst/msg.mi.es:1.44 Mon May 21 22:38:25 2012
+++ src/distrib/utils/sysinst/msg.mi.es Fri Jul 6 09:12:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.44 2012/05/21 22:38:25 jdf Exp $ */
+/* $NetBSD: msg.mi.es,v 1.45 2012/07/06 09:12:17 wiz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -35,7 +35,7 @@
/* MI Message catalog -- spanish, machine independent */
message usage
-{uso: sysinst [-r versión] [-f fichero-definición]
+{uso: sysinst [-D] [-f fichero_definición] [-r versión]
}
/*
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.127 src/distrib/utils/sysinst/msg.mi.fr:1.128
--- src/distrib/utils/sysinst/msg.mi.fr:1.127 Mon May 21 22:38:26 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Fri Jul 6 09:12:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.127 2012/05/21 22:38:26 jdf Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.128 2012/07/06 09:12:17 wiz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -35,7 +35,7 @@
/* MI Message catalog -- french, machine independent */
message usage
-{utilisation : sysinst [-r version] [-f fichier de définition]
+{utilisation: sysinst [-D] [-f fichier_de_définition] [-r version]
}
/*
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.84 src/distrib/utils/sysinst/msg.mi.pl:1.85
--- src/distrib/utils/sysinst/msg.mi.pl:1.84 Mon May 21 22:38:26 2012
+++ src/distrib/utils/sysinst/msg.mi.pl Fri Jul 6 09:12:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.84 2012/05/21 22:38:26 jdf Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.85 2012/07/06 09:12:17 wiz Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -37,7 +37,7 @@
/* MI Message catalog -- polish, machine independent */
message usage
-{uzycie: sysinst [-r wersja] [-f plik-definicji]
+{uzycie: sysinst [-D] [-f plik_definicja] [-r wersja]
}
/*
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Sat Jun 23 17:49:58 UTC 2012
Modified Files:
src/distrib/utils/sysinst: main.c
Log Message:
Do not assign to a const pointer, but set the value of the target variable
instead. Makes sysinst at least start up again.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/distrib/utils/sysinst/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.65 src/distrib/utils/sysinst/main.c:1.66
--- src/distrib/utils/sysinst/main.c:1.65 Fri Jun 22 20:54:39 2012
+++ src/distrib/utils/sysinst/main.c Sat Jun 23 17:49:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.65 2012/06/22 20:54:39 abs Exp $ */
+/* $NetBSD: main.c,v 1.66 2012/06/23 17:49:58 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -128,15 +128,12 @@ init(void)
mnt2_mounted = 0;
fd_type = "msdos";
- for (arg = fflagopts; arg->name != NULL; arg++)
- if (arg->var == cdrom_dev) {
- const char **dfltptr = __UNCONST(&arg->dflt);
- *dfltptr = get_default_cdrom();
- break;
- }
-
- for (arg = fflagopts; arg->name != NULL; arg++)
- strlcpy(arg->var, arg->dflt, arg->size);
+ for (arg = fflagopts; arg->name != NULL; arg++) {
+ if (arg->var == cdrom_dev)
+ strlcpy(arg->var, get_default_cdrom(), arg->size);
+ else
+ strlcpy(arg->var, arg->dflt, arg->size);
+ }
pkg.xfer_type = pkgsrc.xfer_type = "http";
}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Sat Jun 23 14:06:02 UTC 2012
Modified Files:
src/distrib/utils/sysinst: disks.c
Log Message:
Trying to print a function pointer as a string is likely to cause tears.
While here, don't match on the unit either
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/distrib/utils/sysinst/disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.125 src/distrib/utils/sysinst/disks.c:1.126
--- src/distrib/utils/sysinst/disks.c:1.125 Fri Jun 22 16:54:39 2012
+++ src/distrib/utils/sysinst/disks.c Sat Jun 23 10:06:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.125 2012/06/22 20:54:39 abs Exp $ */
+/* $NetBSD: disks.c,v 1.126 2012/06/23 14:06:02 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -324,21 +324,24 @@ get_default_cdrom(void)
const char *cd_dev;
/* On error just use first entry in cdrom_devices */
- if (sysctlbyname(mib_name, NULL, &len, NULL, 0) != 0)
+ if (sysctlbyname(mib_name, NULL, &len, NULL, 0) == -1)
return cdrom_devices[0];
- if ((disknames = malloc(len)) == 0) /* skip on malloc fail */
+ if ((disknames = malloc(len + 2)) == 0) /* skip on malloc fail */
return cdrom_devices[0];
- sysctlbyname(mib_name, disknames, &len, NULL, 0);
+ (void)sysctlbyname(mib_name, disknames, &len, NULL, 0);
for ((name = strtok_r(disknames, " ", &last)); name;
(name = strtok_r(NULL, " ", &last))) {
- for (arg = cdrom_devices ; *arg ; ++arg ) {
+ for (arg = cdrom_devices; *arg; ++arg) {
cd_dev = *arg;
- if (strncmp(cd_dev, name, strlen(cd_dev) - 1) == 0) {
-free(disknames);
-return cd_dev;
- }
-
+ /* skip unit and partition */
+ if (strncmp(cd_dev, name, strlen(cd_dev) - 2) != 0)
+continue;
+ if (name != disknames)
+strcpy(disknames, name);
+ strcat(disknames, "a");
+ /* XXX: leaks, but so what? */
+ return disknames;
}
}
free(disknames);
@@ -814,7 +817,7 @@ make_fstab(void)
scripting_fprintf(f, "ptyfs\t\t/dev/pts\tptyfs\trw\n");
scripting_fprintf(f, "procfs\t\t/proc\tprocfs\trw\n");
scripting_fprintf(f, "/dev/%s\t\t/cdrom\tcd9660\tro,noauto\n",
- (char *)get_default_cdrom);
+ get_default_cdrom());
make_target_dir("/kern");
make_target_dir("/proc");
make_target_dir("/dev/pts");
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: abs
Date: Fri Jun 22 20:54:39 UTC 2012
Modified Files:
src/distrib/utils/sysinst: defs.h disks.c main.c
src/distrib/utils/sysinst/arch/emips: md.h
src/distrib/utils/sysinst/arch/i386: md.h
src/distrib/utils/sysinst/arch/vax: md.h
Log Message:
- Replace the CD_NAME definition with a CD_NAMES comma separate list,
the default remains "cd0a", but i386 sets "cd0a", "mcd0a" while vax
takes "cd0a", "racd0a"
- Add get_default_cdrom() to disks.c, which is called in init(). This
checks the contents of hw.disknames against CD_NAMES. The first one
found (minus partition letter) is picked, otherwise the first entry
in CD_NAMES is used
The primary beneficiary is vax systems with an MSCP but no SCSI CD
drive, which now default to (a valid) racd0a rather than an invalid
cd0a. The obvious example being simh-vax
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.124 -r1.125 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.64 -r1.65 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/emips/md.h
cvs rdiff -u -r1.68 -r1.69 src/distrib/utils/sysinst/arch/i386/md.h
cvs rdiff -u -r1.20 -r1.21 src/distrib/utils/sysinst/arch/vax/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.162 src/distrib/utils/sysinst/defs.h:1.163
--- src/distrib/utils/sysinst/defs.h:1.162 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/defs.h Fri Jun 22 20:54:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.162 2012/04/06 23:48:53 riz Exp $ */
+/* $NetBSD: defs.h,v 1.163 2012/06/22 20:54:39 abs Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -171,10 +171,8 @@ enum {
#define PI_ISBSDFS(p) ((p)->pi_fstype == FS_BSDLFS || \
(p)->pi_fstype == FS_BSDFFS)
-/* non-standard cd0 driver */
-#ifndef CD_NAME
-#define CD_NAME "cd0a"
-#endif
+/* standard cd0 device */
+#define CD_NAMES "cd0a"
/* Types */
typedef struct distinfo {
@@ -379,6 +377,7 @@ int md_update(void);
void toplevel(void);
/* from disks.c */
+const char *get_default_cdrom(void);
int find_disks(const char *);
struct menudesc;
void fmt_fspart(struct menudesc *, int, void *);
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.124 src/distrib/utils/sysinst/disks.c:1.125
--- src/distrib/utils/sysinst/disks.c:1.124 Mon May 21 22:38:26 2012
+++ src/distrib/utils/sysinst/disks.c Fri Jun 22 20:54:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.124 2012/05/21 22:38:26 jdf Exp $ */
+/* $NetBSD: disks.c,v 1.125 2012/06/22 20:54:39 abs Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -43,6 +43,7 @@
#include
#include
+#include
#include
#include
#include
@@ -305,6 +306,45 @@ done:
strcpy(dd->dd_descr, dd->dd_name);
}
+/* disknames - contains device names without partition letters
+ * cdrom_devices - contains devices including partition letters
+ * returns the first entry in hw.disknames matching a cdrom_device, or
+ * first entry on error or no match
+ */
+const char *
+get_default_cdrom(void)
+{
+ static const char *cdrom_devices[] = { CD_NAMES, 0};
+ static const char mib_name[] = "hw.disknames";
+ size_t len;
+ char *disknames;
+ char *last;
+ char *name;
+ const char **arg;
+ const char *cd_dev;
+
+ /* On error just use first entry in cdrom_devices */
+ if (sysctlbyname(mib_name, NULL, &len, NULL, 0) != 0)
+ return cdrom_devices[0];
+ if ((disknames = malloc(len)) == 0) /* skip on malloc fail */
+ return cdrom_devices[0];
+
+ sysctlbyname(mib_name, disknames, &len, NULL, 0);
+for ((name = strtok_r(disknames, " ", &last)); name;
+ (name = strtok_r(NULL, " ", &last))) {
+ for (arg = cdrom_devices ; *arg ; ++arg ) {
+ cd_dev = *arg;
+ if (strncmp(cd_dev, name, strlen(cd_dev) - 1) == 0) {
+free(disknames);
+return cd_dev;
+ }
+
+ }
+ }
+ free(disknames);
+ return cdrom_devices[0];
+}
+
static int
get_disks(struct disk_desc *dd)
{
@@ -773,7 +813,8 @@ make_fstab(void)
scripting_fprintf(f, "kernfs\t\t/kern\tkernfs\trw\n");
scripting_fprintf(f, "ptyfs\t\t/dev/pts\tptyfs\trw\n");
scripting_fprintf(f, "procfs\t\t/proc\tprocfs\trw\n");
- scripting_fprintf(f, "/dev/" CD_NAME "\t\t/cdrom\tcd9660\tro,noauto\n");
+ scripting_fprintf(f, "/dev/%s\t\t/cdrom\tcd9660\tro,noauto\n",
+ (char *)get_default_cdrom);
make_target_dir("/kern");
make_target_dir("/proc");
make_target_dir("/dev/pts");
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.64 src/distrib/utils/sysinst/main.c:1.65
--- src/distrib/utils/sysinst/main.c:1.64 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/main.c Fri Jun 22 20:54:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.64 2012/04/06 23:48:53 r
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Sat May 26 05:09:59 UTC 2012
Modified Files:
src/distrib/utils/sysinst: mbr.c
Log Message:
Fix regression by my dumb patch in PR/45990.
sysinst fails with "floating exception" after
changing MBR partition size in MBR editor menu
if the target disk doesn't have valid MBR partition
or has a valid partition 0 whose offset is not 1MB aligned
(like 63 sectors).
read_mbr() (which calls get_ptn_alignment()) is called
before set_bios_geom(), so bhead is not initialized there
and ptn_alignment could be zero.
To workaround, explicitly call get_ptn_alignment() again
in edit_mbr() to update ptn_alignemnt per BIOS geom values.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/distrib/utils/sysinst/mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.90 src/distrib/utils/sysinst/mbr.c:1.91
--- src/distrib/utils/sysinst/mbr.c:1.90 Sat Apr 7 03:08:33 2012
+++ src/distrib/utils/sysinst/mbr.c Sat May 26 05:09:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.90 2012/04/07 03:08:33 tsutsui Exp $ */
+/* $NetBSD: mbr.c,v 1.91 2012/05/26 05:09:59 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1271,6 +1271,7 @@ edit_mbr(mbr_info_t *mbri)
/* Ask full/part */
part = &mbrs->mbr_parts[0];
+ get_ptn_alignment(part); /* update ptn_alignment */
msg_display(MSG_fullpart, diskdev);
process_menu(MENU_fullpart, &usefull);
@@ -1477,7 +1478,7 @@ read_mbr(const char *disk, mbr_info_t *m
mbrp = &mbrs->mbr_parts[0];
if (ext_base == 0) {
- get_ptn_alignment(mbrp);
+ get_ptn_alignment(mbrp); /* get ptn_0_offset */
} else {
/* sanity check extended chain */
if (MBR_IS_EXTENDED(mbrp[0].mbrp_type))
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jdf
Date: Mon May 21 22:38:26 UTC 2012
Modified Files:
src/distrib/utils/sysinst: disks.c msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl
Log Message:
Changed returncodes to -1 of mount_disks in case of error (before, they were
inverted).
Add message mount_failed to be displayed when a mount fails, offering the
opportunity to go on anyway (fix for PR install/12020).
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.67 -r1.68 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.172 -r1.173 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.43 -r1.44 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.126 -r1.127 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.83 -r1.84 src/distrib/utils/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.123 src/distrib/utils/sysinst/disks.c:1.124
--- src/distrib/utils/sysinst/disks.c:1.123 Mon Jan 9 01:51:47 2012
+++ src/distrib/utils/sysinst/disks.c Mon May 21 22:38:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.123 2012/01/09 01:51:47 riz Exp $ */
+/* $NetBSD: disks.c,v 1.124 2012/05/21 22:38:26 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -805,8 +805,12 @@ foundffs(struct data *list, size_t num)
return error;
error = target_mount("", list[0].u.s_val, ' '-'a', list[1].u.s_val);
- if (error != 0)
- return error;
+ if (error != 0) {
+ msg_display(MSG_mount_failed, list[0].u.s_val);
+ process_menu(MENU_noyes, NULL);
+ if (!yesno)
+ return error;
+ }
return 0;
}
@@ -854,7 +858,9 @@ fsck_preen(const char *disk, int ptn, co
free(prog);
if (error != 0) {
msg_display(MSG_badfs, disk, ptn, error);
- process_menu(MENU_ok, NULL);
+ process_menu(MENU_noyes, NULL);
+ if (yesno)
+ error = 0;
/* XXX at this point maybe we should run a full fsck? */
}
return error;
@@ -966,7 +972,7 @@ mount_disks(void)
else {
error = mount_root();
if (error != 0 && error != EBUSY)
- return 0;
+ return -1;
}
/* Check the target /etc/fstab exists before trying to parse it. */
@@ -974,7 +980,7 @@ mount_disks(void)
target_file_exists_p("/etc/fstab") == 0) {
msg_display(MSG_noetcfstab, diskdev);
process_menu(MENU_ok, NULL);
- return 0;
+ return -1;
}
@@ -984,7 +990,7 @@ mount_disks(void)
/* error ! */
msg_display(MSG_badetcfstab, diskdev);
process_menu(MENU_ok, NULL);
- return 0;
+ return -1;
}
error = walk(fstab, (size_t)fstabsize, fstabbuf, numfstabbuf);
free(fstab);
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.67 src/distrib/utils/sysinst/msg.mi.de:1.68
--- src/distrib/utils/sysinst/msg.mi.de:1.67 Mon Apr 30 19:49:26 2012
+++ src/distrib/utils/sysinst/msg.mi.de Mon May 21 22:38:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.67 2012/04/30 19:49:26 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.68 2012/05/21 22:38:25 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -124,6 +124,9 @@ Wollen Sie die NetBSD Distributionssets
überschrieben werden!)
}
+message mount_failed
+{Versuch, %s zu mounten ist fehlgeschlagen. Fortfahren?
+}
message nodisk
{Ich kann keine für NetBSD nutzbaren Festplatten finden.
@@ -711,9 +714,9 @@ message makedev
message badfs
{Das Dateisystem auf /dev/%s%c scheint kein BSD-Dateisystem zu sein,
-die Prüfung des Dateisystems (fsck) ist fehlgeschlagen.
+die Prüfung des Dateisystems (fsck) ist fehlgeschlagen (Fehler %d).
-Die Aktualisierung wird abgebrochen. (Fehlernummer %d.)
+Die Aktualisierung trotzdem fortsetzen?
}
message rootmissing
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.172 src/distrib/utils/sysinst/msg.mi.en:1.173
--- src/distrib/utils/sysinst/msg.mi.en:1.172 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/msg.mi.en Mon May 21 22:38:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.172 2012/04/06 23:48:53 riz Exp $ */
+/* $NetBSD: msg.mi.en,v 1.173 2012/05/21 22:38:25 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -117,6 +117,9 @@ Do you really want to reinstall NetBSD d
disks.)
}
+message mount_failed
+{Mounting %s failed. Continue?
+}
message nodisk
{I can not find any hard disks for use by NetBSD. You will be
@@ -680,7 +683,7 @@ message makedev
message badfs
{It appears that /dev/%s%c is not a BSD file system or the fsck was
-not successful. The upgrade has been aborted. (Error number %d.)
+not successful. Try mounting it anyway? (Error number %d.)
}
message rootmissing
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.43 src/distrib/utils/sysinst/msg.mi.es:1.44
--- src/distrib/utils/sysinst/msg.mi.es:1.4
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jdf
Date: Tue May 15 15:50:58 UTC 2012
Modified Files:
src/distrib/utils/sysinst: checkrc.c configmenu.c
Log Message:
Adds a check to determine the root filesystem for determining the path of the
rc.conf. Without, the menu would fail as it tried to `chroot ""` (target_root
returns "" for / as root).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/checkrc.c
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/configmenu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/checkrc.c
diff -u src/distrib/utils/sysinst/checkrc.c:1.1 src/distrib/utils/sysinst/checkrc.c:1.2
--- src/distrib/utils/sysinst/checkrc.c:1.1 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/checkrc.c Tue May 15 15:50:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: checkrc.c,v 1.1 2012/04/06 23:48:53 riz Exp $ */
+/* $NetBSD: checkrc.c,v 1.2 2012/05/15 15:50:58 jdf Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -84,8 +84,12 @@ check(const char *varname, int filetoche
create_script(varname, filetocheck);
- collect(T_OUTPUT, &buf, "chroot %s /bin/sh %s 2>&1", target_prefix(),
- RC_CHECK_SCRIPT);
+ if (target_already_root())
+ collect(T_OUTPUT, &buf, "/bin/sh %s 2>&1", RC_CHECK_SCRIPT);
+ else
+ collect(T_OUTPUT, &buf, "chroot %s /bin/sh %s 2>&1",
+target_prefix(), RC_CHECK_SCRIPT);
+
unlink(target_expand(RC_CHECK_SCRIPT));
Index: src/distrib/utils/sysinst/configmenu.c
diff -u src/distrib/utils/sysinst/configmenu.c:1.4 src/distrib/utils/sysinst/configmenu.c:1.5
--- src/distrib/utils/sysinst/configmenu.c:1.4 Mon Apr 30 19:57:52 2012
+++ src/distrib/utils/sysinst/configmenu.c Tue May 15 15:50:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.4 2012/04/30 19:57:52 riz Exp $ */
+/* $NetBSD: configmenu.c,v 1.5 2012/05/15 15:50:58 jdf Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -133,9 +133,14 @@ get_rootsh(void)
if (buf != NULL)
free(buf);
- collect(T_OUTPUT, &buf,
- "chroot %s /usr/bin/awk -F: '$1==\"root\" { print $NF; exit }'"
- " /etc/passwd",target_prefix());
+ if (target_already_root())
+ collect(T_OUTPUT, &buf,
+ "/usr/bin/awk -F: '$1==\"root\" { print $NF; exit }'"
+ " /etc/passwd");
+ else
+ collect(T_OUTPUT, &buf,
+ "chroot %s /usr/bin/awk -F: '$1==\"root\" { print $NF; exit }'"
+ " /etc/passwd",target_prefix());
config_list[CONFIGOPT_ROOTSH].setting = (const char *)buf;
}
@@ -213,8 +218,12 @@ check_root_password(void)
char *buf;
int rval;
- collect(T_OUTPUT, &buf, "chroot %s getent passwd root | chroot %s cut -d: -f2",
- target_prefix(), target_prefix());
+ if (target_already_root())
+ collect(T_OUTPUT, &buf, "getent passwd root | cut -d: -f2");
+ else
+ collect(T_OUTPUT, &buf, "chroot %s getent passwd root | "
+ "chroot %s cut -d: -f2",
+ target_prefix(), target_prefix());
if (logfp)
fprintf(logfp,"buf %s strlen(buf) %zu\n", buf, strlen(buf));
CVS commit: src/distrib/utils/sysinst/arch/i386
Module Name:src
Committed By: martin
Date: Tue May 15 08:47:53 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/i386: msg.md.de
Log Message:
Tweak a few grammar errors
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/utils/sysinst/arch/i386/msg.md.de
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/i386/msg.md.de
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.de:1.22 src/distrib/utils/sysinst/arch/i386/msg.md.de:1.23
--- src/distrib/utils/sysinst/arch/i386/msg.md.de:1.22 Sat Mar 3 02:41:25 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.de Tue May 15 08:47:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.22 2012/03/03 02:41:25 tsutsui Exp $ */
+/* $NetBSD: msg.md.de,v 1.23 2012/05/15 08:47:53 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -55,22 +55,22 @@ message getboottype
Normale Bootblöcke benutzen die BIOS Konsolenschnittstelle als Konsole
(meistens der Monitor und die Tastatur). Serielle Bootblöcke benutzen den
-ersten seriellen Anschluss als Konsole.
+gewählten seriellen Anschluss als Konsole.
Selektierter Bootblock: }
message console_PC {BIOS Konsole}
-message console_com {Serieller Anschluss com%d mit %d baud}
+message console_com {Serielle Konsole an com%d mit %d baud}
message console_unchanged {Unverändert}
message Bootblocks_selection
{Auswahl der Bootblöcke}
-message Use_normal_bootblocks {BIOS Konsole benutzen}
-message Use_serial_com0 {Serieller Anschluss com0 benutzen}
-message Use_serial_com1 {Serieller Anschluss com1 benutzen}
-message Use_serial_com2 {Serieller Anschluss com2 benutzen}
-message Use_serial_com3 {Serieller Anschluss com3 benutzen}
-message serial_baud_rate {Serielle baud Rate}
+message Use_normal_bootblocks {BIOS Konsole}
+message Use_serial_com0 {Serielle Konsole an com0}
+message Use_serial_com1 {Serielle Konsole an com1}
+message Use_serial_com2 {Serielle Konsole an com2}
+message Use_serial_com3 {Serielle Konsole an com3}
+message serial_baud_rate {Serielle Geschwindigkeit wählen...}
message Use_existing_bootblocks {Vorhandene Bootblöcke benutzen}
message dobootblks
CVS commit: src/distrib/utils/sysinst/arch/sandpoint
Module Name:src Committed By: nisimura Date: Sat May 12 08:31:53 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/sandpoint: md.c Log Message: Add KURO-BOX/T4 support to sysinst. Tested good with the target machine. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/distrib/utils/sysinst/arch/sandpoint/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/sandpoint/md.c diff -u src/distrib/utils/sysinst/arch/sandpoint/md.c:1.39 src/distrib/utils/sysinst/arch/sandpoint/md.c:1.40 --- src/distrib/utils/sysinst/arch/sandpoint/md.c:1.39 Wed Jan 25 19:03:35 2012 +++ src/distrib/utils/sysinst/arch/sandpoint/md.c Sat May 12 08:31:52 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.39 2012/01/25 19:03:35 phx Exp $ */ +/* $NetBSD: md.c,v 1.40 2012/05/12 08:31:52 nisimura Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -77,7 +77,7 @@ md_init_set_status(int flags) prodname = malloc(len); sysctlbyname(mib_name, prodname, &len, NULL, 0); - if (strcmp(prodname, "kurobox") == 0) + if (strcmp(prodname, "kurobox")==0 || strcmp(prodname, "kurot4")==0) /* * Running on a KuroBox family product, so enable KUROBOX */ @@ -175,7 +175,7 @@ md_cleanup_install(void) * Set the console speed in /etc/ttys depending on the board. * The default speed is 115200, which is patched when needed. */ - if (strcmp(prodname, "kurobox") == 0) + if (strcmp(prodname, "kurobox")==0 || strcmp(prodname, "kurot4")==0) new_speed = 57600; /* KuroBox */ else if (strcmp(prodname, "dlink") == 0 || /* D-Link DSM-G600 */
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Tue May 8 13:51:34 UTC 2012
Modified Files:
src/distrib/utils/sysinst: util.c
Log Message:
Fix harmless error preventing auto-finding non-ISO9660 formatted CD
partitions (when offering sets from CD).
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.177 src/distrib/utils/sysinst/util.c:1.178
--- src/distrib/utils/sysinst/util.c:1.177 Mon Apr 9 23:18:31 2012
+++ src/distrib/utils/sysinst/util.c Tue May 8 13:51:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.177 2012/04/09 23:18:31 jdf Exp $ */
+/* $NetBSD: util.c,v 1.178 2012/05/08 13:51:34 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -431,7 +431,8 @@ get_available_cds(void)
if (error == 0) {
for (part = 0; part < label.d_npartitions; part++) {
if (label.d_partitions[part].p_fstype
-!= FS_ISO9660)
+ == FS_UNUSED
+|| label.d_partitions[part].p_size == 0)
continue;
if (label.d_partitions[part].p_fstype
== FS_ISO9660) {
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: riz
Date: Tue May 1 18:28:47 UTC 2012
Modified Files:
src/distrib/utils/sysinst: net.c
Log Message:
Check for del_rc_conf() == 0, not !del_rc_conf(), and fix a couple of
instances where the check was wrong. sysinst now properly saves dhcp
and host config again.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/distrib/utils/sysinst/net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/net.c
diff -u src/distrib/utils/sysinst/net.c:1.131 src/distrib/utils/sysinst/net.c:1.132
--- src/distrib/utils/sysinst/net.c:1.131 Fri Apr 6 23:48:54 2012
+++ src/distrib/utils/sysinst/net.c Tue May 1 18:28:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.131 2012/04/06 23:48:54 riz Exp $ */
+/* $NetBSD: net.c,v 1.132 2012/05/01 18:28:47 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1161,8 +1161,8 @@ mnt_net_config(void)
return;
/* Write hostname to /etc/rc.conf */
- if ((net_dhcpconf & DHCPCONF_HOST) == 0)
- if (del_rc_conf("hostname"))
+ if ((net_dhcpconf & DHCPCONF_HOST) == 0)
+ if (del_rc_conf("hostname") == 0)
add_rc_conf("hostname=%s\n", recombine_host_domain());
/* Copy resolv.conf to target. If DHCP was used to create it,
@@ -1227,17 +1227,19 @@ mnt_net_config(void)
fclose(hosts);
}
- if (!del_rc_conf("defaultroute"))
+ if (del_rc_conf("defaultroute") == 0)
add_rc_conf("defaultroute=\"%s\"\n", net_defroute);
} else {
- if (snprintf(ifconfig_str, sizeof ifconfig_str, "ifconfig_%s", net_dev) > 0
-&& del_rc_conf(ifconfig_str))
+ if (snprintf(ifconfig_str, sizeof ifconfig_str,
+ "ifconfig_%s", net_dev) > 0 &&
+ del_rc_conf(ifconfig_str) == 0) {
add_rc_conf("ifconfig_%s=dhcp\n", net_dev);
+ }
}
#ifdef INET6
if ((net_ip6conf & IP6CONF_AUTOHOST) != 0) {
- if (!del_rc_conf("ip6mode"))
+ if (del_rc_conf("ip6mode") == 0)
add_rc_conf("ip6mode=autohost\n");
if (ifconf != NULL) {
scripting_fprintf(NULL, "cat <>%s%s\n",
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: riz
Date: Mon Apr 30 19:57:52 UTC 2012
Modified Files:
src/distrib/utils/sysinst: configmenu.c
Log Message:
Don't have pkgin prompt before updating the database.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/configmenu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/configmenu.c
diff -u src/distrib/utils/sysinst/configmenu.c:1.3 src/distrib/utils/sysinst/configmenu.c:1.4
--- src/distrib/utils/sysinst/configmenu.c:1.3 Mon Apr 30 19:05:29 2012
+++ src/distrib/utils/sysinst/configmenu.c Mon Apr 30 19:57:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.3 2012/04/30 19:05:29 riz Exp $ */
+/* $NetBSD: configmenu.c,v 1.4 2012/04/30 19:57:52 riz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -270,7 +270,7 @@ set_binpkg(struct menudesc *menu, void *
replace("/usr/pkg/etc/pkgin/repositories.conf", pattern);
run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
- "/usr/pkg/bin/pkgin update");
+ "/usr/pkg/bin/pkgin -y update");
msg_display(MSG_binpkg_installed);
process_menu(MENU_ok, NULL);
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Mon Apr 30 19:49:26 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.de
Log Message:
Add missing white spaces at end of line (meaning forced line breaks)
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/distrib/utils/sysinst/msg.mi.de
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.66 src/distrib/utils/sysinst/msg.mi.de:1.67
--- src/distrib/utils/sysinst/msg.mi.de:1.66 Mon Apr 30 19:43:45 2012
+++ src/distrib/utils/sysinst/msg.mi.de Mon Apr 30 19:49:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.66 2012/04/30 19:43:45 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.67 2012/04/30 19:49:26 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -563,34 +563,34 @@ message net_media
message netok
{Nachfolgend sehen Sie die aktuellen Netzwerkeinstellungen.
-DNS-Domain: %s
-Hostname: %s
-Netzwerkadapter: %s
-IP-Adresse: %s
-Netzmaske: %s
-IPv4-Nameserver: %s
-IPv4-Gateway: %s
-Verbindungstyp: %s
+DNS-Domain: %s
+Hostname: %s
+Netzwerkadapter: %s
+IP-Adresse: %s
+Netzmaske: %s
+IPv4-Nameserver: %s
+IPv4-Gateway: %s
+Verbindungstyp: %s
}
message netok_slip
{Sie haben die folgenden Daten gewählt. Sind diese Daten OK?
-DNS-Domain: %s
-Hostname: %s
-Netzwerkadapter: %s
-IP-Adresse: %s
-IP-Adresse des Servers: %s
-Netzmaske: %s
-IPv4-Nameserver: %s
-IPv4-Gateway: %s
-Verbindungstyp: %s
+DNS-Domain: %s
+Hostname: %s
+Netzwerkadapter: %s
+IP-Adresse: %s
+IP-Adresse des Servers: %s
+Netzmaske: %s
+IPv4-Nameserver: %s
+IPv4-Gateway: %s
+Verbindungstyp: %s
}
message netokv6
{
-IPv6-Autokonfiguration: %s
-IPv6-Nameserver: %s
+IPv6-Autokonfiguration: %s
+IPv6-Nameserver: %s
}
message netok_ok
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Mon Apr 30 19:43:46 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.de
Log Message:
Translate enable_binpkg
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/distrib/utils/sysinst/msg.mi.de
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.65 src/distrib/utils/sysinst/msg.mi.de:1.66
--- src/distrib/utils/sysinst/msg.mi.de:1.65 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/msg.mi.de Mon Apr 30 19:43:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.65 2012/04/06 23:48:53 riz Exp $ */
+/* $NetBSD: msg.mi.de,v 1.66 2012/04/30 19:43:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1068,7 +1068,7 @@ message abandoned {Abgebrochen}
message empty {***LEER***}
message timezone {Zeitzone}
message change_rootpw {root-Passwort setzen}
-message enable_binpkg {Enable installation of binary packages}
+message enable_binpkg {Installation von Binärpaketen vorbereiten}
message enable_sshd {sshd aktivieren}
message enable_ntpd {ntpd aktivieren}
message run_ntpdate {ntpdate beim Starten ausführen}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: riz
Date: Mon Apr 30 19:05:30 UTC 2012
Modified Files:
src/distrib/utils/sysinst: configmenu.c
Log Message:
Check if the network is up before attempting to install pkgin. If not,
configure it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/configmenu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/configmenu.c
diff -u src/distrib/utils/sysinst/configmenu.c:1.2 src/distrib/utils/sysinst/configmenu.c:1.3
--- src/distrib/utils/sysinst/configmenu.c:1.2 Thu Apr 12 16:05:48 2012
+++ src/distrib/utils/sysinst/configmenu.c Mon Apr 30 19:05:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.2 2012/04/12 16:05:48 riz Exp $ */
+/* $NetBSD: configmenu.c,v 1.3 2012/04/30 19:05:29 riz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -248,6 +248,13 @@ set_binpkg(struct menudesc *menu, void *
char pattern[STRSIZE];
+ /* binary pkg config requires network at this point, so if
+ it's not already configured, do it. */
+ if (network_up == 0) {
+ if (config_network())
+ mnt_net_config();
+ }
+
process_menu(MENU_binpkg, NULL);
make_url(pkgpath, &pkg, pkg_dir);
if ( run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: riz
Date: Thu Apr 12 16:05:48 UTC 2012
Modified Files:
src/distrib/utils/sysinst: configmenu.c
Log Message:
Change the pkgin repository *before* running pkgin update. Spotted
by imil@.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/configmenu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/configmenu.c
diff -u src/distrib/utils/sysinst/configmenu.c:1.1 src/distrib/utils/sysinst/configmenu.c:1.2
--- src/distrib/utils/sysinst/configmenu.c:1.1 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/configmenu.c Thu Apr 12 16:05:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.1 2012/04/06 23:48:53 riz Exp $ */
+/* $NetBSD: configmenu.c,v 1.2 2012/04/12 16:05:48 riz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -258,12 +258,13 @@ set_binpkg(struct menudesc *menu, void *
return 0;
}
- run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
- "/usr/pkg/bin/pkgin update");
-
/* configure pkgin to use $pkgpath as a repository */
snprintf(pattern, STRSIZE, "s,^[^#].*$,%s,", pkgpath);
replace("/usr/pkg/etc/pkgin/repositories.conf", pattern);
+
+ run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
+ "/usr/pkg/bin/pkgin update");
+
msg_display(MSG_binpkg_installed);
process_menu(MENU_ok, NULL);
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jdf
Date: Mon Apr 9 23:18:31 UTC 2012
Modified Files:
src/distrib/utils/sysinst: util.c
Log Message:
Make sysinst not store the keyboard or network configuration used while
upgrading, as issued by PR install/35538.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.176 src/distrib/utils/sysinst/util.c:1.177
--- src/distrib/utils/sysinst/util.c:1.176 Sat Apr 7 19:02:57 2012
+++ src/distrib/utils/sysinst/util.c Mon Apr 9 23:18:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.176 2012/04/07 19:02:57 jdf Exp $ */
+/* $NetBSD: util.c,v 1.177 2012/04/09 23:18:31 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1083,11 +1083,13 @@ get_and_unpack_sets(int update, msg setu
if (set_status[SET_BASE] & SET_INSTALLED)
run_makedev();
- /* Save keybard type */
- save_kb_encoding();
+ if (!update) {
+ /* Save keybard type */
+ save_kb_encoding();
- /* Other configuration. */
- mnt_net_config();
+ /* Other configuration. */
+ mnt_net_config();
+ }
/* Mounted dist dir? */
umount_mnt2();
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: uebayasi
Date: Sun Apr 8 03:11:14 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.fr
Log Message:
Remove duplicate English text. Remove ^M. Fix build.
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/distrib/utils/sysinst/msg.mi.fr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.125 src/distrib/utils/sysinst/msg.mi.fr:1.126
--- src/distrib/utils/sysinst/msg.mi.fr:1.125 Sat Apr 7 23:25:18 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Sun Apr 8 03:11:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.125 2012/04/07 23:25:18 riz Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.126 2012/04/08 03:11:14 uebayasi Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -43,14 +43,14 @@ message usage
* before the locale is set up!
*/
message sysinst_message_language
-{Messages d'installation en français}
+{Messages d'installation en français}
message sysinst_message_locale
{fr_FR.ISO8859-15}
message Yes {Oui}
message No {Non}
-message All {Tous}
+message All {Tous}
message Some {Une partie}
message None {Aucun}
message none {aucun}
@@ -74,10 +74,10 @@ message hello
{Bienvenue dans Sysinst, l'outil d'installation de NetBSD-@@VERSION@@.
Cet utilitaire a été conçu pour vous aider à installer ou mettre à jour
NetBSD sur votre disque dur avec un minimum de travail.
-Dans les menus suivants, vous pourrez changer de sélection, soit en tapant la
-lettre en référence (a, b, c, d, ...) soit en utilisant les touches
+Dans les menus suivants, vous pourrez changer de sélection, soit en tapant la
+lettre en référence (a, b, c, d, ...) soit en utilisant les touches
flèches du clavier.
-La sélection courante est activée en appuyant sur la touche Entrée.
+La sélection courante est activée en appuyant sur la touche Entrée.
}
message thanks
@@ -88,26 +88,26 @@ message installusure
{Vous avez choisi d'installer NetBSD sur votre disque dur. Ceci va changer les
informations contenues sur ce dernier. Vous devriez faire une sauvegarde
complète de son contenu avant de poursuivre cette installation. Cette
-procédure va effectuer les actions suivantes :
+procédure va effectuer les actions suivantes :
a) Partitionner votre disque dur.
b) Créer de nouveaux systèmes de fichiers BSD.
c) Installer les différents composants.
(Une fois le partitionnement configuré, le système d'installation vous
-demandera de confirmer avant d'appliquer toute modification sur votre
-disque dur.
+demandera de confirmer avant d'appliquer toute modification sur votre
+disque dur.
Souhaitez-vous continuer ?
}
message upgradeusure
-{Mise à jour de NetBSD sur votre disque dur.
-Cela implique des modifications aux informations contenues
+{Mise à jour de NetBSD sur votre disque dur.
+Cela implique des modifications aux informations contenues
sur votre disque dur.
Vous devriez faire une sauvegarde complète de celui-ci avant de
continuer la procédure de mise à jour.
Voulez-vous vraiment mettre à jour NetBSD ?
(Ceci est le dernier avertissement avant que cette
-procédure ne modifie votre disque).
+procédure ne modifie votre disque).
}
message reinstallusure
@@ -124,16 +124,16 @@ ou une mise à jour avant de démarrer cet
Voulez-vous réellement réinstaller les composants NetBSD ?
(Ceci est le dernier avertissement avant que cette procédure ne commence à
-modifier vos disques).
+modifier vos disques).
}
message nodisk
-{Aucun disque utilisable par NetBSD n'a été trouvé.
-Retour au menu précédent.
+{Aucun disque utilisable par NetBSD n'a été trouvé.
+Retour au menu précédent.
}
message onedisk
-{Un seul disque a été trouvé : %s. Nous supposons que vous souhaitez
+{Un seul disque a été trouvé : %s. Nous supposons que vous souhaitez
%s NetBSD sur ce dernier.
}
@@ -166,10 +166,10 @@ message megname
message layout
{NetBSD utilise un "disklabel" BSD pour diviser la portion du disque réservée à
-NetBSD en plusieurs partitions. Vous devez paramétrer ce dernier.
+NetBSD en plusieurs partitions. Vous devez paramétrer ce dernier.
-Vous pouvez utiliser un éditeur afin de préciser la taille des partitions
-NetBSD, ou préserver la taille et le contenu des partitions existantes.
+Vous pouvez utiliser un éditeur afin de préciser la taille des partitions
+NetBSD, ou préserver la taille et le contenu des partitions existantes.
Vous aurez ensuite la possibilité d'éditer les champs du disklabel.
@@ -179,26 +179,26 @@ L'installation standard avec X requiert
}
message Choose_your_size_specifier
-{Si vous choisissez "Mégaoctets", la taille sera le plus proche de votre
-choix possible, arrondi au cylindre-près.
-Si vous choisissez "Secteurs", vous pourrez choisir précisément
+{Si vous choisissez "Mégaoctets", la taille sera le plus proche de votre
+choix possible
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: riz
Date: Sat Apr 7 23:25:18 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.fr
Log Message:
French translation of new strings, and some other fixes.
>From Matthew Mondor.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/distrib/utils/sysinst/msg.mi.fr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.124 src/distrib/utils/sysinst/msg.mi.fr:1.125
--- src/distrib/utils/sysinst/msg.mi.fr:1.124 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Sat Apr 7 23:25:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.124 2012/04/06 23:48:53 riz Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.125 2012/04/07 23:25:18 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -43,14 +43,14 @@ message usage
* before the locale is set up!
*/
message sysinst_message_language
-{Messages d'installation en francais}
+{Messages d'installation en français}
message sysinst_message_locale
{fr_FR.ISO8859-15}
message Yes {Oui}
message No {Non}
-message All {Tout}
+message All {Tous}
message Some {Une partie}
message None {Aucun}
message none {aucun}
@@ -74,10 +74,10 @@ message hello
{Bienvenue dans Sysinst, l'outil d'installation de NetBSD-@@VERSION@@.
Cet utilitaire a été conçu pour vous aider à installer ou mettre à jour
NetBSD sur votre disque dur avec un minimum de travail.
-Dans les menus suivants, vous pourrez changer de sélection soit en tapant la
-lettre en référence (a, b, c, d,...) soit en utilisant les touches
+Dans les menus suivants, vous pourrez changer de sélection, soit en tapant la
+lettre en référence (a, b, c, d, ...) soit en utilisant les touches
flèches du clavier.
-La sélection courante est activée en appuyant sur entrée.
+La sélection courante est activée en appuyant sur la touche Entrée.
}
message thanks
@@ -88,25 +88,26 @@ message installusure
{Vous avez choisi d'installer NetBSD sur votre disque dur. Ceci va changer les
informations contenues sur ce dernier. Vous devriez faire une sauvegarde
complète de son contenu avant de poursuivre cette installation. Cette
-procédure va mener les actions suivantes :
+procédure va effectuer les actions suivantes :
a) Partitionner votre disque dur.
b) Créer de nouveaux systèmes de fichiers BSD.
c) Installer les différents composants.
(Une fois le partitionnement configuré, le système d'installation vous
-demandera de confirmer avant de modifier votre disque dur.
+demandera de confirmer avant d'appliquer toute modification sur votre
+disque dur.
Souhaitez-vous continuer ?
}
message upgradeusure
-{Mettons maintenant à jour NetBSD sur votre disque dur.
-Comme d'habitude, cela va changer les informations contenues
+{Mise à jour de NetBSD sur votre disque dur.
+Cela implique des modifications aux informations contenues
sur votre disque dur.
Vous devriez faire une sauvegarde complète de celui-ci avant de
continuer la procédure de mise à jour.
Voulez-vous vraiment mettre à jour NetBSD ?
(Ceci est le dernier avertissement avant que cette
-procédure ne modifie votre disque.)
+procédure ne modifie votre disque).
}
message reinstallusure
@@ -123,16 +124,16 @@ ou une mise à jour avant de démarrer cet
Voulez-vous réellement réinstaller les composants NetBSD ?
(Ceci est le dernier avertissement avant que cette procédure ne commence à
-modifier vos disques.)
+modifier vos disques).
}
message nodisk
-{Nous ne trouvons aucun disque utilisable par NetBSD. Vous allez retourner
-au menu précédent.
+{Aucun disque utilisable par NetBSD n'a été trouvé.
+Retour au menu précédent.
}
message onedisk
-{Nous ne trouvons qu'un seul disque : %s. Nous supposons que vous souhaitez
+{Un seul disque a été trouvé : %s. Nous supposons que vous souhaitez
%s NetBSD sur ce dernier.
}
@@ -165,10 +166,10 @@ message megname
message layout
{NetBSD utilise un "disklabel" BSD pour diviser la portion du disque réservée à
-NetBSD en de multiples partitions. Vous devez paramétrer ce dernier.
+NetBSD en plusieurs partitions. Vous devez paramétrer ce dernier.
-Vous pouvez utiliser un éditeur pour préciser la taille des partitions NetBSD,
-ou garder la taille et le contenu des partitions existantes.
+Vous pouvez utiliser un éditeur afin de préciser la taille des partitions
+NetBSD, ou préserver la taille et le contenu des partitions existantes.
Vous aurez ensuite la possibilité d'éditer les champs du disklabel.
@@ -178,26 +179,26 @@ L'installation standard avec X requiert
}
message Choose_your_size_specifier
-{Si vous choisissez par "Mégaoctets", la taille sera proche de votre
-choix tout en conservant un nombre entier de cylindres.
-Si vous choisissez par "Secteurs", vous pourrez choisir précisément
+{Si vous choisissez "Mégaoctets", la taille sera le plus proche de
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jdf
Date: Sat Apr 7 19:02:57 UTC 2012
Modified Files:
src/distrib/utils/sysinst: menus.mi util.c
Log Message:
Fix for PR 45816: Restructuring the error menu when the CD ROM is missing.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/utils/sysinst/menus.mi
cvs rdiff -u -r1.175 -r1.176 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/menus.mi
diff -u src/distrib/utils/sysinst/menus.mi:1.45 src/distrib/utils/sysinst/menus.mi:1.46
--- src/distrib/utils/sysinst/menus.mi:1.45 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/menus.mi Sat Apr 7 19:02:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.45 2012/04/06 23:48:53 riz Exp $ */
+/* $NetBSD: menus.mi,v 1.46 2012/04/07 19:02:57 jdf Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -325,7 +325,7 @@ menu floppysource, y=-4, x=0, w=70, no b
clean_xfer_dir = yesno; };
menu cdromsource, y=-4, x=0, w=70, no box, no clear, exitstring MSG_Continue;
- display action { msg_display_add(MSG_cdromsource); };
+ display action { msg_display(MSG_cdromsource); };
option {src_legend(menu, MSG_Device, cdrom_dev);},
action { src_prompt(MSG_dev, cdrom_dev, sizeof cdrom_dev); };
option {src_legend(menu, MSG_Set_dir_bin, set_dir_bin);},
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.175 src/distrib/utils/sysinst/util.c:1.176
--- src/distrib/utils/sysinst/util.c:1.175 Fri Apr 6 23:48:54 2012
+++ src/distrib/utils/sysinst/util.c Sat Apr 7 19:02:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.175 2012/04/06 23:48:54 riz Exp $ */
+/* $NetBSD: util.c,v 1.176 2012/04/07 19:02:57 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -572,7 +572,7 @@ get_via_cdrom(void)
else {
umount_mnt2();
msg_display(MSG_cd_path_not_found);
- msg_display_add("\r\n\r\n");
+ process_menu(MENU_ok, NULL);
}
/* ask for paths on the CD */
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Sat Apr 7 03:08:33 UTC 2012
Modified Files:
src/distrib/utils/sysinst: mbr.c
Log Message:
Use 1MB alignment rather than the default 63 sectors for
fdisk partition boundary for >128GB disks, as fdisk(8) does.
No particular comments for my PR install/45990.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/distrib/utils/sysinst/mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.89 src/distrib/utils/sysinst/mbr.c:1.90
--- src/distrib/utils/sysinst/mbr.c:1.89 Thu Jan 5 21:29:24 2012
+++ src/distrib/utils/sysinst/mbr.c Sat Apr 7 03:08:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.89 2012/01/05 21:29:24 christos Exp $ */
+/* $NetBSD: mbr.c,v 1.90 2012/04/07 03:08:33 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -113,6 +113,10 @@ static int get_mapping(struct mbr_partit
daddr_t *);
static void convert_mbr_chs(int, int, int, uint8_t *, uint8_t *,
uint8_t *, uint32_t);
+static void get_ptn_alignment(struct mbr_partition *);
+
+static unsigned int ptn_alignment;
+static unsigned int ptn_0_offset;
/*
* Notes on the extended partition editor.
@@ -462,8 +466,9 @@ set_mbr_type(menudesc *m, void *arg)
return 0;
mbri->extended = ext;
ext->sector = mbrp->mbrp_start;
- ext->mbr.mbr_parts[0].mbrp_start = bsec;
- ext->mbr.mbr_parts[0].mbrp_size = mbrp->mbrp_size - bsec;
+ ext->mbr.mbr_parts[0].mbrp_start = ptn_0_offset;
+ ext->mbr.mbr_parts[0].mbrp_size =
+ mbrp->mbrp_size - ptn_0_offset;
}
mbrp->mbrp_type = type;
@@ -742,14 +747,14 @@ edit_mbr_size(menudesc *m, void *arg)
/* If unchanged, don't re-round size */
new = dflt;
else {
- /* Round end to cylinder boundary */
+ /* Round end to the partition alignment */
if (sizemult != 1) {
new *= sizemult;
-new += rounddown(start, current_cylsize);
-new = roundup(new, current_cylsize);
+new += rounddown(start, ptn_alignment);
+new = roundup(new, ptn_alignment);
new -= start;
while (new <= 0)
- new += current_cylsize;
+ new += ptn_alignment;
}
}
if (new > max)
@@ -1237,12 +1242,12 @@ mbr_use_wholedisk(mbr_info_t *mbri)
memset(&mbri->mbrb, 0, sizeof mbri->mbrb);
#endif
part[0].mbrp_type = MBR_PTYPE_NETBSD;
- part[0].mbrp_size = dlsize - bsec;
- part[0].mbrp_start = bsec;
+ part[0].mbrp_size = dlsize - ptn_0_offset;
+ part[0].mbrp_start = ptn_0_offset;
part[0].mbrp_flag = MBR_PFLAG_ACTIVE;
- ptstart = bsec;
- ptsize = dlsize - bsec;
+ ptstart = ptn_0_offset;
+ ptsize = dlsize - ptn_0_offset;
return 1;
}
@@ -1450,6 +1455,10 @@ read_mbr(const char *disk, mbr_info_t *m
*/
if (bsec == 0)
bsec = dlsec;
+ ptn_0_offset = bsec;
+ /* use 1MB default offset on large disks as fdisk(8) */
+ if (dlsize > 2048 * 1024 * 128)
+ ptn_0_offset = 2048;
memset(mbri, 0, sizeof *mbri);
@@ -1467,7 +1476,9 @@ read_mbr(const char *disk, mbr_info_t *m
break;
mbrp = &mbrs->mbr_parts[0];
- if (ext_base != 0) {
+ if (ext_base == 0) {
+ get_ptn_alignment(mbrp);
+ } else {
/* sanity check extended chain */
if (MBR_IS_EXTENDED(mbrp[0].mbrp_type))
break;
@@ -1547,9 +1558,9 @@ read_mbr(const char *disk, mbr_info_t *m
ext->sector = base;
ext->mbr.mbr_magic = htole16(MBR_MAGIC);
ext->mbr.mbr_parts[1] = mbrp[1];
-ext->mbr.mbr_parts[0].mbrp_start = bsec;
+ext->mbr.mbr_parts[0].mbrp_start = ptn_0_offset;
ext->mbr.mbr_parts[0].mbrp_size =
-ext_base + limit - base - bsec;
+ext_base + limit - base - ptn_0_offset;
mbrp[1].mbrp_type = MBR_PTYPE_EXT;
mbrp[1].mbrp_start = base - ext_base;
mbrp[1].mbrp_size = limit - mbrp[1].mbrp_start;
@@ -1850,3 +1861,36 @@ get_mapping(struct mbr_partition *parts,
return 0;
}
+
+/*
+ * Determine partition boundary alignment as fdisk(8) does.
+ */
+static void
+get_ptn_alignment(struct mbr_partition *mbrp0)
+{
+ uint32_t ptn_0_base, ptn_0_limit;
+
+ /* Default to using 'traditional' cylinder alignment */
+ ptn_alignment = bhead * bsec;
+ ptn_0_offset = bsec;
+
+ if (mbrp0->mbrp_type != 0) {
+ /* Try to copy offset of first partition */
+ ptn_0_base = le32toh(mbrp0->mbrp_start);
+ ptn_0_limit = ptn_0_base + le32toh(mbrp0->mbrp_size);
+ if (!(ptn_0_limit & 2047)) {
+ /* Partition ends on a 1MB boundary, align to 1MB */
+ ptn_alignment = 2048;
+ if (ptn_0_base <= 2048
+ && !(ptn_0_base & (ptn_0_base - 1))) {
+/* ptn_base is a power of 2, use it */
+ptn_0_offset = ptn_0_base;
+ }
+ }
+ } else {
+ /* Use 1MB offset for large (>128GB) disks */
+ if (dlsize > 2048 * 1024 * 128)
+ ptn_alignment = 2048;
+ ptn_0_offset = 2048;
+ }
+}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: riz
Date: Fri Apr 6 23:48:54 UTC 2012
Modified Files:
src/distrib/utils/sysinst: Makefile.inc defs.h install.c main.c
menus.mi msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl net.c
target.c util.c
Added Files:
src/distrib/utils/sysinst: checkrc.c configmenu.c
Log Message:
Implement a post-install configuration menu, as proposed on tech-install.
Enables the user to configure a few additional items, including using
pkgin to manage binary packages, in a post-install menu which replaces
the series of questions (Do you want to set a root password? etc).
This is by no means a perfect solution, nor should it discourage anyone
from working on more sweeping changes to sysinst.
Some bug fixes, and .de translation provided by Julian Fagir.
XXX .es, .fr and .pl translations still needed. Please help!
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/distrib/utils/sysinst/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/distrib/utils/sysinst/checkrc.c \
src/distrib/utils/sysinst/configmenu.c
cvs rdiff -u -r1.161 -r1.162 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.45 -r1.46 src/distrib/utils/sysinst/install.c
cvs rdiff -u -r1.63 -r1.64 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.44 -r1.45 src/distrib/utils/sysinst/menus.mi
cvs rdiff -u -r1.64 -r1.65 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.171 -r1.172 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.42 -r1.43 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.123 -r1.124 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.82 -r1.83 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.130 -r1.131 src/distrib/utils/sysinst/net.c
cvs rdiff -u -r1.54 -r1.55 src/distrib/utils/sysinst/target.c
cvs rdiff -u -r1.174 -r1.175 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/Makefile.inc
diff -u src/distrib/utils/sysinst/Makefile.inc:1.58 src/distrib/utils/sysinst/Makefile.inc:1.59
--- src/distrib/utils/sysinst/Makefile.inc:1.58 Sun Jan 8 21:20:40 2012
+++ src/distrib/utils/sysinst/Makefile.inc Fri Apr 6 23:48:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.58 2012/01/08 21:20:40 riz Exp $
+# $NetBSD: Makefile.inc,v 1.59 2012/04/06 23:48:53 riz Exp $
#
# Makefile for sysinst
@@ -13,7 +13,7 @@ WARNS= 4
SRCS+= menu_defs.c msg_defs.c main.c install.c upgrade.c \
txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
- label.c target.c md.c sizemultname.c
+ label.c target.c md.c sizemultname.c configmenu.c checkrc.c
SRCS+= ${MD_OPTIONS:MAOUT2ELF:S/AOUT2ELF/aout2elf.c/}
SRCS+= ${MENUS_MD:Mmenus.mbr:S/menus.mbr/mbr.c/}
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.161 src/distrib/utils/sysinst/defs.h:1.162
--- src/distrib/utils/sysinst/defs.h:1.161 Tue Jan 10 21:02:47 2012
+++ src/distrib/utils/sysinst/defs.h Fri Apr 6 23:48:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.161 2012/01/10 21:02:47 gson Exp $ */
+/* $NetBSD: defs.h,v 1.162 2012/04/06 23:48:53 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -133,6 +133,7 @@ enum {
SET_LAST,
SET_GROUP, /* Start of submenu */
SET_GROUP_END, /* End of submenu */
+SET_PKGSRC, /* pkgsrc, not counted as regular set */
};
/* Initialisers to select sets */
@@ -288,26 +289,50 @@ int clean_xfer_dir;
#define SYSINST_FTP_DIR "pub/NetBSD/NetBSD-" REL
#endif
+#if !defined(SYSINST_PKG_HOST)
+#define SYSINST_PKG_HOST SYSINST_FTP_HOST
+#endif
+
+#if !defined(SYSINST_PKG_DIR)
+#define SYSINST_PKG_DIR "pub/pkgsrc/packages/NetBSD"
+#endif
+
+#if !defined(SYSINST_PKGSRC_HOST)
+#define SYSINST_PKGSRC_HOST SYSINST_PKG_HOST
+#endif
+
/* Abs. path we extract binary sets from */
char ext_dir_bin[STRSIZE];
/* Abs. path we extract source sets from */
char ext_dir_src[STRSIZE];
+/* Abs. path we extract pkgsrc from */
+char ext_dir_pkgsrc[STRSIZE];
+
/* Place we look for binary sets in all fs types */
char set_dir_bin[STRSIZE];
/* Place we look for source sets in all fs types */
char set_dir_src[STRSIZE];
-struct {
+/* Place we look for pkgs in all fs types */
+char pkg_dir[STRSIZE];
+
+/* Place we look for pkgsrc in all fs types */
+char pkgsrc_dir[STRSIZE];
+
+struct ftpinfo {
char host[STRSIZE];
char dir[STRSIZE] ;
char user[SSTRSIZE];
char pass[STRSIZE];
char proxy[STRSIZE];
const char *xfer_type; /* "ftp" or "http" */
-} ftp;
+};
+
+/* use the same struct for sets ftp and to build pkgpath */
+struct ftpinfo ftp, pkg, pkgsrc;
int (*fetch_fn)(const char *);
char nfs_host[STRSIZE];
@@ -393,11 +418,14 @@ int get_geom(const char *, struct diskla
int get_real_geom(const char *, struct disklabel *);
/* from net.c */
+extern int network_up;
extern char net_namesvr6[STRSIZE];
int get_via_ftp(const char *);
i
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: matt
Date: Wed Mar 21 05:43:55 UTC 2012
Modified Files:
src/distrib/utils/sysinst: util.c
src/distrib/utils/sysinst/arch/evbmips: md.c
Log Message:
Use C89 function definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/distrib/utils/sysinst/util.c
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/evbmips/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.173 src/distrib/utils/sysinst/util.c:1.174
--- src/distrib/utils/sysinst/util.c:1.173 Tue Jan 10 21:02:47 2012
+++ src/distrib/utils/sysinst/util.c Wed Mar 21 05:43:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.173 2012/01/10 21:02:47 gson Exp $ */
+/* $NetBSD: util.c,v 1.174 2012/03/21 05:43:55 matt Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -409,7 +409,7 @@ get_iso9660_volname(int dev, int sess, c
* the number of entries collected.
*/
static int
-get_available_cds()
+get_available_cds(void)
{
char dname[16], volname[80];
struct cd_info *info = cds;
Index: src/distrib/utils/sysinst/arch/evbmips/md.c
diff -u src/distrib/utils/sysinst/arch/evbmips/md.c:1.9 src/distrib/utils/sysinst/arch/evbmips/md.c:1.10
--- src/distrib/utils/sysinst/arch/evbmips/md.c:1.9 Fri Nov 4 11:27:02 2011
+++ src/distrib/utils/sysinst/arch/evbmips/md.c Wed Mar 21 05:43:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2012/03/21 05:43:55 matt Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -160,7 +160,7 @@ md_mbr_use_wholedisk(mbr_info_t *mbri)
}
int
-md_pre_mount()
+md_pre_mount(void)
{
return 0;
}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Sat Mar 3 03:06:30 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.en msg.mi.es msg.mi.pl
src/distrib/utils/sysinst/arch/i386: msg.md.en
src/distrib/utils/sysinst/arch/mac68k: msg.md.en
Log Message:
Remove trailing whitespaces where explicit line break is not necessary:
- paragraph break (two newlines)
- list indent (leading tab)
XXX: msgc(1) lacks description about formatings.
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.41 -r1.42 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.81 -r1.82 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.62 -r1.63 src/distrib/utils/sysinst/arch/i386/msg.md.en
cvs rdiff -u -r1.22 -r1.23 src/distrib/utils/sysinst/arch/mac68k/msg.md.en
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.170 src/distrib/utils/sysinst/msg.mi.en:1.171
--- src/distrib/utils/sysinst/msg.mi.en:1.170 Thu Mar 1 16:22:13 2012
+++ src/distrib/utils/sysinst/msg.mi.en Sat Mar 3 03:06:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.170 2012/03/01 16:22:13 mbalmer Exp $ */
+/* $NetBSD: msg.mi.en,v 1.171 2012/03/03 03:06:30 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -84,9 +84,9 @@ message thanks
message installusure
{You have chosen to install NetBSD on your hard disk. This will change
information on your hard disk. You should have made a full backup
-before this procedure! This procedure will do the following things:
- a) Partition your disk
- b) Create new BSD file systems
+before this procedure! This procedure will do the following things:
+ a) Partition your disk
+ b) Create new BSD file systems
c) Load and install distribution sets
d) Some initial system configuration
@@ -157,10 +157,10 @@ message megname
message layout
{NetBSD uses a BSD disklabel to carve up the NetBSD portion of the disk
-into multiple BSD partitions. You must now set up your BSD disklabel.
+into multiple BSD partitions. You must now set up your BSD disklabel.
You can use a simple editor to set the sizes of the NetBSD partitions,
-or keep the existing partition sizes and contents.
+or keep the existing partition sizes and contents.
You will then be given the opportunity to change any of the disklabel
fields.
@@ -347,7 +347,7 @@ message packname
message lastchance
{Ok, we are now ready to install NetBSD on your hard disk (%s). Nothing has been
written yet. This is your last chance to quit this process before anything
-gets changed.
+gets changed.
Shall we continue?
}
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.41 src/distrib/utils/sysinst/msg.mi.es:1.42
--- src/distrib/utils/sysinst/msg.mi.es:1.41 Sat Mar 3 02:34:13 2012
+++ src/distrib/utils/sysinst/msg.mi.es Sat Mar 3 03:06:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.41 2012/03/03 02:34:13 tsutsui Exp $ */
+/* $NetBSD: msg.mi.es,v 1.42 2012/03/03 03:06:30 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -90,7 +90,7 @@ message installusure
{Ha escogido instalar NetBSD en su disco duro. Esto cambiará información
de su disco duro. ¡Debería haber hecho una copia de seguridad completa
antes de este procedimiento! Este procedimiento realizará las siguientes
-operaciones:
+operaciones:
a) Particionar su disco
b) Crear nuevos sistemas de ficheros BSD
c) Cargar e instalar los conjuntos de distribución
@@ -164,7 +164,7 @@ message megname
message layout
{NetBSD usa una etiqueta de BSD para dividir la porción NetBSD del disco
-en varias particiones BSD. Ahora debería configurar su etiqueta BSD.
+en varias particiones BSD. Ahora debería configurar su etiqueta BSD.
Puede usar un simple editor para establecer los tamaños de las particiones
NetBSD, o mantener los tamaños de partición y contenidos actuales.
@@ -355,7 +355,7 @@ message packname
message lastchance
{Bien, todo está preparado para instalar NetBSD en su disco duro (%s).
Todavía no se ha escrito nada. Ésta es su última oportunidad para salir
-del proceso antes de que se cambie nada.
+del proceso antes de que se cambie nada.
¿Desea continuar?
}
@@ -710,7 +710,7 @@ message rootmissing
message badroot
{El nuevo sistema de archivos raíz no ha pasado la comprobación básica.
- ¿Está seguro de que ha instalado todos los conjuntos requeridos?
+ ¿Está seguro de que ha instalado todos los conjuntos requeridos?
}
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.81 src/distrib/utils/sysinst/msg.mi.pl:1.82
--- src/distrib/utils/sysinst/msg.mi.pl:1.81 Sat Mar 3 02:34:13 2012
+++ src/distrib/utils/sysinst/msg.mi.pl Sat Mar 3 03:06:30 2012
@@ -1,4 +1,4 @@
-/*
CVS commit: src/distrib/utils/sysinst/arch/hp300
Module Name:src
Committed By: tsutsui
Date: Sat Mar 3 02:46:14 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/hp300: msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Log Message:
Remove unused pasto messages. No Human68k on hp300.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/hp300/msg.md.de
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/hp300/msg.md.en
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/hp300/msg.md.es
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/hp300/msg.md.fr \
src/distrib/utils/sysinst/arch/hp300/msg.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/hp300/msg.md.de
diff -u src/distrib/utils/sysinst/arch/hp300/msg.md.de:1.6 src/distrib/utils/sysinst/arch/hp300/msg.md.de:1.7
--- src/distrib/utils/sysinst/arch/hp300/msg.md.de:1.6 Thu Mar 1 16:22:14 2012
+++ src/distrib/utils/sysinst/arch/hp300/msg.md.de Sat Mar 3 02:46:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.6 2012/03/01 16:22:14 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.7 2012/03/03 02:46:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -49,14 +49,6 @@ message dobootblks
{Installiere die Bootblöcke auf %s ...
}
-message newdisk
-{Ihre Festplatte, %s, scheint nicht als x68k Festplatte markiert zu sein;
-sysinst wird dies nun tun.
-Falls Sie planen eine Partition der Festplatte %s mit Human68k zu nutzen,
-sollten Sie hier unbedingt abbrechen und die Festplatte mit dem Human68k
-format.x Werkzeug formatieren.
-}
-
message ordering
{Die Anordnung der Partition %c ist falsch. Erneut editieren?}
Index: src/distrib/utils/sysinst/arch/hp300/msg.md.en
diff -u src/distrib/utils/sysinst/arch/hp300/msg.md.en:1.8 src/distrib/utils/sysinst/arch/hp300/msg.md.en:1.9
--- src/distrib/utils/sysinst/arch/hp300/msg.md.en:1.8 Mon Apr 4 08:30:28 2011
+++ src/distrib/utils/sysinst/arch/hp300/msg.md.en Sat Mar 3 02:46:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.8 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.9 2012/03/03 02:46:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -48,13 +48,6 @@ message dobootblks
{Installing boot blocks on %s
}
-message newdisk
-{It appears that your disk, %s, has no X68K disk mark. sysinst is
-writing a disk mark.
-Note that if you plan to use a part of %s from Human68k, you should abort
-here and format the disk with Human68k format.x utility.
-}
-
message ordering
{The order of partition %c is wrong. Edit again?}
Index: src/distrib/utils/sysinst/arch/hp300/msg.md.es
diff -u src/distrib/utils/sysinst/arch/hp300/msg.md.es:1.4 src/distrib/utils/sysinst/arch/hp300/msg.md.es:1.5
--- src/distrib/utils/sysinst/arch/hp300/msg.md.es:1.4 Mon Apr 4 08:30:28 2011
+++ src/distrib/utils/sysinst/arch/hp300/msg.md.es Sat Mar 3 02:46:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.4 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.5 2012/03/03 02:46:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -48,13 +48,6 @@ message dobootblks
{Instalando bloques de arranque en %s
}
-message newdisk
-{Parece que su disco, %s, no tiene una marca de disco X68K. sysinst
-escribirá una marca de disco.
-Note que si pretende usar una parte de %s desde Human68k, debería abortar
-aqui y formatear el disco con la utilidad format.x de Human68k.
-}
-
message ordering
{El orden de la partición %c esta mal. ¿Editar de nuevo?}
Index: src/distrib/utils/sysinst/arch/hp300/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/hp300/msg.md.fr:1.7 src/distrib/utils/sysinst/arch/hp300/msg.md.fr:1.8
--- src/distrib/utils/sysinst/arch/hp300/msg.md.fr:1.7 Mon Apr 4 08:30:28 2011
+++ src/distrib/utils/sysinst/arch/hp300/msg.md.fr Sat Mar 3 02:46:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.7 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.fr,v 1.8 2012/03/03 02:46:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -47,13 +47,6 @@ message dobootblks
{Installation des blocs de démarrage sur %s ...
}
-message newdisk
-{Il apparaît que votre disque, %s, n'a pas de marque de disque X68K. sysinst
-écrit une marque de disque.
-Si vous comptez utiliser une partie de %s depuis Human68k, vous devriez annuler
-maintenant et formater le disque avec l'utilitaire format.x de Human68k.
-}
-
message ordering
{L'ordre de la partition %c est erroné. Modifier à nouveau ?}
Index: src/distrib/utils/sysinst/arch/hp300/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/hp300/msg.md.pl:1.7 src/distrib/utils/sysinst/arch/hp300/msg.md.pl:1.8
--- src/distrib/utils/sysinst/arch/hp300/msg.md.pl:1.7 Mon Apr 4 08:30:28 2011
+++ src/distrib/utils/sysinst/arch/hp300/msg.md.pl Sat Mar 3 02:46:13 2012
@@ -1,4 +1,4 @@
-/* $N
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: tsutsui
Date: Sat Mar 3 02:41:26 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/arc: msg.md.en
src/distrib/utils/sysinst/arch/cobalt: msg.md.en
src/distrib/utils/sysinst/arch/i386: msg.md.de msg.md.pl
src/distrib/utils/sysinst/arch/mac68k: msg.md.de msg.md.pl
src/distrib/utils/sysinst/arch/ofppc: msg.md.en msg.md.es msg.md.pl
src/distrib/utils/sysinst/arch/prep: msg.md.en msg.md.es msg.md.pl
Log Message:
Remove trailing whitespaces in messages where line break is not expected.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/arch/arc/msg.md.en
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/cobalt/msg.md.en
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/sysinst/arch/i386/msg.md.de
cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/sysinst/arch/i386/msg.md.pl
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/mac68k/msg.md.de
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/arch/mac68k/msg.md.pl
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/ofppc/msg.md.en \
src/distrib/utils/sysinst/arch/ofppc/msg.md.es \
src/distrib/utils/sysinst/arch/ofppc/msg.md.pl
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/arch/prep/msg.md.en \
src/distrib/utils/sysinst/arch/prep/msg.md.pl
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/prep/msg.md.es
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/arc/msg.md.en
diff -u src/distrib/utils/sysinst/arch/arc/msg.md.en:1.13 src/distrib/utils/sysinst/arch/arc/msg.md.en:1.14
--- src/distrib/utils/sysinst/arch/arc/msg.md.en:1.13 Thu Mar 1 16:22:14 2012
+++ src/distrib/utils/sysinst/arch/arc/msg.md.en Sat Mar 3 02:41:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.13 2012/03/01 16:22:14 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.14 2012/03/03 02:41:25 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -70,7 +70,7 @@ It needs to be at least 1MB in size, how
recommended.}
message nobootpartdisklabel
-{There is no boot partition in the disklabel. The boot partition should
+{There is no boot partition in the disklabel. The boot partition should
match the boot partition you set up in the MBR partition table.}
message copybootloader
Index: src/distrib/utils/sysinst/arch/cobalt/msg.md.en
diff -u src/distrib/utils/sysinst/arch/cobalt/msg.md.en:1.6 src/distrib/utils/sysinst/arch/cobalt/msg.md.en:1.7
--- src/distrib/utils/sysinst/arch/cobalt/msg.md.en:1.6 Thu Mar 1 16:22:14 2012
+++ src/distrib/utils/sysinst/arch/cobalt/msg.md.en Sat Mar 3 02:41:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.6 2012/03/01 16:22:14 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.7 2012/03/03 02:41:25 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -69,7 +69,7 @@ It needs to be at least 1MB in size, how
recommended.}
message nobootpartdisklabel
-{There is no boot partition in the disklabel. The boot partition should
+{There is no boot partition in the disklabel. The boot partition should
match the boot partition you set up in the MBR partition table.}
message copybootloader
Index: src/distrib/utils/sysinst/arch/i386/msg.md.de
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.de:1.21 src/distrib/utils/sysinst/arch/i386/msg.md.de:1.22
--- src/distrib/utils/sysinst/arch/i386/msg.md.de:1.21 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.de Sat Mar 3 02:41:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.21 2012/03/01 16:22:15 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.22 2012/03/03 02:41:25 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -133,7 +133,7 @@ booten. Sind Sie sicher, dass Sie fortfa
message missing_bootmenu_text
-{Sie haben mehr als ein Betriebssystem auf dieser Festplatte; allerdings ist kein
+{Sie haben mehr als ein Betriebssystem auf dieser Festplatte; allerdings ist kein
'bootmenu' (Eintrag für den NetBSD Bootloader) für die aktive Partition und/oder
der Partition vorhanden, auf die NetBSD installiert werden soll.
@@ -151,7 +151,7 @@ Sind Sie sicher, dass Sie dennoch fortfa
gelangen.)}
message installbootsel
-{Ihre Konfiguration benötigt den NetBSD Bootselect (Bootauswahl) Code, um
+{Ihre Konfiguration benötigt den NetBSD Bootselect (Bootauswahl) Code, um
das zu startende Betriebssystem beim Start des Computers zu wählen.
Dieser ist gegenwärtig noch nicht installiert; wollen Sie dies jetzt tun?}
Index: src/distrib/utils/sysinst/arch/i386/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.35 src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.36
--- src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.35 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.pl Sat Mar 3 02:41:25 2012
@@ -1,4 +1,4 @@
-/* $NetBS
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Sat Mar 3 02:34:13 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.de msg.mi.es msg.mi.fr msg.mi.pl
Log Message:
Remove trailing whitespaces in messages where line break is not expected.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.40 -r1.41 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.122 -r1.123 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.80 -r1.81 src/distrib/utils/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.63 src/distrib/utils/sysinst/msg.mi.de:1.64
--- src/distrib/utils/sysinst/msg.mi.de:1.63 Thu Mar 1 17:27:29 2012
+++ src/distrib/utils/sysinst/msg.mi.de Sat Mar 3 02:34:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.63 2012/03/01 17:27:29 tsutsui Exp $ */
+/* $NetBSD: msg.mi.de,v 1.64 2012/03/03 02:34:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -683,7 +683,7 @@ Bitte korrigieren Sie dies, bevor Sie fo
Eine Möglichkeit ist es, im Extras-Menü eine Shell zu starten,
wodurch Sie %s/bin/X.old überprüfen können. Gehört diese Datei zu
-einer früheren Aktualisierung, so können Sie diese mit rm -f
+einer früheren Aktualisierung, so können Sie diese mit rm -f
%s/bin/x.old löschen und danach die Aktualisierung neu starten.
Gehört die Datei %s/bin/X.old aber zu einer aktuellen,
abgebrochenen Aktualisierung, so können Sie die Datei %s/bin/X mit
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.40 src/distrib/utils/sysinst/msg.mi.es:1.41
--- src/distrib/utils/sysinst/msg.mi.es:1.40 Thu Mar 1 16:22:13 2012
+++ src/distrib/utils/sysinst/msg.mi.es Sat Mar 3 02:34:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.40 2012/03/01 16:22:13 mbalmer Exp $ */
+/* $NetBSD: msg.mi.es,v 1.41 2012/03/03 02:34:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -869,7 +869,7 @@ message tz_back
message swapactive
{El disco que ha seleccionado tiene una partición de intercambio (swap) que
-puede que esté en uso actualmente si su sistema tiene poca memoria. Como
+puede que esté en uso actualmente si su sistema tiene poca memoria. Como
se dispone a reparticionar este disco, esta partición swap será desactivada
ahora. Se advierte de que esto puede conducir a problemas de swap.
Si obtuviera algun error, reinicie el sistema e inténtelo de nuevo.}
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.122 src/distrib/utils/sysinst/msg.mi.fr:1.123
--- src/distrib/utils/sysinst/msg.mi.fr:1.122 Sat Mar 3 02:26:45 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Sat Mar 3 02:34:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.122 2012/03/03 02:26:45 tsutsui Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.123 2012/03/03 02:34:13 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1068,6 +1068,6 @@ choisissez "Non", vous devez mettre à jo
}
message license
-{Afin d'utiliser l'interface réseau : %s, vous devez accepter la licence
+{Afin d'utiliser l'interface réseau : %s, vous devez accepter la licence
contenue dans le fichier %s.
Pour afficher ce fichier, tapez ^Z, lisez le puis tapez "fg" pour reprendre.}
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.80 src/distrib/utils/sysinst/msg.mi.pl:1.81
--- src/distrib/utils/sysinst/msg.mi.pl:1.80 Thu Mar 1 17:40:31 2012
+++ src/distrib/utils/sysinst/msg.mi.pl Sat Mar 3 02:34:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.80 2012/03/01 17:40:31 tsutsui Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.81 2012/03/03 02:34:13 tsutsui Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -113,7 +113,7 @@ message reinstallusure
Ta procedura tylko sciaga i rozpakowuje pakiety na pre-partycjonowany
bootowalny dysk. Nie nazywa dyskow, aktualizuje bootblokow, lub zapisuje
istniejacej konfiguracji. (Wyjdz i wybierz `instaluj' lub
-`aktualizuj' jesli chcesz to zrobic.) Powinienes wykonac `instaluj' lub
+`aktualizuj' jesli chcesz to zrobic.) Powinienes wykonac `instaluj' lub
`aktualizuj' przed rozpoczeciem tej procedury!
Czy napewno chcesz przeinstalowac pakiety dystrybucjne NetBSD?
@@ -160,7 +160,7 @@ message megname
{MB}
message layout
-{NetBSD uzywa BSD disklabel aby pociac czesc dysku NetBSD na kilka
+{NetBSD uzywa BSD disklabel aby pociac czesc dysku NetBSD na kilka
partycji BSD. Musisz teraz skonfigurowac BSD disklabel.
Masz kilka mozliwosci. Sa one opisane ponizej.
-- Standard: partycje BSD disklabel sa ustawiane przez ten program.
@@ -185,7 +185,7 @@ Wybierz specyfikator rozmiaru}
message ptnsizes
{Mozesz teraz zmienic rozmiary partycji
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Sat Mar 3 02:26:45 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.fr
Log Message:
Remove (harmless) trailing tab.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/distrib/utils/sysinst/msg.mi.fr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.121 src/distrib/utils/sysinst/msg.mi.fr:1.122
--- src/distrib/utils/sysinst/msg.mi.fr:1.121 Thu Mar 1 17:40:31 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Sat Mar 3 02:26:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.121 2012/03/01 17:40:31 tsutsui Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.122 2012/03/03 02:26:45 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -943,7 +943,7 @@ sur le disque cible pour l'installation.
à nouveau.
}
-message rootpw
+message rootpw
{
Aucun mot de passe pour le compte root n'a été défini.
Nous vous recommandons de spéficier un mot de passe dès à présent.
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: tsutsui
Date: Thu Mar 1 18:08:56 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/mac68k: msg.md.de msg.md.en msg.md.es
src/distrib/utils/sysinst/arch/x68k: msg.md.pl
Log Message:
Remove trailing spaces not in message format.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/mac68k/msg.md.de
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/sysinst/arch/mac68k/msg.md.en
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/mac68k/msg.md.es
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/x68k/msg.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/mac68k/msg.md.de
diff -u src/distrib/utils/sysinst/arch/mac68k/msg.md.de:1.7 src/distrib/utils/sysinst/arch/mac68k/msg.md.de:1.8
--- src/distrib/utils/sysinst/arch/mac68k/msg.md.de:1.7 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/mac68k/msg.md.de Thu Mar 1 18:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.7 2012/03/01 16:22:15 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.8 2012/03/01 18:08:56 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -169,7 +169,7 @@ Festplatte geschrieben wurde, wird Sie b
Bitte starten Sie daher jetzt den Computer neu und führen Sie die Installation
erneut aus.
}
-
+
.if debug
message mapdebug
{Partitions Übersicht:
@@ -234,7 +234,7 @@ message parttable_fix_fixing
message parttable_fix_fine
{Partition %s%c ist bereits in Ordnung!\n}
-
+
message dump_line
{%s\n}
Index: src/distrib/utils/sysinst/arch/mac68k/msg.md.en
diff -u src/distrib/utils/sysinst/arch/mac68k/msg.md.en:1.21 src/distrib/utils/sysinst/arch/mac68k/msg.md.en:1.22
--- src/distrib/utils/sysinst/arch/mac68k/msg.md.en:1.21 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/mac68k/msg.md.en Thu Mar 1 18:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.21 2012/03/01 16:22:15 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.22 2012/03/01 18:08:56 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -163,7 +163,7 @@ disk partitions. However your new Disk P
the disk and will be available the next time NetBSD is booted. Please
reboot immediately and restart the Installation Process.
}
-
+
.if debug
message mapdebug
{Partition Map:
@@ -228,7 +228,7 @@ message parttable_fix_fixing
message parttable_fix_fine
{Partition %s%c is just fine!\n}
-
+
message dump_line
{%s\n}
Index: src/distrib/utils/sysinst/arch/mac68k/msg.md.es
diff -u src/distrib/utils/sysinst/arch/mac68k/msg.md.es:1.5 src/distrib/utils/sysinst/arch/mac68k/msg.md.es:1.6
--- src/distrib/utils/sysinst/arch/mac68k/msg.md.es:1.5 Thu Mar 1 16:22:15 2012
+++ src/distrib/utils/sysinst/arch/mac68k/msg.md.es Thu Mar 1 18:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.5 2012/03/01 16:22:15 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.6 2012/03/01 18:08:56 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -172,7 +172,7 @@ de Disco ha sido escrita a disco y estar
NetBSD sea iniciado. Por favor reinicie inmediatamente y vuelva a iniciar
el Proceso de Instalacion.
}
-
+
.if debug
message mapdebug
{Mapa de Particiones:
@@ -237,7 +237,7 @@ message parttable_fix_fixing
message parttable_fix_fine
{¡La particion %s%c ya es correcta!\n}
-
+
message dump_line
{%s\n}
Index: src/distrib/utils/sysinst/arch/x68k/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/x68k/msg.md.pl:1.8 src/distrib/utils/sysinst/arch/x68k/msg.md.pl:1.9
--- src/distrib/utils/sysinst/arch/x68k/msg.md.pl:1.8 Thu Mar 1 16:22:16 2012
+++ src/distrib/utils/sysinst/arch/x68k/msg.md.pl Thu Mar 1 18:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.8 2012/03/01 16:22:16 mbalmer Exp $ */
+/* $NetBSD: msg.md.pl,v 1.9 2012/03/01 18:08:56 tsutsui Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.2 2002/12/03 01:54:57 minoura Exp */
@@ -63,6 +63,6 @@ message ordering
message emptypart
{Istnieje poprawna partycja %c po pustych partycjach.
Wyedytuj jeszcze raz tablice partycji.}
-
+
message set_kernel_1
{Kernel (GENERIC)}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Thu Mar 1 17:40:32 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mbr.fr msg.mbr.pl msg.mi.fr msg.mi.pl
src/distrib/utils/sysinst/arch/atari: msg.md.de msg.md.en msg.md.es
src/distrib/utils/sysinst/arch/evbarm: msg.md.de msg.md.en msg.md.es
src/distrib/utils/sysinst/arch/sparc: msg.md.de msg.md.en msg.md.es
Log Message:
Remove trailing spaces not in message format.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/sysinst/msg.mbr.fr
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/sysinst/msg.mbr.pl
cvs rdiff -u -r1.120 -r1.121 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.79 -r1.80 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/atari/msg.md.de
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/arch/atari/msg.md.en
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/atari/msg.md.es
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/evbarm/msg.md.de
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/sysinst/arch/evbarm/msg.md.en
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/evbarm/msg.md.es
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/sparc/msg.md.de
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/sysinst/arch/sparc/msg.md.en
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/sparc/msg.md.es
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mbr.fr
diff -u src/distrib/utils/sysinst/msg.mbr.fr:1.18 src/distrib/utils/sysinst/msg.mbr.fr:1.19
--- src/distrib/utils/sysinst/msg.mbr.fr:1.18 Thu Mar 1 16:22:13 2012
+++ src/distrib/utils/sysinst/msg.mbr.fr Thu Mar 1 17:40:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.fr,v 1.18 2012/03/01 16:22:13 mbalmer Exp $ */
+/* $NetBSD: msg.mbr.fr,v 1.19 2012/03/01 17:40:31 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -152,7 +152,7 @@ message Delete_partition
{Supprimer la partition}
message Dont_change
{Ne pas modifier}
-message Other_kind
+message Other_kind
{Autre, entrer un chiffre}
Index: src/distrib/utils/sysinst/msg.mbr.pl
diff -u src/distrib/utils/sysinst/msg.mbr.pl:1.15 src/distrib/utils/sysinst/msg.mbr.pl:1.16
--- src/distrib/utils/sysinst/msg.mbr.pl:1.15 Thu Mar 1 16:22:13 2012
+++ src/distrib/utils/sysinst/msg.mbr.pl Thu Mar 1 17:40:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.pl,v 1.15 2012/03/01 16:22:13 mbalmer Exp $ */
+/* $NetBSD: msg.mbr.pl,v 1.16 2012/03/01 17:40:31 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -149,7 +149,7 @@ message Delete_partition
{Usun partycje}
message Dont_change
{Nie zmieniaj}
-message Other_kind
+message Other_kind
{Inny typ, podaj identyfikator liczbowy}
@@ -162,7 +162,7 @@ Czy chcesz zmienic tablice partycji (MBR
message nobsdpart
{Nie ma partycji NetBSD w tablicy partycji MBR.}
-message multbsdpart
+message multbsdpart
{W tablicy partycji MBR znajduje sie kilka partycji NetBSD.
Powinienies oznaczyc jedna z nich jako przeznaczona do instalacji.
}
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.120 src/distrib/utils/sysinst/msg.mi.fr:1.121
--- src/distrib/utils/sysinst/msg.mi.fr:1.120 Thu Mar 1 16:22:13 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Thu Mar 1 17:40:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.120 2012/03/01 16:22:13 mbalmer Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.121 2012/03/01 17:40:31 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -317,7 +317,7 @@ message mountpt_fmt
message toggle
{Basculer}
-message restore
+message restore
{Revenir aux valeurs initiales}
message Select_the_type
@@ -911,7 +911,7 @@ message config_open_error
Impossible d'ouvrir le fichier de configuration %s.\n
}
-message choose_timezone
+message choose_timezone
{
Veuillez sélectionner votre zone horaire dans la liste suivante.
Appuyez sur Entrée pour confirmer votre choix.
@@ -951,7 +951,7 @@ Nous vous recommandons de spéficier un m
Le souhaitez-vous ?
}
-message rootsh
+message rootsh
{
Vous pouvez à présent déterminer le shell par défaut qui sera
utilisé par root. Par défaut, il s'agit de /bin/sh
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.79 src/distrib/utils/sysinst/msg.mi.pl:1.80
--- src/distrib/utils/sysinst/msg.mi.pl:1.79 Thu Mar 1 16:22:14 2012
+++ src/distrib/utils/sysinst/msg.mi.pl Thu Mar 1 17:40:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.79 2012/03/01 16:22:14 mbalmer Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.80 2012/03/01 17:40:31 tsutsui Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -700,7 +700,7 @@ message fdremount
{Dyskietka nie zostala pomyslnie zamountowana.
}
-message fdmount
+mess
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Thu Mar 1 17:27:29 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mbr.en msg.mi.de
Log Message:
Put back more spaces at EOL for line breaks.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/sysinst/msg.mbr.en
cvs rdiff -u -r1.62 -r1.63 src/distrib/utils/sysinst/msg.mi.de
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mbr.en
diff -u src/distrib/utils/sysinst/msg.mbr.en:1.16 src/distrib/utils/sysinst/msg.mbr.en:1.17
--- src/distrib/utils/sysinst/msg.mbr.en:1.16 Thu Mar 1 16:22:13 2012
+++ src/distrib/utils/sysinst/msg.mbr.en Thu Mar 1 17:27:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.en,v 1.16 2012/03/01 16:22:13 mbalmer Exp $ */
+/* $NetBSD: msg.mbr.en,v 1.17 2012/03/01 17:27:29 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -85,7 +85,7 @@ message setbiosgeom
{
You will be prompted for the geometry.
Please enter the number of sectors per track (maximum 63)
-and number of heads (maximum 256) that the BIOS uses to access the disk.
+and number of heads (maximum 256) that the BIOS uses to access the disk.
The number of cylinders will be calculated from the disk size.
}
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.62 src/distrib/utils/sysinst/msg.mi.de:1.63
--- src/distrib/utils/sysinst/msg.mi.de:1.62 Thu Mar 1 16:22:13 2012
+++ src/distrib/utils/sysinst/msg.mi.de Thu Mar 1 17:27:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.62 2012/03/01 16:22:13 mbalmer Exp $ */
+/* $NetBSD: msg.mi.de,v 1.63 2012/03/01 17:27:29 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -239,7 +239,7 @@ Festplatte.
message endoutsidedisk
{Mit diesem Wert liegt das Ende der Partition jenseits des Endes der
-Festplatte.
+Festplatte.
Die Größe Ihrer Partition wurde auf %d %s verringert.
Drücken Sie die Eingabetaste um fortzufahren.
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: mbalmer
Date: Sun Feb 26 10:17:44 UTC 2012
Modified Files:
src/distrib/utils/sysinst: run.c
Log Message:
Fold long lines and a little KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/distrib/utils/sysinst/run.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/run.c
diff -u src/distrib/utils/sysinst/run.c:1.69 src/distrib/utils/sysinst/run.c:1.70
--- src/distrib/utils/sysinst/run.c:1.69 Thu Jan 5 21:29:24 2012
+++ src/distrib/utils/sysinst/run.c Sun Feb 26 10:17:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: run.c,v 1.69 2012/01/05 21:29:24 christos Exp $ */
+/* $NetBSD: run.c,v 1.70 2012/02/26 10:17:44 mbalmer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -138,7 +138,8 @@ script_flip(menudesc *m, void *arg)
(void)time(&tloc);
if (script) {
- scripting_fprintf(NULL, "# Script ended at: %s\n", asctime(localtime(&tloc)));
+ scripting_fprintf(NULL, "# Script ended at: %s\n",
+ asctime(localtime(&tloc)));
fflush(script);
fclose(script);
script = NULL;
@@ -150,7 +151,8 @@ script_flip(menudesc *m, void *arg)
asctime(localtime(&tloc)));
fflush(script);
} else {
- msg_display(MSG_openfail, "script file", strerror(errno));
+ msg_display(MSG_openfail, "script file",
+ strerror(errno));
}
}
return(0);
@@ -366,7 +368,7 @@ show_cmd(const char *scmd, struct winsiz
*/
static int
launch_subwin(WINDOW **actionwin, char **args, struct winsize *win, int flags,
- const char *scmd, const char **errstr)
+const char *scmd, const char **errstr)
{
int n, i;
int selectfailed;
@@ -376,12 +378,10 @@ launch_subwin(WINDOW **actionwin, char *
char ibuf[MAXBUF];
char pktdata;
char *cp, *ncp;
- struct termios rtt;
- struct termios tt;
+ struct termios rtt, tt;
struct timeval tmo;
static int do_tioccons = 2;
-
(void)tcgetattr(STDIN_FILENO, &tt);
if (openpty(&master, &slave, NULL, &tt, win) == -1) {
*errstr = "openpty() failed";
@@ -483,7 +483,8 @@ launch_subwin(WINDOW **actionwin, char *
for (selectfailed = 0;;) {
if (selectfailed) {
- const char mmsg[] = "select(2) failed but no child died?";
+ const char mmsg[] =
+ "select(2) failed but no child died?";
if (logfp)
(void)fprintf(logfp, mmsg);
errx(1, mmsg);
CVS commit: src/distrib/utils/sysinst/arch/evbarm
Module Name:src
Committed By: nisimura
Date: Fri Feb 3 00:35:35 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/evbarm: md.h msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Add Mini2440 entry to sysinst kernel selection.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/arch/evbarm/md.h
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/evbarm/msg.md.de
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/evbarm/msg.md.en
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/evbarm/msg.md.es
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/arch/evbarm/msg.md.fr
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/evbarm/msg.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/evbarm/md.h
diff -u src/distrib/utils/sysinst/arch/evbarm/md.h:1.17 src/distrib/utils/sysinst/arch/evbarm/md.h:1.18
--- src/distrib/utils/sysinst/arch/evbarm/md.h:1.17 Mon Apr 4 08:30:24 2011
+++ src/distrib/utils/sysinst/arch/evbarm/md.h Fri Feb 3 00:35:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.17 2011/04/04 08:30:24 mbalmer Exp $ */
+/* $NetBSD: md.h,v 1.18 2012/02/03 00:35:35 nisimura Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -49,8 +49,9 @@
#define SET_KERNEL_2_NAME "kern-INTEGRATOR"
#define SET_KERNEL_3_NAME "kern-IQ80310"
#define SET_KERNEL_4_NAME "kern-IQ80321"
-#define SET_KERNEL_5_NAME "kern-TEAMASA_NPWR"
-#define SET_KERNEL_6_NAME "kern-TS7200"
+#define SET_KERNEL_5_NAME "kern-MINI2440"
+#define SET_KERNEL_6_NAME "kern-TEAMASA_NPWR"
+#define SET_KERNEL_7_NAME "kern-TS7200"
#define MD_SETS_SELECTED SET_SYSTEM
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.de
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.de:1.8 src/distrib/utils/sysinst/arch/evbarm/msg.md.de:1.9
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.de:1.8 Mon Apr 4 08:30:24 2011
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.de Fri Feb 3 00:35:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.8 2011/04/04 08:30:24 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.9 2012/02/03 00:35:35 nisimura Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -81,6 +81,8 @@ message set_kernel_3
message set_kernel_4
{Kernel (IQ80321)}
message set_kernel_5
-{Kernel (TEAMASA_NPWR)}
+{Kernel (MINI2440)}
message set_kernel_6
+{Kernel (TEAMASA_NPWR)}
+message set_kernel_7
{Kernel (TS7200)}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.en
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.en:1.10 src/distrib/utils/sysinst/arch/evbarm/msg.md.en:1.11
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.en:1.10 Mon Apr 4 08:30:24 2011
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.en Fri Feb 3 00:35:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.10 2011/04/04 08:30:24 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.11 2012/02/03 00:35:35 nisimura Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -77,6 +77,8 @@ message set_kernel_3
message set_kernel_4
{Kernel (IQ80321)}
message set_kernel_5
-{Kernel (TEAMASA_NPWR)}
+{Kernel (MINI2440)}
message set_kernel_6
+{Kernel (TEAMASA_NPWR)}
+message set_kernel_7
{Kernel (TS7200)}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.es
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.es:1.7 src/distrib/utils/sysinst/arch/evbarm/msg.md.es:1.8
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.es:1.7 Mon Apr 4 08:30:24 2011
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.es Fri Feb 3 00:35:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.7 2011/04/04 08:30:24 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.8 2012/02/03 00:35:35 nisimura Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -80,6 +80,8 @@ message set_kernel_3
message set_kernel_4
{Núcleo (IQ80321)}
message set_kernel_5
-{Núcleo (TEAMASA_NPWR)}
+{Núcleo (MINI2440)}
message set_kernel_6
+{Núcleo (TEAMASA_NPWR)}
+message set_kernel_7
{Núcleo (TS7200)}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/evbarm/msg.md.fr:1.11 src/distrib/utils/sysinst/arch/evbarm/msg.md.fr:1.12
--- src/distrib/utils/sysinst/arch/evbarm/msg.md.fr:1.11 Mon Apr 4 08:30:24 2011
+++ src/distrib/utils/sysinst/arch/evbarm/msg.md.fr Fri Feb 3 00:35:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.11 2011/04/04 08:30:24 mbalmer Exp $ */
+/* $NetBSD: msg.md.fr,v 1.12 2012/02/03 00:35:35 nisimura Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -80,6 +80,8 @@ message set_kernel_3
message set_kernel_4
{Kernel (IQ80321)}
message set_kernel_5
-{Kernel (TEAMASA_NPWR)}
+{Kernel (MINI2440)}
message set_kernel_6
+{Kernel (TEAMASA_NPWR)}
+message set_kernel_7
{Kernel (TS7200)}
Index: src/distrib/utils/sysinst/arch/evbarm/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/evbarm/msg
CVS commit: src/distrib/utils/sysinst/arch/ofppc
Module Name:src
Committed By: phx
Date: Thu Feb 2 22:15:05 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/ofppc: msg.md.de
Log Message:
Translate some new messages into german.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/arch/ofppc/msg.md.de
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/ofppc/msg.md.de
diff -u src/distrib/utils/sysinst/arch/ofppc/msg.md.de:1.7 src/distrib/utils/sysinst/arch/ofppc/msg.md.de:1.8
--- src/distrib/utils/sysinst/arch/ofppc/msg.md.de:1.7 Mon Apr 4 08:30:39 2011
+++ src/distrib/utils/sysinst/arch/ofppc/msg.md.de Thu Feb 2 22:15:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.7 2011/04/04 08:30:39 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.8 2012/02/02 22:15:04 phx Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -64,25 +64,26 @@ message set_kernel_1
{Kernel (GENERIC)}
message nobootpart
-{There is no boot partition in the MBR partition table.}
+{Es gibt keine Boot Partition in der MBR Partitionstabelle.}
message boottoosmall
-{The boot partition is too small. It needs to be at least 2MB in size,
-however a size of at least 100MB is recommended.}
+{Die Boot Partition ist zu klein. Sie benötigt mindestens 2MB,
+wobei eine Größe von 100MB empfohlen wird.}
message nobootpartdisklabel
-{There is no boot partition in the disklabel. The boot partition should
-match the boot partition you set up in the MBR partition table.}
+{Es gibt keine Boot Partition im Disklabel. Die Boot Partition sollte
+zu derjenigen passen, die Sie in der MBR Partitionstabelle angelegt haben.}
message preptoosmall
-{You need to have two PReP partitions to boot an IBM RS/6000. One needs to
-be at least 1MB in size, and the other must be at least 1KB in size.}
+{Sie benötigen zwei PReP Partitionen, um unter IBM RS/6000 booten zu können.
+Eine sollte mindestens 1MB groß sein, und die andere mindestens 1KB.}
message bootnotright
-{In order to boot ofppc, you need either a FAT12 partition of at least 2MB
-in size, or a pair of PReP partitions. The PReP partitions need to be at
-least 1KB, and 1MB in size. IBM RS/6000 machines generally need the PReP
-partitions, however some can utilize the FAT12. Most other machines require
-the FAT12 partition. If you are not sure which to choose, accept the
-defaults, and install all three. You do not currently have any partitions
-that meet the minimum requirements.}
+{Um ofppc booten zu können benötigen Sie entweder eine 2MB große FAT12
+Partition oder zwei PReP Partitionen. Die PReP Partitionen sollten
+mindestens eine Größe von 1KB und 1MB haben. IBM/RS6000 Maschinen benötigen
+meistens die PReP Partitionen, obwohl einige auch mit FAT12 zurecht kommen.
+Alle anderen Maschinen benötigen meistens die FAT12 Partition. Wenn Sie
+nicht sicher sind welche Sie benötigen, so akzeptieren Sie die Standard
+Einstellungen und installieren alle drei. Momentan haben Sie noch nicht
+genügend Partitionen um die Minimalanforderungen zu erfüllen.}
CVS commit: src/distrib/utils/sysinst/arch/ofppc
Module Name:src Committed By: phx Date: Thu Feb 2 21:58:31 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/ofppc: md.c Log Message: Use sync(8) instead of echo(1) to avoid writing an RDB disklabel. echo(1) is not part of the miniroot file system. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/arch/ofppc/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/ofppc/md.c diff -u src/distrib/utils/sysinst/arch/ofppc/md.c:1.11 src/distrib/utils/sysinst/arch/ofppc/md.c:1.12 --- src/distrib/utils/sysinst/arch/ofppc/md.c:1.11 Sun Jan 29 16:01:36 2012 +++ src/distrib/utils/sysinst/arch/ofppc/md.c Thu Feb 2 21:58:31 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.11 2012/01/29 16:01:36 phx Exp $ */ +/* $NetBSD: md.c,v 1.12 2012/02/02 21:58:31 phx Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -605,7 +605,7 @@ const char *md_disklabel_cmd(void) /* we cannot rewrite an RDB disklabel */ if (rdb_found) - return "echo No disklabel"; + return "sync No disklabel"; return "disklabel -w -r"; }
CVS commit: src/distrib/utils/sysinst/arch/zaurus
Module Name:src
Committed By: tsutsui
Date: Thu Feb 2 16:00:35 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/zaurus: md.c md.h msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Select a proper kernel set (GENERIC or C700) per running INSTALL kernel name.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/zaurus/md.c
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/zaurus/md.h \
src/distrib/utils/sysinst/arch/zaurus/msg.md.fr \
src/distrib/utils/sysinst/arch/zaurus/msg.md.pl
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/zaurus/msg.md.de \
src/distrib/utils/sysinst/arch/zaurus/msg.md.en \
src/distrib/utils/sysinst/arch/zaurus/msg.md.es
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/zaurus/md.c
diff -u src/distrib/utils/sysinst/arch/zaurus/md.c:1.10 src/distrib/utils/sysinst/arch/zaurus/md.c:1.11
--- src/distrib/utils/sysinst/arch/zaurus/md.c:1.10 Mon Nov 7 14:18:52 2011
+++ src/distrib/utils/sysinst/arch/zaurus/md.c Thu Feb 2 16:00:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2011/11/07 14:18:52 he Exp $ */
+/* $NetBSD: md.c,v 1.11 2012/02/02 16:00:35 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -35,6 +35,7 @@
/* md.c -- zaurus machine specific routines */
#include
+#include
#include
#include
@@ -52,7 +53,20 @@ md_init(void)
void
md_init_set_status(int flags)
{
- (void)flags;
+ static const int mib[2] = {CTL_KERN, KERN_VERSION};
+ size_t len;
+ char *version;
+
+ /* check INSTALL kernel name to select an appropriate kernel set */
+ /* XXX: hw.cpu_model has a processor name on arm ports */
+ sysctl(mib, 2, NULL, &len, NULL, 0);
+ version = malloc(len);
+ if (version == NULL)
+ return;
+ sysctl(mib, 2, version, &len, NULL, 0);
+ if (strstr(version, "C700") != NULL)
+ set_kernel_set(SET_KERNEL_C700);
+ free(version);
}
int
Index: src/distrib/utils/sysinst/arch/zaurus/md.h
diff -u src/distrib/utils/sysinst/arch/zaurus/md.h:1.4 src/distrib/utils/sysinst/arch/zaurus/md.h:1.5
--- src/distrib/utils/sysinst/arch/zaurus/md.h:1.4 Thu Jan 26 16:12:14 2012
+++ src/distrib/utils/sysinst/arch/zaurus/md.h Thu Feb 2 16:00:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.4 2012/01/26 16:12:14 tsutsui Exp $ */
+/* $NetBSD: md.h,v 1.5 2012/02/02 16:00:35 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -57,8 +57,10 @@
* base etc comp games man misc tests text xbase xcomp xetc xfont xserver
*/
#define SET_KERNEL_GENERIC SET_KERNEL_1
+#define SET_KERNEL_C700 SET_KERNEL_2
#define SET_KERNEL_1_NAME "kern-GENERIC"
+#define SET_KERNEL_2_NAME "kern-C700"
/*
* Machine-specific command to write a new label to a disk.
Index: src/distrib/utils/sysinst/arch/zaurus/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/zaurus/msg.md.fr:1.4 src/distrib/utils/sysinst/arch/zaurus/msg.md.fr:1.5
--- src/distrib/utils/sysinst/arch/zaurus/msg.md.fr:1.4 Mon Apr 4 08:30:46 2011
+++ src/distrib/utils/sysinst/arch/zaurus/msg.md.fr Thu Feb 2 16:00:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.4 2011/04/04 08:30:46 mbalmer Exp $ */
+/* $NetBSD: msg.md.fr,v 1.5 2012/02/02 16:00:35 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -54,3 +54,6 @@ message zaurusfspart
message set_kernel_1
{Kernel (GENERIC)}
+
+message set_kernel_2
+{Kernel (C700)}
Index: src/distrib/utils/sysinst/arch/zaurus/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/zaurus/msg.md.pl:1.4 src/distrib/utils/sysinst/arch/zaurus/msg.md.pl:1.5
--- src/distrib/utils/sysinst/arch/zaurus/msg.md.pl:1.4 Mon Apr 4 08:30:46 2011
+++ src/distrib/utils/sysinst/arch/zaurus/msg.md.pl Thu Feb 2 16:00:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.4 2011/04/04 08:30:46 mbalmer Exp $ */
+/* $NetBSD: msg.md.pl,v 1.5 2012/02/02 16:00:35 tsutsui Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.1 2002/02/11 13:50:18 skrll Exp */
@@ -54,3 +54,6 @@ message zaurusfspart
message set_kernel_1
{Kernel (GENERIC)}
+
+message set_kernel_2
+{Kernel (C700)}
Index: src/distrib/utils/sysinst/arch/zaurus/msg.md.de
diff -u src/distrib/utils/sysinst/arch/zaurus/msg.md.de:1.3 src/distrib/utils/sysinst/arch/zaurus/msg.md.de:1.4
--- src/distrib/utils/sysinst/arch/zaurus/msg.md.de:1.3 Mon Apr 4 08:30:46 2011
+++ src/distrib/utils/sysinst/arch/zaurus/msg.md.de Thu Feb 2 16:00:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.3 2011/04/04 08:30:46 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.4 2012/02/02 16:00:35 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -53,3 +53,6 @@ message zaurusfspart
message set_kernel_1
{Kernel (GENERIC)}
+
+message set_kernel_2
+{Kernel (C700)}
Index: src/distrib/utils/sysinst/arch/zaurus/msg.md.en
diff -u src/distrib/utils/sysinst/arc
CVS commit: src/distrib/utils/sysinst/arch/ofppc
Module Name:src
Committed By: phx
Date: Sun Jan 29 16:01:37 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/ofppc: md.c md.h
Log Message:
Add support for RDB-partitioned disks.
When an RDB block was found on the disk we cannot change the disk layout,
and everything which has to do with MBR partitioning will be skipped.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/ofppc/md.c
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/ofppc/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/ofppc/md.c
diff -u src/distrib/utils/sysinst/arch/ofppc/md.c:1.10 src/distrib/utils/sysinst/arch/ofppc/md.c:1.11
--- src/distrib/utils/sysinst/arch/ofppc/md.c:1.10 Fri Nov 4 11:27:04 2011
+++ src/distrib/utils/sysinst/arch/ofppc/md.c Sun Jan 29 16:01:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2011/11/04 11:27:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.11 2012/01/29 16:01:36 phx Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -36,6 +36,7 @@
#include
#include
+#include
#include
#include
#include
@@ -46,12 +47,16 @@
#include "menu_defs.h"
#include "endian.h"
+static int check_rdb(void);
+static uint32_t rdbchksum(void *);
+
/* We use MBR_PTYPE_PREP like port-prep does. */
static int nonewfsmsdos = 0, nobootfix = 0, noprepfix=0;
static int bootpart_fat12 = PART_BOOT_FAT12;
static int bootpart_binfo = PART_BOOT_BINFO;
static int bootpart_prep = PART_BOOT_PREP;
static int bootinfo_mbr = 1;
+static int rdb_found = 0;
/* bootstart/bootsize are for the fat */
int binfostart, binfosize, bprepstart, bprepsize;
@@ -64,12 +69,17 @@ md_init(void)
void
md_init_set_status(int flags)
{
+
(void)flags;
}
int
md_get_info(void)
{
+
+ if (check_rdb())
+ return 1;
+
return set_bios_geom_with_mbr_guess();
}
@@ -88,6 +98,41 @@ md_make_bsd_partitions(void)
int no_swap = 0;
partinfo *p;
+ if (rdb_found) {
+ /*
+ * We found RDB partitions on the disk, which cannot be
+ * modified by rewriting the disklabel.
+ * So just use what we have got.
+ */
+ for (part = 0; part < maxpart; part++) {
+ if (PI_ISBSDFS(&bsdlabel[part])) {
+bsdlabel[part].pi_flags |=
+PIF_NEWFS | PIF_MOUNT;
+
+if (part == PART_A)
+ strcpy(bsdlabel[part].pi_mount, "/");
+ }
+ }
+
+ part_bsd = part_raw = getrawpartition();
+ if (part_raw == -1)
+ part_raw = PART_C; /* for sanity... */
+ bsdlabel[part_raw].pi_offset = 0;
+ bsdlabel[part_raw].pi_size = dlsize;
+
+ set_sizemultname_meg();
+rdb_edit_check:
+ if (edit_and_check_label(bsdlabel, maxpart, part_raw,
+ part_bsd) == 0) {
+ msg_display(MSG_abort);
+ return 0;
+ }
+ if (md_check_partitions() == 0)
+ goto rdb_edit_check;
+
+ return 1;
+ }
+
/*
* Initialize global variables that track space used on this disk.
* Standard 4.4BSD 8-partition labels always cover whole disk.
@@ -223,6 +268,9 @@ md_check_partitions(void)
{
int part, fprep=0, ffat=0;
+ if (rdb_found)
+ return 1;
+
/* we need to find a boot partition, otherwise we can't create
* our msdos fs boot partition. We make the assumption that
* the user hasn't done something stupid, like move it away
@@ -259,6 +307,10 @@ md_check_partitions(void)
int
md_pre_disklabel(void)
{
+
+ if (rdb_found)
+ return 0;
+
msg_display(MSG_dofdisk);
/* write edited MBR onto disk. */
@@ -278,7 +330,7 @@ md_post_disklabel(void)
{
char bootdev[100];
- if (bootstart == 0 || bootsize == 0)
+ if (bootstart == 0 || bootsize == 0 || rdb_found)
return 0;
snprintf(bootdev, sizeof bootdev, "/dev/r%s%c", diskdev,
@@ -307,7 +359,7 @@ md_post_extract(void)
char bootdev[100], bootbdev[100], version[64];
/* if we can't make it bootable, just punt */
- if (nobootfix && noprepfix)
+ if ((nobootfix && noprepfix) || rdb_found)
return 0;
snprintf(version, sizeof version, "NetBSD/%s %s", MACH, REL);
@@ -353,6 +405,7 @@ md_post_extract(void)
void
md_cleanup_install(void)
{
+
#ifndef DEBUG
enable_rc_conf();
#endif
@@ -365,6 +418,9 @@ md_pre_update(void)
mbr_info_t *ext;
int i;
+ if (check_rdb())
+ return 1;
+
read_mbr(diskdev, &mbr);
/* do a sanity check of the partition table */
for (ext = &mbr; ext; ext = ext->extended) {
@@ -400,6 +456,7 @@ md_pre_update(void)
int
md_update(void)
{
+
nonewfsmsdos = 1;
md_post_newfs();
return 1;
@@ -543,8 +600,56 @@ md_mbr_use_wholedisk(mbr_info_t *mbri)
return 1;
}
+const char *md_disklabel_cmd(void)
+{
+
+ /* we cannot rewrite an RDB disklabel */
+ if (rdb_found)
+ return "echo No disklabel";
+
+ return "disklabel -w -r";
+}
+
+static int
+check_rdb(void)
+{
+ char buf[512], diskpath[MAXPATHLEN];
+ struct rdblock *rdb;
+ off_t blk;
+ int fd;
+
+ /* Find out if this disk has a valid RDB, before continuing. */
+ rdb = (struct rdblock *)buf;
+ fd = opendisk(diskdev
CVS commit: src/distrib/utils/sysinst/arch/zaurus
Module Name:src Committed By: tsutsui Date: Thu Jan 26 16:12:14 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/zaurus: md.h Log Message: zaurus zboot supports UFS2. (as defined in zaurus/stand/zboot/conf.c) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/zaurus/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/zaurus/md.h diff -u src/distrib/utils/sysinst/arch/zaurus/md.h:1.3 src/distrib/utils/sysinst/arch/zaurus/md.h:1.4 --- src/distrib/utils/sysinst/arch/zaurus/md.h:1.3 Mon Apr 4 08:30:46 2011 +++ src/distrib/utils/sysinst/arch/zaurus/md.h Thu Jan 26 16:12:14 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2011/04/04 08:30:46 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.4 2012/01/26 16:12:14 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -48,6 +48,9 @@ /* Megs required for a full X installation. */ #define XNEEDMB 60 +/* have support for booting from UFS2 */ +#define HAVE_UFS2_BOOT + /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are:
CVS commit: src/distrib/utils/sysinst/arch/sandpoint
Module Name:src
Committed By: phx
Date: Wed Jan 25 19:03:35 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/sandpoint: md.c
Log Message:
netboot is called altboot now
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/sysinst/arch/sandpoint/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/sandpoint/md.c
diff -u src/distrib/utils/sysinst/arch/sandpoint/md.c:1.38 src/distrib/utils/sysinst/arch/sandpoint/md.c:1.39
--- src/distrib/utils/sysinst/arch/sandpoint/md.c:1.38 Fri Jan 6 20:52:43 2012
+++ src/distrib/utils/sysinst/arch/sandpoint/md.c Wed Jan 25 19:03:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.38 2012/01/06 20:52:43 riz Exp $ */
+/* $NetBSD: md.c,v 1.39 2012/01/25 19:03:35 phx Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -153,7 +153,7 @@ md_post_disklabel(void)
int
md_post_newfs(void)
{
- /* no boot blocks, we are using netboot */
+ /* no boot blocks, we are using altboot */
return 0;
}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: gson
Date: Tue Jan 10 21:02:48 UTC 2012
Modified Files:
src/distrib/utils/sysinst: defs.h main.c menus.mi msg.mi.de msg.mi.en
msg.mi.es msg.mi.fr msg.mi.pl net.c util.c
Log Message:
Add support for installing source sets as discussed on tech-install,
with improved German translations from Martin Husemann and Julian
Djamil Fagir. French, Spanish, and Polish translations are
still needed. OK christos, riz.
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.62 -r1.63 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.43 -r1.44 src/distrib/utils/sysinst/menus.mi
cvs rdiff -u -r1.60 -r1.61 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.168 -r1.169 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.118 -r1.119 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.77 -r1.78 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.129 -r1.130 src/distrib/utils/sysinst/net.c
cvs rdiff -u -r1.172 -r1.173 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.160 src/distrib/utils/sysinst/defs.h:1.161
--- src/distrib/utils/sysinst/defs.h:1.160 Thu Jan 5 22:18:36 2012
+++ src/distrib/utils/sysinst/defs.h Tue Jan 10 21:02:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.160 2012/01/05 22:18:36 christos Exp $ */
+/* $NetBSD: defs.h,v 1.161 2012/01/10 21:02:47 gson Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -122,6 +122,13 @@ enum {
SET_MD_2, /* Machine dependent set */
SET_MD_3, /* Machine dependent set */
SET_MD_4, /* Machine dependent set */
+
+/* Source sets */
+SET_SYSSRC,
+SET_SRC,
+SET_SHARESRC,
+SET_GNUSRC,
+SET_XSRC,
SET_LAST,
SET_GROUP, /* Start of submenu */
@@ -144,6 +151,9 @@ enum {
/* All machine dependent sets */
#define SET_MD SET_MD_1, SET_MD_2, SET_MD_3, SET_MD_4
+/* All source sets */
+#define SET_SOURCE SET_SYSSRC, SET_SRC, SET_SHARESRC, SET_GNUSRC, SET_XSRC
+
/* Set list flags */
#define SFLAG_MINIMAL 1
#define SFLAG_NOX 2
@@ -278,11 +288,17 @@ int clean_xfer_dir;
#define SYSINST_FTP_DIR "pub/NetBSD/NetBSD-" REL
#endif
-/* Abs. path we extract from */
-char ext_dir[STRSIZE];
+/* Abs. path we extract binary sets from */
+char ext_dir_bin[STRSIZE];
+
+/* Abs. path we extract source sets from */
+char ext_dir_src[STRSIZE];
+
+/* Place we look for binary sets in all fs types */
+char set_dir_bin[STRSIZE];
-/* Place we look in all fs types */
-char set_dir[STRSIZE];
+/* Place we look for source sets in all fs types */
+char set_dir_src[STRSIZE];
struct {
char host[STRSIZE];
@@ -427,6 +443,9 @@ int check_lfs_progs(void);
void init_set_status(int);
void customise_sets(void);
void umount_mnt2(void);
+int set_is_source(const char *);
+const char *set_dir_for_set(const char *);
+const char *ext_dir_for_set(const char *);
/* from target.c */
#if defined(DEBUG) || defined(DEBUG_ROOT)
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.62 src/distrib/utils/sysinst/main.c:1.63
--- src/distrib/utils/sysinst/main.c:1.62 Thu Jan 5 21:29:24 2012
+++ src/distrib/utils/sysinst/main.c Tue Jan 10 21:02:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.62 2012/01/05 21:29:24 christos Exp $ */
+/* $NetBSD: main.c,v 1.63 2012/01/10 21:02:47 gson Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -80,10 +80,12 @@ static const struct f_arg fflagopts[] =
{"release", REL, rel, sizeof rel},
{"machine", MACH, machine, sizeof machine},
{"xfer dir", "/usr/INSTALL", xfer_dir, sizeof xfer_dir},
- {"ext dir", "", ext_dir, sizeof ext_dir},
+ {"ext dir", "", ext_dir_bin, sizeof ext_dir_bin},
+ {"ext src dir", "", ext_dir_src, sizeof ext_dir_src},
{"ftp host", SYSINST_FTP_HOST, ftp.host, sizeof ftp.host},
{"ftp dir", SYSINST_FTP_DIR, ftp.dir, sizeof ftp.dir},
- {"ftp prefix", "/" MACH "/binary/sets", set_dir, sizeof set_dir},
+ {"ftp prefix", "/" MACH "/binary/sets", set_dir_bin, sizeof set_dir_bin},
+ {"ftp src prefix", "/source/sets", set_dir_src, sizeof set_dir_src},
{"ftp user", "ftp", ftp.user, sizeof ftp.user},
{"ftp pass", "", ftp.pass, sizeof ftp.pass},
{"ftp proxy", "", ftp.proxy, sizeof ftp.proxy},
Index: src/distrib/utils/sysinst/menus.mi
diff -u src/distrib/utils/sysinst/menus.mi:1.43 src/distrib/utils/sysinst/menus.mi:1.44
--- src/distrib/utils/sysinst/menus.mi:1.43 Sun Oct 30 00:30:56 2011
+++ src/distrib/utils/sysinst/menus.mi Tue Jan 10 21:02:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.43 2011/10/30 00:30:56 jakllsch Exp $ */
+/* $NetBSD: menus.mi,v 1.44 2012/01/10 21:02:47 gson Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -2
CVS commit: src/distrib/utils/sysinst/arch/hp700
Module Name:src
Committed By: skrll
Date: Mon Jan 9 11:51:41 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/hp700: md.c msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Error if the root partition exceeds the PDC 2GB limit. The check now
catches invalid "existing" partitions. PR/45742
Thanks to martin for the German translation. The others are all my fault.
Thanks to mrg for comments
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/arch/hp700/md.c
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/arch/hp700/msg.md.de \
src/distrib/utils/sysinst/arch/hp700/msg.md.en \
src/distrib/utils/sysinst/arch/hp700/msg.md.es \
src/distrib/utils/sysinst/arch/hp700/msg.md.pl
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/arch/hp700/msg.md.fr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/hp700/md.c
diff -u src/distrib/utils/sysinst/arch/hp700/md.c:1.13 src/distrib/utils/sysinst/arch/hp700/md.c:1.14
--- src/distrib/utils/sysinst/arch/hp700/md.c:1.13 Thu Jan 5 21:32:36 2012
+++ src/distrib/utils/sysinst/arch/hp700/md.c Mon Jan 9 11:51:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.13 2012/01/05 21:32:36 christos Exp $ */
+/* $NetBSD: md.c,v 1.14 2012/01/09 11:51:41 skrll Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,6 +50,8 @@
#include "msg_defs.h"
#include "menu_defs.h"
+#define HP700_PDC_LIMIT ((unsigned)2*1024*1024*1024)
+
void
md_init(void)
{
@@ -108,7 +110,7 @@ md_get_info(void)
/*
* hp700 PDC can only address up to 2GB.
*/
- root_limit = ((unsigned)2*1024*1024*1024) / (unsigned)sectorsize;
+ root_limit = HP700_PDC_LIMIT / (unsigned)sectorsize;
return 1;
}
@@ -128,6 +130,23 @@ md_make_bsd_partitions(void)
int
md_check_partitions(void)
{
+ /* Check the root partition is sane. */
+ uint32_t limit = HP700_PDC_LIMIT / (unsigned)sectorsize;
+ int part;
+
+ for (part = PART_A; part < MAXPARTITIONS; part++) {
+ if (strcmp(bsdlabel[part].pi_mount, "/") == 0) {
+ uint32_t offset = bsdlabel[part].pi_offset;
+ uint32_t size = bsdlabel[part].pi_size;
+
+ if (offset > limit || offset + size > limit) {
+msg_display(MSG_md_pdclimit);
+process_menu(MENU_ok, NULL);
+return 0;
+ }
+ }
+ }
+
return 1;
}
Index: src/distrib/utils/sysinst/arch/hp700/msg.md.de
diff -u src/distrib/utils/sysinst/arch/hp700/msg.md.de:1.5 src/distrib/utils/sysinst/arch/hp700/msg.md.de:1.6
--- src/distrib/utils/sysinst/arch/hp700/msg.md.de:1.5 Mon Apr 4 08:30:29 2011
+++ src/distrib/utils/sysinst/arch/hp700/msg.md.de Mon Jan 9 11:51:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.5 2011/04/04 08:30:29 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.6 2012/01/09 11:51:41 skrll Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,3 +50,6 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+
+message md_pdclimit
+{Die Root-Partition überschreitet die PDC Grenze von 2GB}
Index: src/distrib/utils/sysinst/arch/hp700/msg.md.en
diff -u src/distrib/utils/sysinst/arch/hp700/msg.md.en:1.5 src/distrib/utils/sysinst/arch/hp700/msg.md.en:1.6
--- src/distrib/utils/sysinst/arch/hp700/msg.md.en:1.5 Mon Apr 4 08:30:29 2011
+++ src/distrib/utils/sysinst/arch/hp700/msg.md.en Mon Jan 9 11:51:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.5 2011/04/04 08:30:29 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.6 2012/01/09 11:51:41 skrll Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,3 +50,6 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+
+message md_pdclimit
+{The root partition extends beyond the PDC limit of 2GB}
Index: src/distrib/utils/sysinst/arch/hp700/msg.md.es
diff -u src/distrib/utils/sysinst/arch/hp700/msg.md.es:1.5 src/distrib/utils/sysinst/arch/hp700/msg.md.es:1.6
--- src/distrib/utils/sysinst/arch/hp700/msg.md.es:1.5 Mon Apr 4 08:30:29 2011
+++ src/distrib/utils/sysinst/arch/hp700/msg.md.es Mon Jan 9 11:51:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.5 2011/04/04 08:30:29 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.6 2012/01/09 11:51:41 skrll Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,3 +50,6 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+
+message md_pdclimit
+{La partición raíz se extiende más allá del límite de 2 GB PDC}
Index: src/distrib/utils/sysinst/arch/hp700/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/hp700/msg.md.pl:1.5 src/distrib/utils/sysinst/arch/hp700/msg.md.pl:1.6
--- src/distrib/utils/sysinst/arch/hp700/msg.md.pl:1.5 Mon Apr 4 08:30:29 2011
+++ src/distrib/utils/sysinst/arch/hp700/msg.md.pl Mon Jan 9 11:51:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.5 2011/04/04 08:30:29 mbalmer Exp $ */
+/* $NetBSD: msg.md.pl,v 1.6 2012/01/09 11:51:41 skrll Exp $ */
/* Based on english version:
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: riz
Date: Mon Jan 9 02:52:50 UTC 2012
Modified Files:
src/distrib/utils/sysinst: net.c
Log Message:
Copy resolv.conf into target even if it was created by DHCP, since in
that case, it will be replaced on next boot anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/distrib/utils/sysinst/net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/net.c
diff -u src/distrib/utils/sysinst/net.c:1.128 src/distrib/utils/sysinst/net.c:1.129
--- src/distrib/utils/sysinst/net.c:1.128 Thu Jan 5 21:29:24 2012
+++ src/distrib/utils/sysinst/net.c Mon Jan 9 02:52:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.128 2012/01/05 21:29:24 christos Exp $ */
+/* $NetBSD: net.c,v 1.129 2012/01/09 02:52:50 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1109,20 +1109,19 @@ mnt_net_config(void)
if ((net_dhcpconf & DHCPCONF_HOST) == 0)
add_rc_conf("hostname=%s\n", recombine_host_domain());
- /* If not running in target, copy resolv.conf there. */
- if ((net_dhcpconf & DHCPCONF_NAMESVR) == 0) {
+ /* Copy resolv.conf to target. If DHCP was used to create it,
+ * it will be replaced on next boot anyway. */
#ifndef INET6
- if (net_namesvr[0] != '\0')
- dup_file_into_target("/etc/resolv.conf");
+ if (net_namesvr[0] != '\0')
+ dup_file_into_target("/etc/resolv.conf");
#else
- /*
- * not sure if it is a good idea, to allow dhcp config to
- * override IPv6 configuration
- */
- if (net_namesvr[0] != '\0' || net_namesvr6[0] != '\0')
- dup_file_into_target("/etc/resolv.conf");
+ /*
+ * not sure if it is a good idea, to allow dhcp config to
+ * override IPv6 configuration
+ */
+ if (net_namesvr[0] != '\0' || net_namesvr6[0] != '\0')
+ dup_file_into_target("/etc/resolv.conf");
#endif
- }
/*
* bring the interface up, it will be necessary for IPv6, and
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: riz
Date: Mon Jan 9 01:51:48 UTC 2012
Modified Files:
src/distrib/utils/sysinst: disks.c msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl
Log Message:
Use the "doingwhat" message for the multiple disks case, not just the
single-disk case.
XXX Native speakers of .fr, .es, .de, and .pl please make sure the
replacement makes sense. Thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.59 -r1.60 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.167 -r1.168 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.117 -r1.118 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.76 -r1.77 src/distrib/utils/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.122 src/distrib/utils/sysinst/disks.c:1.123
--- src/distrib/utils/sysinst/disks.c:1.122 Thu Jan 5 22:18:36 2012
+++ src/distrib/utils/sysinst/disks.c Mon Jan 9 01:51:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.122 2012/01/05 22:18:36 christos Exp $ */
+/* $NetBSD: disks.c,v 1.123 2012/01/09 01:51:47 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -402,7 +402,7 @@ find_disks(const char *doingwhat)
NULL, NULL, NULL, NULL, NULL);
if (menu_no == -1)
return -1;
- msg_display(MSG_ask_disk);
+ msg_display(MSG_ask_disk, doingwhat);
process_menu(menu_no, &selected_disk);
free_menu(menu_no);
}
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.59 src/distrib/utils/sysinst/msg.mi.de:1.60
--- src/distrib/utils/sysinst/msg.mi.de:1.59 Sun Jan 8 02:32:00 2012
+++ src/distrib/utils/sysinst/msg.mi.de Mon Jan 9 01:51:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.59 2012/01/08 02:32:00 christos Exp $ */
+/* $NetBSD: msg.mi.de,v 1.60 2012/01/09 01:51:47 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -136,7 +136,7 @@ Sie NetBSD darauf %s möchten.
}
message ask_disk
-{Auf welcher Festplatte möchten Sie NetBSD installieren? }
+{Auf welcher Festplatte möchten Sie NetBSD %s? }
message Available_disks
{Verfügbare Festplatten}
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.167 src/distrib/utils/sysinst/msg.mi.en:1.168
--- src/distrib/utils/sysinst/msg.mi.en:1.167 Sun Jan 8 02:32:00 2012
+++ src/distrib/utils/sysinst/msg.mi.en Mon Jan 9 01:51:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.167 2012/01/08 02:32:00 christos Exp $ */
+/* $NetBSD: msg.mi.en,v 1.168 2012/01/09 01:51:47 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -129,7 +129,7 @@ Therefore I assume you want to %s NetBSD
}
message ask_disk
-{On which disk do you want to install NetBSD? }
+{On which disk do you want to %s NetBSD? }
message Available_disks
{Available disks}
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.37 src/distrib/utils/sysinst/msg.mi.es:1.38
--- src/distrib/utils/sysinst/msg.mi.es:1.37 Sun Jan 8 02:32:00 2012
+++ src/distrib/utils/sysinst/msg.mi.es Mon Jan 9 01:51:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.37 2012/01/08 02:32:00 christos Exp $ */
+/* $NetBSD: msg.mi.es,v 1.38 2012/01/09 01:51:47 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -136,7 +136,7 @@ Por tanto se entiende que quiere %s NetB
}
message ask_disk
-{¿En cuál disco quiere instalar NetBSD? }
+{¿En cuál disco quiere %s NetBSD? }
message Available_disks
{Discos disponibles}
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.117 src/distrib/utils/sysinst/msg.mi.fr:1.118
--- src/distrib/utils/sysinst/msg.mi.fr:1.117 Sun Jan 8 02:32:00 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Mon Jan 9 01:51:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.117 2012/01/08 02:32:00 christos Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.118 2012/01/09 01:51:47 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -137,7 +137,7 @@ message onedisk
}
message ask_disk
-{Sur quel disque voulez-vous installer NetBSD ?}
+{Sur quel disque voulez-vous %s NetBSD ?}
message Available_disks
{Disques disponibles :}
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.76 src/distrib/utils/sysinst/msg.mi.pl:1.77
--- src/distrib/utils/sysinst/msg.mi.pl:1.76 Sun Jan 8 02:32:00 2012
+++ src/distrib/utils/sysinst/msg.mi.pl Mon Jan 9 01:51:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.76 2012/01/08 02:32:00 christos Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.77 2012/01/09 01:51:47 riz Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: riz
Date: Sun Jan 8 21:20:41 UTC 2012
Modified Files:
src/distrib/utils/sysinst: Makefile.inc
Log Message:
Add defs.h to DPSRCS.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/distrib/utils/sysinst/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/Makefile.inc
diff -u src/distrib/utils/sysinst/Makefile.inc:1.57 src/distrib/utils/sysinst/Makefile.inc:1.58
--- src/distrib/utils/sysinst/Makefile.inc:1.57 Tue Nov 1 09:26:37 2011
+++ src/distrib/utils/sysinst/Makefile.inc Sun Jan 8 21:20:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.57 2011/11/01 09:26:37 martin Exp $
+# $NetBSD: Makefile.inc,v 1.58 2012/01/08 21:20:40 riz Exp $
#
# Makefile for sysinst
@@ -20,6 +20,8 @@ SRCS+= ${MENUS_MD:Mmenus.mbr:S/menus.mbr
SRCS+= ${CPPFLAGS:M-DWSKBD:S/-DWSKBD/wskbd.c/}
SRCS+= ${NODISKLABEL:D:Ubsddisklabel.c savenewlabel.c}
+DPSRCS+= defs.h
+
SYSINSTLANG?= en
LANGUAGES?= de en es fr pl
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Sun Jan 8 02:32:00 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.de msg.mi.en msg.mi.es msg.mi.fr
msg.mi.pl upgrade.c
Log Message:
work for both X11R6 and X11R7
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.166 -r1.167 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.116 -r1.117 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.75 -r1.76 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.52 -r1.53 src/distrib/utils/sysinst/upgrade.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.58 src/distrib/utils/sysinst/msg.mi.de:1.59
--- src/distrib/utils/sysinst/msg.mi.de:1.58 Sat Jan 7 13:54:30 2012
+++ src/distrib/utils/sysinst/msg.mi.de Sat Jan 7 21:32:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.58 2012/01/07 18:54:30 christos Exp $ */
+/* $NetBSD: msg.mi.de,v 1.59 2012/01/08 02:32:00 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -677,18 +677,18 @@ Aktualisierung wird abgebrochen.
}
message X_oldexists
-{Der alte X Server /usr/X11R7/bin/X kann nicht als /usr/X11R7/bin/X.old
+{Der alte X Server %s/bin/X kann nicht als %s/bin/X.old
gesichert werden, da eine Datei mit diesem Namen bereits existiert.
Bitte korrigieren Sie dies, bevor Sie fortfahren.
Eine Möglichkeit ist es, im Extras-Menü eine Shell zu starten,
-wodurch Sie /usr/X11R7/bin/X.old überprüfen können. Gehört diese Datei zu
+wodurch Sie %s/bin/X.old überprüfen können. Gehört diese Datei zu
einer früheren Aktualisierung, so können Sie diese mit rm -f
-/usr/X11R7/bin/x.old löschen und danach die Aktualisierung neu starten.
-Gehört die Datei /usr/X11R7/bin/X.old aber zu einer aktuellen,
-abgebrochenen Aktualisierung, so können Sie die Datei /usr/X11R7/bin/X mit
-mv /usr/X11R7/bin/X.old /usr/X11R7/bin/X wieder herstellen und die
-unvollständige Aktualisierung fortsetzen.
+%s/bin/x.old löschen und danach die Aktualisierung neu starten.
+Gehört die Datei %s/bin/X.old aber zu einer aktuellen,
+abgebrochenen Aktualisierung, so können Sie die Datei %s/bin/X mit
+mv %s/bin/X.old %s/bin/X wieder herstellen und die
+unvollständige Aktualisierung fortsetzen. %0s%0s%0s
Aktualisierung wird abgebrochen.}
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.166 src/distrib/utils/sysinst/msg.mi.en:1.167
--- src/distrib/utils/sysinst/msg.mi.en:1.166 Sat Jan 7 13:54:30 2012
+++ src/distrib/utils/sysinst/msg.mi.en Sat Jan 7 21:32:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.166 2012/01/07 18:54:30 christos Exp $ */
+/* $NetBSD: msg.mi.en,v 1.167 2012/01/08 02:32:00 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -649,16 +649,16 @@ message badetcfstab
}
message X_oldexists
-{I cannot save /usr/X11R7/bin/X as /usr/X11R7/bin/X.old, because the
-target disk already has an /usr/X11R7/bin/X.old. Please fix this before
+{I cannot save %s/bin/X as %s/bin/X.old, because the
+target disk already has an %s/bin/X.old. Please fix this before
continuing.
One way is to start a shell from the Utilities menu, examine the
-target /usr/X11R7/bin/X and /usr/X11R7/bin/X.old. If
-/usr/X11R7/bin/X.old is from a completed upgrade, you can rm -f
-/usr/X11R7/bin/X.old and restart. Or if /usr/X11R7/bin/X.old is from
-a recent, incomplete upgrade, you can rm -f /usr/X11R7/bin/X and mv
-/usr/X11R7/bin/X.old to /usr/X11R7/bin/X.
+target %s/bin/X and %s/bin/X.old. If
+%s/bin/X.old is from a completed upgrade, you can rm -f
+%s/bin/X.old and restart. Or if %s/bin/X.old is from
+a recent, incomplete upgrade, you can rm -f %s/bin/X and mv
+%s/bin/X.old to %s/bin/X
Aborting upgrade.}
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.36 src/distrib/utils/sysinst/msg.mi.es:1.37
--- src/distrib/utils/sysinst/msg.mi.es:1.36 Sat Jan 7 13:54:30 2012
+++ src/distrib/utils/sysinst/msg.mi.es Sat Jan 7 21:32:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.36 2012/01/07 18:54:30 christos Exp $ */
+/* $NetBSD: msg.mi.es,v 1.37 2012/01/08 02:32:00 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -669,16 +669,16 @@ Interrumpiendo la actualización.
}
message X_oldexists
-{No se puede guardar /usr/X11R7/bin/X como /usr/X11R7/bin/X.old, porque el
-disco objetivo ya tiene un /usr/X11R7/bin/X.old. Por favor, arregle esto
+{No se puede guardar %s/bin/X como %s/bin/X.old, porque el
+disco objetivo ya tiene un %s/bin/X.old. Por favor, arregle esto
antes de continuar.
Una manera es iniciando una shell desde el menú Utilidades, y examinar
-el objetivo /usr/X11R7/bin/X y /usr/X11R7/bin/X.old. Si
-/
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Sun Jan 8 02:24:32 UTC 2012
Modified Files:
src/distrib/utils/sysinst: aout2elf.c
Log Message:
this is only valid for X11R6; we never had a.out X11R7
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/sysinst/aout2elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/aout2elf.c
diff -u src/distrib/utils/sysinst/aout2elf.c:1.18 src/distrib/utils/sysinst/aout2elf.c:1.19
--- src/distrib/utils/sysinst/aout2elf.c:1.18 Sat Jan 7 13:54:30 2012
+++ src/distrib/utils/sysinst/aout2elf.c Sat Jan 7 21:24:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: aout2elf.c,v 1.18 2012/01/07 18:54:30 christos Exp $
+/* $NetBSD: aout2elf.c,v 1.19 2012/01/08 02:24:32 christos Exp $
*
* Copyright 1997 Piermont Information Systems Inc.
* All rights reserved.
@@ -287,11 +287,11 @@ domove:
n = handle_aout_libs(src, LIB_MOVE, concat_paths(prefix, "usr/lib"));
if (run_program(0, "mkdir -p %s ",
- concat_paths(prefix, "usr/X11R7/lib")))
+ concat_paths(prefix, "usr/X11R6/lib")))
abort_libupdate();
- strlcpy(src, target_expand("/usr/X11R7/lib"), sizeof(src));
- handle_aout_x_libs(src, concat_paths(prefix, "usr/X11R7/lib"));
+ strlcpy(src, target_expand("/usr/X11R6/lib"), sizeof(src));
+ handle_aout_x_libs(src, concat_paths(prefix, "usr/X11R6/lib"));
if (backedup) {
msg_display(MSG_emulbackup);
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Sat Jan 7 18:54:31 UTC 2012
Modified Files:
src/distrib/utils/sysinst: aout2elf.c msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl upgrade.c
Log Message:
only deal with X11R7 now.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/aout2elf.c
cvs rdiff -u -r1.57 -r1.58 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.165 -r1.166 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.115 -r1.116 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.74 -r1.75 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/upgrade.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/aout2elf.c
diff -u src/distrib/utils/sysinst/aout2elf.c:1.17 src/distrib/utils/sysinst/aout2elf.c:1.18
--- src/distrib/utils/sysinst/aout2elf.c:1.17 Fri Sep 16 11:42:28 2011
+++ src/distrib/utils/sysinst/aout2elf.c Sat Jan 7 13:54:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: aout2elf.c,v 1.17 2011/09/16 15:42:28 joerg Exp $
+/* $NetBSD: aout2elf.c,v 1.18 2012/01/07 18:54:30 christos Exp $
*
* Copyright 1997 Piermont Information Systems Inc.
* All rights reserved.
@@ -287,11 +287,11 @@ domove:
n = handle_aout_libs(src, LIB_MOVE, concat_paths(prefix, "usr/lib"));
if (run_program(0, "mkdir -p %s ",
- concat_paths(prefix, "usr/X11R6/lib")))
+ concat_paths(prefix, "usr/X11R7/lib")))
abort_libupdate();
- strlcpy(src, target_expand("/usr/X11R6/lib"), sizeof(src));
- handle_aout_x_libs(src, concat_paths(prefix, "usr/X11R6/lib"));
+ strlcpy(src, target_expand("/usr/X11R7/lib"), sizeof(src));
+ handle_aout_x_libs(src, concat_paths(prefix, "usr/X11R7/lib"));
if (backedup) {
msg_display(MSG_emulbackup);
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.57 src/distrib/utils/sysinst/msg.mi.de:1.58
--- src/distrib/utils/sysinst/msg.mi.de:1.57 Sun Apr 17 08:33:42 2011
+++ src/distrib/utils/sysinst/msg.mi.de Sat Jan 7 13:54:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.57 2011/04/17 12:33:42 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.58 2012/01/07 18:54:30 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -677,17 +677,17 @@ Aktualisierung wird abgebrochen.
}
message X_oldexists
-{Der alte X Server /usr/X11R6/bin/X kann nicht als /usr/X11R6/bin/X.old
+{Der alte X Server /usr/X11R7/bin/X kann nicht als /usr/X11R7/bin/X.old
gesichert werden, da eine Datei mit diesem Namen bereits existiert.
Bitte korrigieren Sie dies, bevor Sie fortfahren.
Eine Möglichkeit ist es, im Extras-Menü eine Shell zu starten,
-wodurch Sie /usr/X11R6/bin/X.old überprüfen können. Gehört diese Datei zu
+wodurch Sie /usr/X11R7/bin/X.old überprüfen können. Gehört diese Datei zu
einer früheren Aktualisierung, so können Sie diese mit rm -f
-/usr/X11R6/bin/x.old löschen und danach die Aktualisierung neu starten.
-Gehört die Datei /usr/X11R6/bin/X.old aber zu einer aktuellen,
-abgebrochenen Aktualisierung, so können Sie die Datei /usr/X11R6/bin/X mit
-mv /usr/X11R6/bin/X.old /usr/X11R6/bin/X wieder herstellen und die
+/usr/X11R7/bin/x.old löschen und danach die Aktualisierung neu starten.
+Gehört die Datei /usr/X11R7/bin/X.old aber zu einer aktuellen,
+abgebrochenen Aktualisierung, so können Sie die Datei /usr/X11R7/bin/X mit
+mv /usr/X11R7/bin/X.old /usr/X11R7/bin/X wieder herstellen und die
unvollständige Aktualisierung fortsetzen.
Aktualisierung wird abgebrochen.}
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.165 src/distrib/utils/sysinst/msg.mi.en:1.166
--- src/distrib/utils/sysinst/msg.mi.en:1.165 Sun Apr 17 08:33:42 2011
+++ src/distrib/utils/sysinst/msg.mi.en Sat Jan 7 13:54:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.165 2011/04/17 12:33:42 martin Exp $ */
+/* $NetBSD: msg.mi.en,v 1.166 2012/01/07 18:54:30 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -649,16 +649,16 @@ message badetcfstab
}
message X_oldexists
-{I cannot save /usr/X11R6/bin/X as /usr/X11R6/bin/X.old, because the
-target disk already has an /usr/X11R6/bin/X.old. Please fix this before
+{I cannot save /usr/X11R7/bin/X as /usr/X11R7/bin/X.old, because the
+target disk already has an /usr/X11R7/bin/X.old. Please fix this before
continuing.
One way is to start a shell from the Utilities menu, examine the
-target /usr/X11R6/bin/X and /usr/X11R6/bin/X.old. If
-/usr/X11R6/bin/X.old is from a completed upgrade, you can rm -f
-/usr/X11R6/bin/X.old and restart. Or if /usr/X11R6/bin/X.old is from
-a recent, incomplete upgrade, you can rm -f /usr/X11R6/bin/X and mv
-/usr/X11R6/bin/X.old to /usr/X11R6/bin/X.
+target /usr/X11R7/bin/X and /usr/X11R7/bin/X.old. If
+/usr/X11R7/bin/X.old is from a com
CVS commit: src/distrib/utils/sysinst/arch/sandpoint
Module Name:src
Committed By: riz
Date: Fri Jan 6 20:52:43 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/sandpoint: md.c
Log Message:
Don't use snprintf() to format, when run_program() will do it nicely on
its own. Suggested by joerg.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/sysinst/arch/sandpoint/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/sandpoint/md.c
diff -u src/distrib/utils/sysinst/arch/sandpoint/md.c:1.37 src/distrib/utils/sysinst/arch/sandpoint/md.c:1.38
--- src/distrib/utils/sysinst/arch/sandpoint/md.c:1.37 Fri Nov 4 11:27:04 2011
+++ src/distrib/utils/sysinst/arch/sandpoint/md.c Fri Jan 6 20:52:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.37 2011/11/04 11:27:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.38 2012/01/06 20:52:43 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -168,7 +168,6 @@ md_cleanup_install(void)
{
#ifndef DEBUG
int new_speed;
- char sed_cmd[64];
enable_rc_conf();
@@ -187,9 +186,8 @@ md_cleanup_install(void)
new_speed = 0;
if (new_speed != 0) {
- snprintf(sed_cmd, 64, "sed -an -e 's/115200/%d/;H;$!d;g;w"
+ run_program(RUN_CHROOT, "sed -an -e 's/115200/%d/;H;$!d;g;w"
"/etc/ttys' /etc/ttys", new_speed);
- run_program(RUN_CHROOT, sed_cmd);
}
#endif
}
CVS commit: src/distrib/utils/sysinst/arch/mac68k
Module Name:src Committed By: riz Date: Fri Jan 6 20:41:28 UTC 2012 Modified Files: src/distrib/utils/sysinst/arch/mac68k: md.c Log Message: Use getfslabelname() instead of trying to access fstypenames[] directly. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/distrib/utils/sysinst/arch/mac68k/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/arch/mac68k/md.c diff -u src/distrib/utils/sysinst/arch/mac68k/md.c:1.60 src/distrib/utils/sysinst/arch/mac68k/md.c:1.61 --- src/distrib/utils/sysinst/arch/mac68k/md.c:1.60 Fri Nov 4 11:27:03 2011 +++ src/distrib/utils/sysinst/arch/mac68k/md.c Fri Jan 6 20:41:28 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.60 2011/11/04 11:27:03 martin Exp $ */ +/* $NetBSD: md.c,v 1.61 2012/01/06 20:41:28 riz Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -336,7 +336,7 @@ md_make_bsd_partitions(void) (void)fprintf (f, "\t:p%c#%d:o%c#%d:t%c=%s:", 'a'+i, bsdlabel[i].pi_size, 'a'+i, bsdlabel[i].pi_offset, - 'a'+i, fstypenames[bsdlabel[i].pi_fstype]); + 'a'+i, getfslabelname(bsdlabel[i].pi_fstype)); if (bsdlabel[i].pi_fstype == FS_BSDFFS) (void)fprintf (f, "b%c#%d:f%c#%d", 'a'+i, bsdlabel[i].pi_fsize * bsdlabel[i].pi_frag,
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Thu Jan 5 22:18:36 UTC 2012
Modified Files:
src/distrib/utils/sysinst: defs.h disks.c label.c savenewlabel.c
Log Message:
we want the label name not the fstype name.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.121 -r1.122 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.60 -r1.61 src/distrib/utils/sysinst/label.c
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/savenewlabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.159 src/distrib/utils/sysinst/defs.h:1.160
--- src/distrib/utils/sysinst/defs.h:1.159 Thu Jan 5 16:29:24 2012
+++ src/distrib/utils/sysinst/defs.h Thu Jan 5 17:18:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.159 2012/01/05 21:29:24 christos Exp $ */
+/* $NetBSD: defs.h,v 1.160 2012/01/05 22:18:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,6 +41,8 @@
#include
#include
+const char *getfslabelname(uint8_t);
+
static inline void *
deconst(const void *p)
{
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.121 src/distrib/utils/sysinst/disks.c:1.122
--- src/distrib/utils/sysinst/disks.c:1.121 Thu Jan 5 16:29:24 2012
+++ src/distrib/utils/sysinst/disks.c Thu Jan 5 17:18:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.121 2012/01/05 21:29:24 christos Exp $ */
+/* $NetBSD: disks.c,v 1.122 2012/01/05 22:18:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -46,6 +46,7 @@
#include
#include
#include
+#define FSTYPENAMES
#include
#include
@@ -87,6 +88,14 @@ static void fixsb(const char *, const ch
static const char *disk_names[] = { DISK_NAMES, "vnd", NULL };
+const char *
+getfslabelname(uint8_t f)
+{
+ if (f >= __arraycount(fstypenames) || fstypenames[f] == NULL)
+ return "invalid";
+ return fstypenames[f];
+}
+
/* from src/sbin/atactl/atactl.c
* extract_string: copy a block of bytes out of ataparams and make
* a proper string out of it, truncating trailing spaces and preserving
@@ -455,7 +464,7 @@ fmt_fspart(menudesc *m, int ptn, void *a
else
desc = "FFSv1";
else
- desc = getfstypename(p->pi_fstype);
+ desc = getfslabelname(p->pi_fstype);
#ifdef PART_BOOT
if (ptn == PART_BOOT)
Index: src/distrib/utils/sysinst/label.c
diff -u src/distrib/utils/sysinst/label.c:1.60 src/distrib/utils/sysinst/label.c:1.61
--- src/distrib/utils/sysinst/label.c:1.60 Thu Jan 5 15:22:33 2012
+++ src/distrib/utils/sysinst/label.c Thu Jan 5 17:18:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.60 2012/01/05 20:22:33 christos Exp $ */
+/* $NetBSD: label.c,v 1.61 2012/01/05 22:18:36 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.60 2012/01/05 20:22:33 christos Exp $");
+__RCSID("$NetBSD: label.c,v 1.61 2012/01/05 22:18:36 christos Exp $");
#endif
#include
@@ -387,7 +387,7 @@ edit_ptn(menudesc *menu, void *arg)
if (all_fstype_menu == -1) {
for (i = 0; i < nelem(all_fstypes); i++) {
- all_fstypes[i].opt_name = getfstypename(i);
+ all_fstypes[i].opt_name = getfslabelname(i);
all_fstypes[i].opt_menu = OPT_NOMENU;
all_fstypes[i].opt_flags = 0;
all_fstypes[i].opt_action = set_fstype;
@@ -487,7 +487,7 @@ set_ptn_label(menudesc *m, int opt, void
else
c = "FFSv1";
else
- c = getfstypename(p->pi_fstype);
+ c = getfslabelname(p->pi_fstype);
wprintw(m->mw, msg_string(MSG_fstype_fmt), c);
break;
case PTN_MENU_START:
Index: src/distrib/utils/sysinst/savenewlabel.c
diff -u src/distrib/utils/sysinst/savenewlabel.c:1.11 src/distrib/utils/sysinst/savenewlabel.c:1.12
--- src/distrib/utils/sysinst/savenewlabel.c:1.11 Thu Jan 5 16:29:25 2012
+++ src/distrib/utils/sysinst/savenewlabel.c Thu Jan 5 17:18:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: savenewlabel.c,v 1.11 2012/01/05 21:29:25 christos Exp $ */
+/* $NetBSD: savenewlabel.c,v 1.12 2012/01/05 22:18:36 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: savenewlabel.c,v 1.11 2012/01/05 21:29:25 christos Exp $");
+__RCSID("$NetBSD: savenewlabel.c,v 1.12 2012/01/05 22:18:36 christos Exp $");
#endif
#include
@@ -94,10 +94,10 @@ savenewlabel(partinfo *lp, int nparts)
scripting_fprintf(f, "\t:p%c#%" PRIu32 ":o%c#%" PRIu32
":t%c=%s:", 'a'+i, (uint32_t)bsdlabel[i].pi_size,
'a'+i, (uint32_t)bsdlabel[i].pi_offset, 'a'+i,
- getfstypename(bsdlabel[i].pi_fstype));
+ getfslabelname(bsdlabel[i].pi_fstype));
if (PI_ISBSDFS(&bsdlabel[i]))
scripting_fprintf (f, "b%c#%" PRIu32 ":f%c#%" PRIu32
- ":ta=4.2BSD:", 'a'+i,
+ ":", 'a'+i
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: christos
Date: Thu Jan 5 21:32:37 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/emips: md.c
src/distrib/utils/sysinst/arch/hp300: md.c
src/distrib/utils/sysinst/arch/hp700: md.c
src/distrib/utils/sysinst/arch/mipsco: md.c
src/distrib/utils/sysinst/arch/mvme68k: md.c
src/distrib/utils/sysinst/arch/pmax: md.c
src/distrib/utils/sysinst/arch/sgimips: md.c
src/distrib/utils/sysinst/arch/sparc: md.c
src/distrib/utils/sysinst/arch/sparc64: md.c
src/distrib/utils/sysinst/arch/vax: md.c
src/distrib/utils/sysinst/arch/x68k: md.c
Log Message:
eliminate logging variable from md code.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/emips/md.c
cvs rdiff -u -r1.31 -r1.32 src/distrib/utils/sysinst/arch/hp300/md.c
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/sysinst/arch/hp700/md.c
cvs rdiff -u -r1.19 -r1.20 src/distrib/utils/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.26 -r1.27 src/distrib/utils/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.66 -r1.67 src/distrib/utils/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/sysinst/arch/sgimips/md.c
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/arch/sparc/md.c
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/sysinst/arch/sparc64/md.c
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/sysinst/arch/vax/md.c
cvs rdiff -u -r1.42 -r1.43 src/distrib/utils/sysinst/arch/x68k/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/emips/md.c
diff -u src/distrib/utils/sysinst/arch/emips/md.c:1.4 src/distrib/utils/sysinst/arch/emips/md.c:1.5
--- src/distrib/utils/sysinst/arch/emips/md.c:1.4 Fri Nov 4 07:27:02 2011
+++ src/distrib/utils/sysinst/arch/emips/md.c Thu Jan 5 16:32:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.5 2012/01/05 21:32:35 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -70,14 +70,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/hp300/md.c
diff -u src/distrib/utils/sysinst/arch/hp300/md.c:1.31 src/distrib/utils/sysinst/arch/hp300/md.c:1.32
--- src/distrib/utils/sysinst/arch/hp300/md.c:1.31 Fri Nov 4 07:27:02 2011
+++ src/distrib/utils/sysinst/arch/hp300/md.c Thu Jan 5 16:32:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.31 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.32 2012/01/05 21:32:35 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -70,14 +70,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/hp700/md.c
diff -u src/distrib/utils/sysinst/arch/hp700/md.c:1.12 src/distrib/utils/sysinst/arch/hp700/md.c:1.13
--- src/distrib/utils/sysinst/arch/hp700/md.c:1.12 Fri Nov 4 07:27:02 2011
+++ src/distrib/utils/sysinst/arch/hp700/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.12 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.13 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -72,14 +72,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/mipsco/md.c
diff -u src/distrib/utils/sysinst/arch/mipsco/md.c:1.19 src/distrib/utils/sysinst/arch/mipsco/md.c:1.20
--- src/distrib/utils/sysinst/arch/mipsco/md.c:1.19 Fri Nov 4 07:27:03 2011
+++ src/distrib/utils/sysinst/arch/mipsco/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.19 2011/11/04 11:27:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.20 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -71,14 +71,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Thu Jan 5 21:29:25 UTC 2012
Modified Files:
src/distrib/utils/sysinst: defs.h disks.c main.c mbr.c net.c run.c
savenewlabel.c target.c util.c
Log Message:
eliminate useless booleans and use the file pointers as conditionals.
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.120 -r1.121 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.61 -r1.62 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.88 -r1.89 src/distrib/utils/sysinst/mbr.c
cvs rdiff -u -r1.127 -r1.128 src/distrib/utils/sysinst/net.c
cvs rdiff -u -r1.68 -r1.69 src/distrib/utils/sysinst/run.c
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/savenewlabel.c
cvs rdiff -u -r1.53 -r1.54 src/distrib/utils/sysinst/target.c
cvs rdiff -u -r1.171 -r1.172 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.158 src/distrib/utils/sysinst/defs.h:1.159
--- src/distrib/utils/sysinst/defs.h:1.158 Thu Jan 5 16:22:49 2012
+++ src/distrib/utils/sysinst/defs.h Thu Jan 5 16:29:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.158 2012/01/05 21:22:49 christos Exp $ */
+/* $NetBSD: defs.h,v 1.159 2012/01/05 21:29:24 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -231,8 +231,6 @@ const char *multname;
/* loging variables */
-int logging;
-int scripting;
FILE *logfp;
FILE *script;
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.120 src/distrib/utils/sysinst/disks.c:1.121
--- src/distrib/utils/sysinst/disks.c:1.120 Thu Jan 5 16:22:49 2012
+++ src/distrib/utils/sysinst/disks.c Thu Jan 5 16:29:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.120 2012/01/05 21:22:49 christos Exp $ */
+/* $NetBSD: disks.c,v 1.121 2012/01/05 21:29:24 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -651,7 +651,7 @@ make_fstab(void)
/* Create the fstab. */
make_target_dir("/etc");
f = target_fopen("/etc/fstab", "w");
- if (logging)
+ if (logfp)
(void)fprintf(logfp,
"Creating %s/etc/fstab.\n", target_prefix());
scripting_fprintf(NULL, "cat <%s/etc/fstab\n", target_prefix());
@@ -659,7 +659,7 @@ make_fstab(void)
if (f == NULL) {
#ifndef DEBUG
msg_display(MSG_createfstab);
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Failed to make /etc/fstab!\n");
process_menu(MENU_ok, NULL);
return 1;
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.61 src/distrib/utils/sysinst/main.c:1.62
--- src/distrib/utils/sysinst/main.c:1.61 Fri Sep 16 11:42:28 2011
+++ src/distrib/utils/sysinst/main.c Thu Jan 5 16:29:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.61 2011/09/16 15:42:28 joerg Exp $ */
+/* $NetBSD: main.c,v 1.62 2012/01/05 21:29:24 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -60,8 +60,6 @@ static void cleanup(void);
static void process_f_flag(char *);
static int exit_cleanly = 0; /* Did we finish nicely? */
-int logging; /* are we logging everything? */
-int scripting; /* are we building a script? */
FILE *logfp; /* log file */
FILE *script; /* script file */
@@ -126,13 +124,10 @@ main(int argc, char **argv)
WINDOW *win;
int ch;
- logging = 0; /* shut them off unless turned on by the user */
init();
#ifdef DEBUG
log_flip();
#endif
- scripting = 0;
-
/* Check for TERM ... */
if (!getenv("TERM")) {
(void)fprintf(stderr,
@@ -407,16 +402,18 @@ cleanup(void)
endwin();
- if (logging) {
+ if (logfp) {
fprintf(logfp, "Log ended at: %s\n", asctime(localtime(&tloc)));
fflush(logfp);
fclose(logfp);
+ logfp = NULL;
}
- if (scripting) {
+ if (script) {
fprintf(script, "# Script ended at: %s\n",
asctime(localtime(&tloc)));
fflush(script);
fclose(script);
+ script = NULL;
}
if (!exit_cleanly)
Index: src/distrib/utils/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.88 src/distrib/utils/sysinst/mbr.c:1.89
--- src/distrib/utils/sysinst/mbr.c:1.88 Mon Oct 17 12:35:22 2011
+++ src/distrib/utils/sysinst/mbr.c Thu Jan 5 16:29:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.88 2011/10/17 16:35:22 mbalmer Exp $ */
+/* $NetBSD: mbr.c,v 1.89 2012/01/05 21:29:24 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1287,7 +1287,7 @@ edit_mbr(mbr_info_t *mbri)
msg_display(MSG_ovrwrite);
process_menu(MENU_noyes, NULL);
if (!yesno) {
-if (logging)
+if (logfp)
(void)fprintf(logfp, "User answered no to destroy other data, aborting.\n");
return 0;
}
Index: src/distrib/utils/sysinst/net.c
diff -u src/distrib/utils/sysinst/net.c:1.127 src/distrib/utils/sysinst/net.c:1.128
--- src/distrib/utils/sysinst/net.c:1.127 Mon Apr 4 04:30:13
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Thu Jan 5 21:22:49 UTC 2012
Modified Files:
src/distrib/utils/sysinst: defs.h disks.c savenewlabel.c target.c
Log Message:
- add printflike and fix the broken formats
- make sure we don't exceed the number of partitions we have
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.119 -r1.120 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/savenewlabel.c
cvs rdiff -u -r1.52 -r1.53 src/distrib/utils/sysinst/target.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.157 src/distrib/utils/sysinst/defs.h:1.158
--- src/distrib/utils/sysinst/defs.h:1.157 Thu Jan 5 15:21:35 2012
+++ src/distrib/utils/sysinst/defs.h Thu Jan 5 16:22:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.157 2012/01/05 20:21:35 christos Exp $ */
+/* $NetBSD: defs.h,v 1.158 2012/01/05 21:22:49 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -384,8 +384,8 @@ int config_network(void);
void mnt_net_config(void);
/* From run.c */
-int collect(int, char **, const char *, ...);
-int run_program(int, const char *, ...);
+int collect(int, char **, const char *, ...) __printflike(3, 4);
+int run_program(int, const char *, ...) __printflike(2, 3);
void do_logging(void);
int do_system(const char *);
@@ -416,10 +416,10 @@ int sanity_check(void);
int set_timezone(void);
int set_root_password(void);
int set_root_shell(void);
-void scripting_fprintf(FILE *, const char *, ...);
-void scripting_vfprintf(FILE *, const char *, va_list);
+void scripting_fprintf(FILE *, const char *, ...) __printflike(2, 3);
+void scripting_vfprintf(FILE *, const char *, va_list) __printflike(2, 0);
void add_rc_conf(const char *, ...);
-void add_sysctl_conf(const char *, ...);
+void add_sysctl_conf(const char *, ...) __printflike(1, 2);
void enable_rc_conf(void);
void set_sizemultname_cyl(void);
void set_sizemultname_meg(void);
@@ -437,7 +437,8 @@ const char *target_expand(const char *);
void make_target_dir(const char *);
void append_to_target_file(const char *, const char *);
void echo_to_target_file(const char *, const char *);
-void sprintf_to_target_file(const char *, const char *, ...);
+void sprintf_to_target_file(const char *, const char *, ...)
+__printflike(2, 3);
void trunc_target_file(const char *);
const char *target_prefix(void);
int target_chdir(const char *);
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.119 src/distrib/utils/sysinst/disks.c:1.120
--- src/distrib/utils/sysinst/disks.c:1.119 Thu Jan 5 15:21:35 2012
+++ src/distrib/utils/sysinst/disks.c Thu Jan 5 16:22:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.119 2012/01/05 20:21:35 christos Exp $ */
+/* $NetBSD: disks.c,v 1.120 2012/01/05 21:22:49 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -668,7 +668,7 @@ make_fstab(void)
#endif
}
- scripting_fprintf(f, "# NetBSD /etc/fstab\n# See /usr/share/examples/"
+ scripting_fprintf(f, "# NetBSD %s/etc/fstab\n# See /usr/share/examples/"
"fstab/ for more examples.\n", target_prefix());
for (i = 0; i < getmaxpartitions(); i++) {
const char *s = "";
Index: src/distrib/utils/sysinst/savenewlabel.c
diff -u src/distrib/utils/sysinst/savenewlabel.c:1.9 src/distrib/utils/sysinst/savenewlabel.c:1.10
--- src/distrib/utils/sysinst/savenewlabel.c:1.9 Thu Jan 5 15:21:35 2012
+++ src/distrib/utils/sysinst/savenewlabel.c Thu Jan 5 16:22:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: savenewlabel.c,v 1.9 2012/01/05 20:21:35 christos Exp $ */
+/* $NetBSD: savenewlabel.c,v 1.10 2012/01/05 21:22:49 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: savenewlabel.c,v 1.9 2012/01/05 20:21:35 christos Exp $");
+__RCSID("$NetBSD: savenewlabel.c,v 1.10 2012/01/05 21:22:49 christos Exp $");
#endif
#include
@@ -76,7 +76,7 @@ savenewlabel(partinfo *lp, int nparts)
(void)fprintf(stderr, "Could not open /etc/disktab");
if (logging)
(void)fprintf(logfp,
- "Failed to open /etc/diskabel for appending.\n");
+ "Failed to open /etc/disktab for appending.\n");
exit (1);
}
scripting_fprintf(f, "%s|NetBSD installation generated:\\\n", bsddiskname);
@@ -85,6 +85,11 @@ savenewlabel(partinfo *lp, int nparts)
scripting_fprintf(f, "\t:sc#%d:su#%" PRIu32 ":\\\n", dlhead*dlsec,
(uint32_t)dlsize);
scripting_fprintf(f, "\t:se#%d:%s\\\n", sectorsize, doessf);
+ if ((size_t)nparts > __arraycount(bsdlabel)) {
+ nparts = __arraycount(bsdlabel);
+ if (logging)
+ (void)fprintf(logfp, "nparts limited to %d.\n", nparts);
+ }
for (i = 0; i < nparts; i++) {
scripting_fprintf(f, "\t:p%c#%" PRIu32 ":o%c#%
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Thu Jan 5 20:22:33 UTC 2012
Modified Files:
src/distrib/utils/sysinst: label.c
Log Message:
kill unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/distrib/utils/sysinst/label.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/label.c
diff -u src/distrib/utils/sysinst/label.c:1.59 src/distrib/utils/sysinst/label.c:1.60
--- src/distrib/utils/sysinst/label.c:1.59 Thu Jan 5 15:21:35 2012
+++ src/distrib/utils/sysinst/label.c Thu Jan 5 15:22:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.59 2012/01/05 20:21:35 christos Exp $ */
+/* $NetBSD: label.c,v 1.60 2012/01/05 20:22:33 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.59 2012/01/05 20:21:35 christos Exp $");
+__RCSID("$NetBSD: label.c,v 1.60 2012/01/05 20:22:33 christos Exp $");
#endif
#include
@@ -387,7 +387,6 @@ edit_ptn(menudesc *menu, void *arg)
if (all_fstype_menu == -1) {
for (i = 0; i < nelem(all_fstypes); i++) {
- char buf[128];
all_fstypes[i].opt_name = getfstypename(i);
all_fstypes[i].opt_menu = OPT_NOMENU;
all_fstypes[i].opt_flags = 0;
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Thu Jan 5 20:21:35 UTC 2012
Modified Files:
src/distrib/utils/sysinst: defs.h disks.c label.c savenewlabel.c
Log Message:
use getfstypename from libutil.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.118 -r1.119 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.58 -r1.59 src/distrib/utils/sysinst/label.c
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/savenewlabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.156 src/distrib/utils/sysinst/defs.h:1.157
--- src/distrib/utils/sysinst/defs.h:1.156 Thu Jan 5 14:43:59 2012
+++ src/distrib/utils/sysinst/defs.h Thu Jan 5 15:21:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.156 2012/01/05 19:43:59 christos Exp $ */
+/* $NetBSD: defs.h,v 1.157 2012/01/05 20:21:35 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -40,7 +40,6 @@
/* System includes needed for this. */
#include
#include
-const char *getfstypename(char *, size_t, uint8_t);
static inline void *
deconst(const void *p)
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.118 src/distrib/utils/sysinst/disks.c:1.119
--- src/distrib/utils/sysinst/disks.c:1.118 Thu Jan 5 14:43:59 2012
+++ src/distrib/utils/sysinst/disks.c Thu Jan 5 15:21:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.118 2012/01/05 19:43:59 christos Exp $ */
+/* $NetBSD: disks.c,v 1.119 2012/01/05 20:21:35 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -46,7 +46,6 @@
#include
#include
#include
-#define FSTYPENAMES
#include
#include
@@ -88,18 +87,6 @@ static void fixsb(const char *, const ch
static const char *disk_names[] = { DISK_NAMES, "vnd", NULL };
-const char *
-getfstypename(char *buf, size_t len, uint8_t fstype)
-{
-
- if (fstype >= __arraycount(fstypenames) ||
- fstypenames[fstype] == NULL)
- snprintf(buf, len, "*unknown*%" PRIu8 "*", fstype);
- else
- strlcpy(buf, fstypenames[fstype], len);
- return buf;
-}
-
/* from src/sbin/atactl/atactl.c
* extract_string: copy a block of bytes out of ataparams and make
* a proper string out of it, truncating trailing spaces and preserving
@@ -447,7 +434,6 @@ fmt_fspart(menudesc *m, int ptn, void *a
{
unsigned int poffset, psize, pend;
const char *desc;
- char buf[128];
static const char *Yes, *No;
partinfo *p = bsdlabel + ptn;
@@ -469,7 +455,7 @@ fmt_fspart(menudesc *m, int ptn, void *a
else
desc = "FFSv1";
else
- desc = getfstypename(buf, sizeof(buf), p->pi_fstype);
+ desc = getfstypename(p->pi_fstype);
#ifdef PART_BOOT
if (ptn == PART_BOOT)
Index: src/distrib/utils/sysinst/label.c
diff -u src/distrib/utils/sysinst/label.c:1.58 src/distrib/utils/sysinst/label.c:1.59
--- src/distrib/utils/sysinst/label.c:1.58 Thu Jan 5 14:43:59 2012
+++ src/distrib/utils/sysinst/label.c Thu Jan 5 15:21:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.58 2012/01/05 19:43:59 christos Exp $ */
+/* $NetBSD: label.c,v 1.59 2012/01/05 20:21:35 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.58 2012/01/05 19:43:59 christos Exp $");
+__RCSID("$NetBSD: label.c,v 1.59 2012/01/05 20:21:35 christos Exp $");
#endif
#include
@@ -388,8 +388,7 @@ edit_ptn(menudesc *menu, void *arg)
if (all_fstype_menu == -1) {
for (i = 0; i < nelem(all_fstypes); i++) {
char buf[128];
- all_fstypes[i].opt_name = strdup(getfstypename(buf,
- sizeof(buf), i));
+ all_fstypes[i].opt_name = getfstypename(i);
all_fstypes[i].opt_menu = OPT_NOMENU;
all_fstypes[i].opt_flags = 0;
all_fstypes[i].opt_action = set_fstype;
@@ -474,7 +473,6 @@ set_ptn_label(menudesc *m, int opt, void
{
partinfo *p = arg;
const char *c;
- char buf[128];
if (m->opts[opt].opt_flags & OPT_IGNORE
&& (opt != PTN_MENU_END || p->pi_fstype == FS_UNUSED)) {
@@ -490,7 +488,7 @@ set_ptn_label(menudesc *m, int opt, void
else
c = "FFSv1";
else
- c = getfstypename(buf, sizeof(buf), p->pi_fstype);
+ c = getfstypename(p->pi_fstype);
wprintw(m->mw, msg_string(MSG_fstype_fmt), c);
break;
case PTN_MENU_START:
Index: src/distrib/utils/sysinst/savenewlabel.c
diff -u src/distrib/utils/sysinst/savenewlabel.c:1.8 src/distrib/utils/sysinst/savenewlabel.c:1.9
--- src/distrib/utils/sysinst/savenewlabel.c:1.8 Thu Jan 5 14:43:59 2012
+++ src/distrib/utils/sysinst/savenewlabel.c Thu Jan 5 15:21:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: savenewlabel.c,v 1.8 2012/01/05 19:43:59 christos Exp $ */
+/* $NetBSD: savenewlabel.c,v 1.9 2012/01/05 20:21:35 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Thu Jan 5 19:43:59 UTC 2012
Modified Files:
src/distrib/utils/sysinst: defs.h disks.c label.c savenewlabel.c
Log Message:
- avoid dereferencing junk if fstype is out of bounds.
- kill mountnames since it is not used.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.117 -r1.118 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.57 -r1.58 src/distrib/utils/sysinst/label.c
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/sysinst/savenewlabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.155 src/distrib/utils/sysinst/defs.h:1.156
--- src/distrib/utils/sysinst/defs.h:1.155 Fri Nov 4 07:27:00 2011
+++ src/distrib/utils/sysinst/defs.h Thu Jan 5 14:43:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.155 2011/11/04 11:27:00 martin Exp $ */
+/* $NetBSD: defs.h,v 1.156 2012/01/05 19:43:59 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -40,8 +40,7 @@
/* System includes needed for this. */
#include
#include
-extern const char * const fstypenames[];
-extern const char * const mountnames[];
+const char *getfstypename(char *, size_t, uint8_t);
static inline void *
deconst(const void *p)
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.117 src/distrib/utils/sysinst/disks.c:1.118
--- src/distrib/utils/sysinst/disks.c:1.117 Fri Nov 4 07:27:00 2011
+++ src/distrib/utils/sysinst/disks.c Thu Jan 5 14:43:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.117 2011/11/04 11:27:00 martin Exp $ */
+/* $NetBSD: disks.c,v 1.118 2012/01/05 19:43:59 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -47,10 +47,7 @@
#include
#include
#define FSTYPENAMES
-#define MOUNTNAMES
-#define static
#include
-#undef static
#include
#include
@@ -91,6 +88,18 @@ static void fixsb(const char *, const ch
static const char *disk_names[] = { DISK_NAMES, "vnd", NULL };
+const char *
+getfstypename(char *buf, size_t len, uint8_t fstype)
+{
+
+ if (fstype >= __arraycount(fstypenames) ||
+ fstypenames[fstype] == NULL)
+ snprintf(buf, len, "*unknown*%" PRIu8 "*", fstype);
+ else
+ strlcpy(buf, fstypenames[fstype], len);
+ return buf;
+}
+
/* from src/sbin/atactl/atactl.c
* extract_string: copy a block of bytes out of ataparams and make
* a proper string out of it, truncating trailing spaces and preserving
@@ -438,6 +447,7 @@ fmt_fspart(menudesc *m, int ptn, void *a
{
unsigned int poffset, psize, pend;
const char *desc;
+ char buf[128];
static const char *Yes, *No;
partinfo *p = bsdlabel + ptn;
@@ -459,7 +469,7 @@ fmt_fspart(menudesc *m, int ptn, void *a
else
desc = "FFSv1";
else
- desc = fstypenames[p->pi_fstype];
+ desc = getfstypename(buf, sizeof(buf), p->pi_fstype);
#ifdef PART_BOOT
if (ptn == PART_BOOT)
Index: src/distrib/utils/sysinst/label.c
diff -u src/distrib/utils/sysinst/label.c:1.57 src/distrib/utils/sysinst/label.c:1.58
--- src/distrib/utils/sysinst/label.c:1.57 Tue Jul 5 21:20:03 2011
+++ src/distrib/utils/sysinst/label.c Thu Jan 5 14:43:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.57 2011/07/06 01:20:03 mrg Exp $ */
+/* $NetBSD: label.c,v 1.58 2012/01/05 19:43:59 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.57 2011/07/06 01:20:03 mrg Exp $");
+__RCSID("$NetBSD: label.c,v 1.58 2012/01/05 19:43:59 christos Exp $");
#endif
#include
@@ -387,7 +387,9 @@ edit_ptn(menudesc *menu, void *arg)
if (all_fstype_menu == -1) {
for (i = 0; i < nelem(all_fstypes); i++) {
- all_fstypes[i].opt_name = fstypenames[i];
+ char buf[128];
+ all_fstypes[i].opt_name = strdup(getfstypename(buf,
+ sizeof(buf), i));
all_fstypes[i].opt_menu = OPT_NOMENU;
all_fstypes[i].opt_flags = 0;
all_fstypes[i].opt_action = set_fstype;
@@ -472,6 +474,7 @@ set_ptn_label(menudesc *m, int opt, void
{
partinfo *p = arg;
const char *c;
+ char buf[128];
if (m->opts[opt].opt_flags & OPT_IGNORE
&& (opt != PTN_MENU_END || p->pi_fstype == FS_UNUSED)) {
@@ -487,7 +490,7 @@ set_ptn_label(menudesc *m, int opt, void
else
c = "FFSv1";
else
- c = fstypenames[p->pi_fstype];
+ c = getfstypename(buf, sizeof(buf), p->pi_fstype);
wprintw(m->mw, msg_string(MSG_fstype_fmt), c);
break;
case PTN_MENU_START:
Index: src/distrib/utils/sysinst/savenewlabel.c
diff -u src/distrib/utils/sysinst/savenewlabel.c:1.7 src/distrib/utils/sysinst/savenewlabel.c:1.8
--- src/distrib/utils/sysinst/savenewlabel.c:1.7 Sun Sep 20 18:43:00 2009
+++ src/distrib/utils/sysinst/savenewlabel.c Thu Jan 5 14:43:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: savenewlabel.c,v 1.7 2009/09/20 22:43:0
CVS commit: src/distrib/utils/sysinst
Module Name:src Committed By: riz Date: Sun Jan 1 23:26:22 UTC 2012 Modified Files: src/distrib/utils/sysinst: util.c Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/distrib/utils/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/util.c diff -u src/distrib/utils/sysinst/util.c:1.170 src/distrib/utils/sysinst/util.c:1.171 --- src/distrib/utils/sysinst/util.c:1.170 Mon Oct 17 16:35:22 2011 +++ src/distrib/utils/sysinst/util.c Sun Jan 1 23:26:22 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.170 2011/10/17 16:35:22 mbalmer Exp $ */ +/* $NetBSD: util.c,v 1.171 2012/01/01 23:26:22 riz Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -872,7 +872,7 @@ extract_file(distinfo *dist, int update) #ifdef SUPPORT_8_3_SOURCE_FILESYSTEM /* - * Update path to use dist->name tuncated to the first eight + * Update path to use dist->name truncated to the first eight * characters and check again */ (void)snprintf(path, sizeof path, "%s/%.8s%.4s", /* 4 as includes '.' */
CVS commit: src/distrib/utils/sysinst/arch
Module Name:src
Committed By: he
Date: Mon Nov 7 14:18:52 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/x68k: md.c
src/distrib/utils/sysinst/arch/zaurus: md.c
Log Message:
Two more instances which need "return 0;" to fix the build.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/utils/sysinst/arch/x68k/md.c
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/zaurus/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/x68k/md.c
diff -u src/distrib/utils/sysinst/arch/x68k/md.c:1.41 src/distrib/utils/sysinst/arch/x68k/md.c:1.42
--- src/distrib/utils/sysinst/arch/x68k/md.c:1.41 Fri Nov 4 11:27:05 2011
+++ src/distrib/utils/sysinst/arch/x68k/md.c Mon Nov 7 14:18:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.41 2011/11/04 11:27:05 martin Exp $ */
+/* $NetBSD: md.c,v 1.42 2011/11/07 14:18:51 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -331,4 +331,5 @@ md_newdisk(void)
int
md_pre_mount()
{
+ return 0;
}
Index: src/distrib/utils/sysinst/arch/zaurus/md.c
diff -u src/distrib/utils/sysinst/arch/zaurus/md.c:1.9 src/distrib/utils/sysinst/arch/zaurus/md.c:1.10
--- src/distrib/utils/sysinst/arch/zaurus/md.c:1.9 Fri Nov 4 11:27:05 2011
+++ src/distrib/utils/sysinst/arch/zaurus/md.c Mon Nov 7 14:18:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2011/11/04 11:27:05 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2011/11/07 14:18:52 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -193,4 +193,5 @@ md_mbr_use_wholedisk(mbr_info_t *mbri)
int
md_pre_mount()
{
+ return 0;
}
CVS commit: src/distrib/utils/sysinst/arch/vax
Module Name:src
Committed By: he
Date: Mon Nov 7 12:40:26 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/vax: md.c
Log Message:
Return 0 from md_pre_mount(), which is otherwise empty here, so that
this builds again.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/sysinst/arch/vax/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/vax/md.c
diff -u src/distrib/utils/sysinst/arch/vax/md.c:1.37 src/distrib/utils/sysinst/arch/vax/md.c:1.38
--- src/distrib/utils/sysinst/arch/vax/md.c:1.37 Fri Nov 4 11:27:05 2011
+++ src/distrib/utils/sysinst/arch/vax/md.c Mon Nov 7 12:40:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.37 2011/11/04 11:27:05 martin Exp $ */
+/* $NetBSD: md.c,v 1.38 2011/11/07 12:40:26 he Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -193,4 +193,5 @@ md_update(void)
int
md_pre_mount()
{
+ return 0;
}
CVS commit: src/distrib/utils/sysinst
Module Name:src Committed By: martin Date: Fri Nov 4 11:27:05 UTC 2011 Modified Files: src/distrib/utils/sysinst: defs.h disks.c src/distrib/utils/sysinst/arch/acorn32: md.c src/distrib/utils/sysinst/arch/alpha: md.c src/distrib/utils/sysinst/arch/amiga: md.c src/distrib/utils/sysinst/arch/arc: md.c src/distrib/utils/sysinst/arch/atari: md.c src/distrib/utils/sysinst/arch/bebox: md.c src/distrib/utils/sysinst/arch/cats: md.c src/distrib/utils/sysinst/arch/cobalt: md.c src/distrib/utils/sysinst/arch/emips: md.c src/distrib/utils/sysinst/arch/evbarm: md.c src/distrib/utils/sysinst/arch/evbmips: md.c src/distrib/utils/sysinst/arch/evbppc: md.c src/distrib/utils/sysinst/arch/evbsh3: md.c src/distrib/utils/sysinst/arch/ews4800mips: md.c src/distrib/utils/sysinst/arch/hp300: md.c src/distrib/utils/sysinst/arch/hp700: md.c src/distrib/utils/sysinst/arch/hpcarm: md.c src/distrib/utils/sysinst/arch/hpcmips: md.c src/distrib/utils/sysinst/arch/hpcsh: md.c src/distrib/utils/sysinst/arch/i386: md.c src/distrib/utils/sysinst/arch/landisk: md.c src/distrib/utils/sysinst/arch/luna68k: md.c src/distrib/utils/sysinst/arch/mac68k: md.c src/distrib/utils/sysinst/arch/macppc: md.c src/distrib/utils/sysinst/arch/mipsco: md.c src/distrib/utils/sysinst/arch/mvme68k: md.c src/distrib/utils/sysinst/arch/news68k: md.c src/distrib/utils/sysinst/arch/newsmips: md.c src/distrib/utils/sysinst/arch/ofppc: md.c src/distrib/utils/sysinst/arch/pmax: md.c src/distrib/utils/sysinst/arch/prep: md.c src/distrib/utils/sysinst/arch/sandpoint: md.c src/distrib/utils/sysinst/arch/sgimips: md.c src/distrib/utils/sysinst/arch/shark: md.c src/distrib/utils/sysinst/arch/sparc: md.c src/distrib/utils/sysinst/arch/sparc64: md.c msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/distrib/utils/sysinst/arch/vax: md.c src/distrib/utils/sysinst/arch/x68k: md.c src/distrib/utils/sysinst/arch/zaurus: md.c Log Message: Add a new hook, md_pre_mount(), that is called after preparation of the target filesystem, but before mounting it. Use this on sparc64 to install the primary boot block, but install the secondary boot (/ofwboot) later. This allows sysinst to run at securelevel 1 (as long as we don't do an upgrade install on the hard disk we booted from). To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/distrib/utils/sysinst/defs.h cvs rdiff -u -r1.116 -r1.117 src/distrib/utils/sysinst/disks.c cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/sysinst/arch/acorn32/md.c cvs rdiff -u -r1.50 -r1.51 src/distrib/utils/sysinst/arch/alpha/md.c cvs rdiff -u -r1.24 -r1.25 src/distrib/utils/sysinst/arch/amiga/md.c cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/sysinst/arch/arc/md.c cvs rdiff -u -r1.26 -r1.27 src/distrib/utils/sysinst/arch/atari/md.c cvs rdiff -u -r1.56 -r1.57 src/distrib/utils/sysinst/arch/bebox/md.c cvs rdiff -u -r1.23 -r1.24 src/distrib/utils/sysinst/arch/cats/md.c cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/cobalt/md.c cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/emips/md.c cvs rdiff -u -r1.24 -r1.25 src/distrib/utils/sysinst/arch/evbarm/md.c cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/evbmips/md.c cvs rdiff -u -r1.31 -r1.32 src/distrib/utils/sysinst/arch/evbppc/md.c cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/evbsh3/md.c cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/ews4800mips/md.c cvs rdiff -u -r1.30 -r1.31 src/distrib/utils/sysinst/arch/hp300/md.c cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/arch/hp700/md.c cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/arch/hpcarm/md.c cvs rdiff -u -r1.47 -r1.48 src/distrib/utils/sysinst/arch/hpcmips/md.c cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/hpcsh/md.c cvs rdiff -u -r1.128 -r1.129 src/distrib/utils/sysinst/arch/i386/md.c cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/landisk/md.c cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/luna68k/md.c cvs rdiff -u -r1.59 -r1.60 src/distrib/utils/sysinst/arch/mac68k/md.c cvs rdiff -u -r1.44 -r1.45 src/distrib/utils/sysinst/arch/macppc/md.c cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/sysinst/arch/mipsco/md.c cvs rdiff -u -r1.25 -r1.26 src/distrib/utils/sysinst/arch/mvme68k/md.c cvs rdiff -u -r1.33 -r1.34 src/distrib/utils/sysinst/arch/news68k/md.c cvs rdiff -u -r1.20 -r1.21 src/distrib/utils/sysinst/arch/newsmips/md.c cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/sysinst/arch/ofppc/md.c cvs rdiff -u -r1.65 -r1.66 src/distrib/utils/sysinst/arch/pmax/md.c cvs rdiff -u -r1.33 -r1.34 src/distrib/utils/sysinst/arch/prep/md.c cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/sysinst/arch/sandpoint/md.c cvs rdiff -u -r1.27 -r
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Tue Nov 1 09:26:37 UTC 2011
Modified Files:
src/distrib/utils/sysinst: Makefile.inc
Log Message:
If we are not building SMALLPROG, there is no need to strip out INET6
support.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/distrib/utils/sysinst/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/Makefile.inc
diff -u src/distrib/utils/sysinst/Makefile.inc:1.56 src/distrib/utils/sysinst/Makefile.inc:1.57
--- src/distrib/utils/sysinst/Makefile.inc:1.56 Thu Aug 25 17:39:58 2011
+++ src/distrib/utils/sysinst/Makefile.inc Tue Nov 1 09:26:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.56 2011/08/25 17:39:58 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.57 2011/11/01 09:26:37 martin Exp $
#
# Makefile for sysinst
@@ -42,7 +42,7 @@ CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.C
-DREL=\"${DISTRIBVER}\" -DMACH=\"${MACHINE}\" \
-DMACH_${MACHINE} -DARCH_${MACHINE_ARCH}
-.if defined(SMALLPROG_INET6) && (${USE_INET6} != "no")
+.if (!defined(SMALLPROG) || defined(SMALLPROG_INET6)) && (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
.endif
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jakllsch
Date: Sun Oct 30 00:30:57 UTC 2011
Modified Files:
src/distrib/utils/sysinst: menus.mi
Log Message:
As both of the "ns-wide.wide.ad.jp" and "light.imasy.or.jp" IPv6 resolvers
now refuse my queries, replace them with "google-public-dns-a.google.com"
and "google-public-dns-b.google.com".
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/distrib/utils/sysinst/menus.mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/menus.mi
diff -u src/distrib/utils/sysinst/menus.mi:1.42 src/distrib/utils/sysinst/menus.mi:1.43
--- src/distrib/utils/sysinst/menus.mi:1.42 Sun Apr 17 12:33:42 2011
+++ src/distrib/utils/sysinst/menus.mi Sun Oct 30 00:30:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.42 2011/04/17 12:33:42 martin Exp $ */
+/* $NetBSD: menus.mi,v 1.43 2011/10/30 00:30:56 jakllsch Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -344,19 +344,20 @@ menu localdirsource, y=-4, x=0, w=70, no
action { src_prompt(MSG_Set_dir, set_dir, 60); };
menu namesrv6, title MSG_Select_IPv6_DNS_server;
- option "ns-wide.wide.ad.jp", exit, action
+ option "google-public-dns-a.google.com", exit, action
{
#ifdef INET6
- strlcpy(net_namesvr6, "2001:200:0:1::f", sizeof(net_namesvr6));
+ strlcpy(net_namesvr6, "2001:4860:4860::",
+ sizeof(net_namesvr6));
yesno = 1;
#else
yesno = 0;
#endif
};
- option "light.imasy.or.jp", exit, action
+ option "google-public-dns-b.google.com", exit, action
{
#ifdef INET6
- strlcpy(net_namesvr6, "2001:200:300:1:2a0:c9ff:fe61:6521",
+ strlcpy(net_namesvr6, "2001:4860:4860::8844",
sizeof(net_namesvr6));
yesno = 1;
#else
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: joerg
Date: Fri Sep 16 15:42:28 UTC 2011
Modified Files:
src/distrib/utils/sysinst: aout2elf.c main.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/sysinst/aout2elf.c
cvs rdiff -u -r1.60 -r1.61 src/distrib/utils/sysinst/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/aout2elf.c
diff -u src/distrib/utils/sysinst/aout2elf.c:1.16 src/distrib/utils/sysinst/aout2elf.c:1.17
--- src/distrib/utils/sysinst/aout2elf.c:1.16 Mon Apr 4 08:30:12 2011
+++ src/distrib/utils/sysinst/aout2elf.c Fri Sep 16 15:42:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aout2elf.c,v 1.16 2011/04/04 08:30:12 mbalmer Exp $
+/* $NetBSD: aout2elf.c,v 1.17 2011/09/16 15:42:28 joerg Exp $
*
* Copyright 1997 Piermont Information Systems Inc.
* All rights reserved.
@@ -192,7 +192,7 @@
return n;
}
-static void
+__dead static void
abort_libupdate(void)
{
msg_display(MSG_aoutfail);
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.60 src/distrib/utils/sysinst/main.c:1.61
--- src/distrib/utils/sysinst/main.c:1.60 Mon May 30 14:20:48 2011
+++ src/distrib/utils/sysinst/main.c Fri Sep 16 15:42:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.60 2011/05/30 14:20:48 joerg Exp $ */
+/* $NetBSD: main.c,v 1.61 2011/09/16 15:42:28 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -53,8 +53,8 @@
int main(int, char **);
static void select_language(void);
-static void usage(void);
-static void miscsighandler(int);
+__dead static void usage(void);
+__dead static void miscsighandler(int);
static void ttysighandler(int);
static void cleanup(void);
static void process_f_flag(char *);
CVS commit: src/distrib/utils/sysinst/arch/acorn32
Module Name:src
Committed By: christos
Date: Wed Sep 14 12:35:19 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/acorn32: md.c
Log Message:
fix fprintfs with no format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/utils/sysinst/arch/acorn32/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/acorn32/md.c
diff -u src/distrib/utils/sysinst/arch/acorn32/md.c:1.27 src/distrib/utils/sysinst/arch/acorn32/md.c:1.28
--- src/distrib/utils/sysinst/arch/acorn32/md.c:1.27 Mon Apr 4 04:30:15 2011
+++ src/distrib/utils/sysinst/arch/acorn32/md.c Wed Sep 14 08:35:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.27 2011/04/04 08:30:15 mbalmer Exp $ */
+/* $NetBSD: md.c,v 1.28 2011/09/14 12:35:19 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -96,7 +96,7 @@
if (lseek(fd, (off_t)FILECORE_BOOT_SECTOR * DEV_BSIZE, SEEK_SET) < 0
|| read(fd, bb, sizeof(bb)) - sizeof(bb) != 0) {
endwin();
- fprintf(stderr, msg_string(MSG_badreadbb));
+ fprintf(stderr, "%s", msg_string(MSG_badreadbb));
close(fd);
exit(1);
}
@@ -129,7 +129,8 @@
if (lseek(fd, (off_t)offset * DEV_BSIZE, SEEK_SET) < 0
|| read(fd, bb, sizeof(bb)) - sizeof(bb) != 0) {
endwin();
-fprintf(stderr, msg_string(MSG_badreadriscix));
+fprintf(stderr, "%s",
+msg_string(MSG_badreadriscix));
close(fd);
exit(1);
}
@@ -151,7 +152,8 @@
* leave this disc alone.
*/
endwin();
-fprintf(stderr, msg_string(MSG_notnetbsdriscix));
+fprintf(stderr, "%s",
+msg_string(MSG_notnetbsdriscix));
close(fd);
exit(1);
}
@@ -164,7 +166,7 @@
* the filecore boot block first with dd.
*/
endwin();
- fprintf(stderr, msg_string(MSG_notnetbsd));
+ fprintf(stderr, "%s", msg_string(MSG_notnetbsd));
close(fd);
exit(1);
}
CVS commit: src/distrib/utils/sysinst
Module Name:src Committed By: joerg Date: Thu Aug 25 17:39:58 UTC 2011 Modified Files: src/distrib/utils/sysinst: Makefile.inc Log Message: -Wno-format-nonliteral for msg_defs.c To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/distrib/utils/sysinst/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/Makefile.inc diff -u src/distrib/utils/sysinst/Makefile.inc:1.55 src/distrib/utils/sysinst/Makefile.inc:1.56 --- src/distrib/utils/sysinst/Makefile.inc:1.55 Thu Aug 25 16:47:16 2011 +++ src/distrib/utils/sysinst/Makefile.inc Thu Aug 25 17:39:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.55 2011/08/25 16:47:16 christos Exp $ +# $NetBSD: Makefile.inc,v 1.56 2011/08/25 17:39:58 joerg Exp $ # # Makefile for sysinst @@ -55,6 +55,7 @@ COPTS.label.c += -Wno-format-nonliteral COPTS.target.c += -Wno-format-nonliteral COPTS.mbr.c += -Wno-format-nonliteral +COPTS.msg_defs.c += -Wno-format-nonliteral COPTS.bsddisklabel.c += -Wno-format-nonliteral COPTS.md.c += -Wno-format-nonliteral
CVS commit: src/distrib/utils/sysinst
Module Name:src Committed By: christos Date: Thu Aug 25 16:47:16 UTC 2011 Modified Files: src/distrib/utils/sysinst: Makefile.inc Log Message: document non-literal format string use for many md files To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/utils/sysinst/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/Makefile.inc diff -u src/distrib/utils/sysinst/Makefile.inc:1.54 src/distrib/utils/sysinst/Makefile.inc:1.55 --- src/distrib/utils/sysinst/Makefile.inc:1.54 Tue Aug 23 06:26:07 2011 +++ src/distrib/utils/sysinst/Makefile.inc Thu Aug 25 12:47:16 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.54 2011/08/23 10:26:07 christos Exp $ +# $NetBSD: Makefile.inc,v 1.55 2011/08/25 16:47:16 christos Exp $ # # Makefile for sysinst @@ -56,6 +56,7 @@ COPTS.target.c += -Wno-format-nonliteral COPTS.mbr.c += -Wno-format-nonliteral COPTS.bsddisklabel.c += -Wno-format-nonliteral +COPTS.md.c += -Wno-format-nonliteral # Host to ftp from. Default: # "ftp.NetBSD.org"
CVS commit: src/distrib/utils/sysinst/arch/bebox
Module Name:src
Committed By: kiyohara
Date: Thu Aug 25 15:42:33 UTC 2011
Modified Files:
src/distrib/utils/sysinst/arch/bebox: md.c
Log Message:
bebox not support md_post_newfs() and md_post_disklabel() now. Change null-func.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/distrib/utils/sysinst/arch/bebox/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/bebox/md.c
diff -u src/distrib/utils/sysinst/arch/bebox/md.c:1.55 src/distrib/utils/sysinst/arch/bebox/md.c:1.56
--- src/distrib/utils/sysinst/arch/bebox/md.c:1.55 Mon Apr 4 08:30:20 2011
+++ src/distrib/utils/sysinst/arch/bebox/md.c Thu Aug 25 15:42:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.55 2011/04/04 08:30:20 mbalmer Exp $ */
+/* $NetBSD: md.c,v 1.56 2011/08/25 15:42:33 kiyohara Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -102,12 +102,6 @@
int
md_post_disklabel(void)
{
- /* Sector forwarding / badblocks ... */
- if (*doessf) {
- printf ("%s", msg_string (MSG_dobad144));
- return run_program(RUN_DISPLAY, "/usr/sbin/bad144 %s 0",
- diskdev);
- }
return 0;
}
@@ -119,11 +113,6 @@
int
md_post_newfs(void)
{
- /* boot blocks ... */
- printf (msg_string(MSG_dobootblks), diskdev);
- run_program(RUN_DISPLAY,
- "/usr/mdec/installboot -v /usr/mdec/biosboot.sym /dev/r%sa",
- diskdev);
return 0;
}
CVS commit: src/distrib/utils/sysinst
Module Name:src Committed By: christos Date: Tue Aug 23 10:26:07 UTC 2011 Modified Files: src/distrib/utils/sysinst: Makefile.inc Log Message: document non-literal formats To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/distrib/utils/sysinst/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/Makefile.inc diff -u src/distrib/utils/sysinst/Makefile.inc:1.53 src/distrib/utils/sysinst/Makefile.inc:1.54 --- src/distrib/utils/sysinst/Makefile.inc:1.53 Mon Jun 20 03:43:56 2011 +++ src/distrib/utils/sysinst/Makefile.inc Tue Aug 23 06:26:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.53 2011/06/20 07:43:56 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.54 2011/08/23 10:26:07 christos Exp $ # # Makefile for sysinst @@ -49,6 +49,13 @@ .if defined(HAVE_GCC) || defined(HAVE_PCC) COPTS.label.c+= -Wno-pointer-sign .endif +COPTS.main.c += -Wno-format-nonliteral +COPTS.disks.c += -Wno-format-nonliteral +COPTS.util.c += -Wno-format-nonliteral +COPTS.label.c += -Wno-format-nonliteral +COPTS.target.c += -Wno-format-nonliteral +COPTS.mbr.c += -Wno-format-nonliteral +COPTS.bsddisklabel.c += -Wno-format-nonliteral # Host to ftp from. Default: # "ftp.NetBSD.org"
