CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sun Dec 13 21:55:25 UTC 2020
Modified Files:
src/sbin/gpt: recover.c
Log Message:
PR/55875 - Valentin -- "gpt recover -r" does nothing
Delete do nothing undocumented option, that was there from initial
import. No idea what it was intended to do and there is no longer
an "upstream".
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sbin/gpt/recover.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/recover.c
diff -u src/sbin/gpt/recover.c:1.18 src/sbin/gpt/recover.c:1.19
--- src/sbin/gpt/recover.c:1.18 Tue Jul 3 03:41:24 2018
+++ src/sbin/gpt/recover.c Sun Dec 13 21:55:25 2020
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/recover.c,v 1.8 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: recover.c,v 1.18 2018/07/03 03:41:24 jnemeth Exp $");
+__RCSID("$NetBSD: recover.c,v 1.19 2020/12/13 21:55:25 jnemeth Exp $");
#endif
#include
@@ -149,7 +149,7 @@ recover_gpt_tbl(gpt_t gpt, int type, off
}
static int
-recover(gpt_t gpt, int recoverable)
+recover(gpt_t gpt)
{
off_t last = gpt_last(gpt);
map_t map;
@@ -233,13 +233,9 @@ static int
cmd_recover(gpt_t gpt, int argc, char *argv[])
{
int ch;
- int recoverable = 0;
while ((ch = getopt(argc, argv, "r")) != -1) {
switch(ch) {
- case 'r':
- recoverable = 1;
- break;
default:
return usage();
}
@@ -248,5 +244,5 @@ cmd_recover(gpt_t gpt, int argc, char *a
if (argc != optind)
return usage();
- return recover(gpt, recoverable);
+ return recover(gpt);
}
CVS commit: src/etc
Module Name:src
Committed By: jnemeth
Date: Sun Oct 11 22:14:55 UTC 2020
Modified Files:
src/etc: named.conf
Log Message:
Also edns-udp-size.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/etc/named.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/named.conf
diff -u src/etc/named.conf:1.9 src/etc/named.conf:1.10
--- src/etc/named.conf:1.9 Sun Oct 11 22:11:36 2020
+++ src/etc/named.conf Sun Oct 11 22:14:55 2020
@@ -1,4 +1,4 @@
-# $NetBSD: named.conf,v 1.9 2020/10/11 22:11:36 jnemeth Exp $
+# $NetBSD: named.conf,v 1.10 2020/10/11 22:14:55 jnemeth Exp $
# boot file for secondary name server
# Note that there should be one primary entry for each SOA record.
@@ -16,6 +16,7 @@ options {
bindkeys-file "bind.keys";
allow-recursion { localhost; localnets; };
max-udp-size 1220;
+ edns-udp-size 1220;
#
# This forces all queries to come from port 53; might be
CVS commit: src/etc
Module Name:src
Committed By: jnemeth
Date: Sun Oct 11 22:11:37 UTC 2020
Modified Files:
src/etc: named.conf
Log Message:
Set max-udp-size as per DNS flag day 2020, see
https://www.isc.org/blogs/dns-flag-day-2020-2/ .
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/etc/named.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/named.conf
diff -u src/etc/named.conf:1.8 src/etc/named.conf:1.9
--- src/etc/named.conf:1.8 Sat Mar 21 20:20:59 2020
+++ src/etc/named.conf Sun Oct 11 22:11:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: named.conf,v 1.8 2020/03/21 20:20:59 christos Exp $
+# $NetBSD: named.conf,v 1.9 2020/10/11 22:11:36 jnemeth Exp $
# boot file for secondary name server
# Note that there should be one primary entry for each SOA record.
@@ -15,6 +15,7 @@ options {
managed-keys-directory "keys";
bindkeys-file "bind.keys";
allow-recursion { localhost; localnets; };
+ max-udp-size 1220;
#
# This forces all queries to come from port 53; might be
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jnemeth
Date: Sat Aug 8 19:39:28 UTC 2020
Modified Files:
src/sys/dev/pci: mpii.c
Log Message:
make this compile without bio(4)
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/mpii.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.24 src/sys/dev/pci/mpii.c:1.25
--- src/sys/dev/pci/mpii.c:1.24 Thu Nov 28 17:09:10 2019
+++ src/sys/dev/pci/mpii.c Sat Aug 8 19:39:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.24 2019/11/28 17:09:10 maxv Exp $ */
+/* $NetBSD: mpii.c,v 1.25 2020/08/08 19:39:28 jnemeth Exp $ */
/* $OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $ */
/*
* Copyright (c) 2010, 2012 Mike Belopuhov
@@ -20,7 +20,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.24 2019/11/28 17:09:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.25 2020/08/08 19:39:28 jnemeth Exp $");
#include "bio.h"
@@ -244,8 +244,10 @@ struct mpii_softc {
struct workqueue *sc_evt_ack_wq;
struct work sc_evt_ack_work;
+#if NBIO > 0
struct sysmon_envsys *sc_sme;
envsys_data_t *sc_sensors;
+#endif
};
static int mpii_match(device_t, cfdata_t, void *);
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Mon Dec 16 07:18:11 UTC 2019 Modified Files: src/usr.bin/calendar/calendars: calendar.christian calendar.holiday calendar.usholiday Log Message: update calendar files with all dates in 2020 as next release is expect late 2019 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.bin/calendar/calendars/calendar.christian cvs rdiff -u -r1.29 -r1.30 src/usr.bin/calendar/calendars/calendar.holiday cvs rdiff -u -r1.9 -r1.10 src/usr.bin/calendar/calendars/calendar.usholiday Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.christian diff -u src/usr.bin/calendar/calendars/calendar.christian:1.7 src/usr.bin/calendar/calendars/calendar.christian:1.8 --- src/usr.bin/calendar/calendars/calendar.christian:1.7 Sat Jun 2 05:55:47 2018 +++ src/usr.bin/calendar/calendars/calendar.christian Mon Dec 16 07:18:11 2019 @@ -1,17 +1,17 @@ 01/06* Epiphany -03/05* Shrove Tuesday / Mardi Gras (day before Ash Wednesday) -03/06* Ash Wednesday (First day of Lent) -04/14* Palm Sunday (7 days before Easter) -04/17* Maundy Thursday (3 days before Easter) -04/18* Good Friday (2 days before Easter) -04/20* Easter Sunday -05/26* Rogation Sunday -05/30* Ascension Day (10 days before Pentecost) -06/09* Pentecost (Whitsunday) -06/10* Whitmonday -06/16* Trinity Sunday (7 days after Pentecost) -06/20* Corpus Christi (11 days after Pentecost) +02/25* Shrove Tuesday / Mardi Gras (day before Ash Wednesday) +02/26* Ash Wednesday (First day of Lent) +04/05* Palm Sunday (7 days before Easter) +04/09* Maundy Thursday (3 days before Easter) +04/10* Good Friday (2 days before Easter) +04/12* Easter Sunday +05/17* Rogation Sunday +05/21* Ascension Day (10 days before Pentecost) +05/31* Pentecost (Whitsunday) +06/01* Whitmonday +06/07* Trinity Sunday (7 days after Pentecost) +06/11* Corpus Christi (11 days after Pentecost) 10/18 Feast Day of St. Luke -12/02* First Sunday of Advent (4th Sunday before Christmas) +11/29* First Sunday of Advent (4th Sunday before Christmas) 12/06 St. Nicholas' Day 12/25 Feast of the Nativity (Christmas) Index: src/usr.bin/calendar/calendars/calendar.holiday diff -u src/usr.bin/calendar/calendars/calendar.holiday:1.29 src/usr.bin/calendar/calendars/calendar.holiday:1.30 --- src/usr.bin/calendar/calendars/calendar.holiday:1.29 Sat Jun 2 05:55:47 2018 +++ src/usr.bin/calendar/calendars/calendar.holiday Mon Dec 16 07:18:11 2019 @@ -24,9 +24,9 @@ 01/19 Nameday of Archbishop Makarios in Cyprus 01/20 Army Day in Mali 01/20 National Heroes Day in Guinea-Bissau -01/20* Martin Luther King Day in New York (3rd Sunday) -01/21* Lee-Jackson Day in Virginia (3rd Monday) -01/21* Robert E. Lee's Birthday in Alabama & Mississippi (3rd Monday) +01/19* Martin Luther King Day in New York (3rd Sunday) +01/20* Lee-Jackson Day in Virginia (3rd Monday) +01/20* Robert E. Lee's Birthday in Alabama & Mississippi (3rd Monday) 01/21 Our Lady of Altagracia in Dominican Republic 01/23 Feast of St. Ildefonsus 01/23 National Handwriting Day @@ -59,7 +59,7 @@ 03/04 Vermont Admission Day (admitted as 14th state in 1791) 03/05 Independence Day in Equatorial Guinea 03/06 Lantern Day, Bejing -03/20* Purim - Feast of Lots +03/09* Purim - Feast of Lots 03/08 First Annual International Women's Day, 1909 03/08 International Women's Day in U.S.S.R. 03/08 Syrian National Day in Libyan Arab Republic @@ -91,7 +91,7 @@ 03/25 Lady Day (a.k.a. the Feast of the Annunciation) 03/25 Maryland Day in Maryland 03/25 National Holiday in Greece -03/25* Seward's Day in Alaska (last Monday) +03/30* Seward's Day in Alaska (last Monday) 03/26 Independence Day in Bangladesh 03/26 Prince Jonah Kuhio Kalanianaole Day in Hawaii 03/27 Armed Forces Day in Burma @@ -114,7 +114,7 @@ 04/13 Songkran Day in Thailand 04/14 Day of the Americas in Honduras 04/15 Bengali New Year in Bangladesh -04/15* Patriot's Day in Maine & Massachusetts (3rd Monday) +04/20* Patriot's Day in Maine & Massachusetts (3rd Monday) 04/16 De Diego's Birthday (celebrated in Puerto Rico) 04/16 Holy Week (5 days) in Venezuela 04/16 Tourist Week (5 days) in Uruguay @@ -126,15 +126,15 @@ 04/22 Arbor Day in Nebraska & Delaware 04/22 Oklahoma Day in Oklahoma 04/24 Victory Day in Togo -04/19* Pesach - First Day of Passover - Festival of Freedom +04/08* Pesach - First Day of Passover - Festival of Freedom 04/25 Anzac Day in Australia, New Zealand, Tonga, Western Samoa 04/25 Liberation Day in Italy 04/25 National Flag Day in Swaziland 04/26 Confederate Memorial Day in Florida & Georgia 04/26 Union Day in Tanzania 04/27 Independence Day in Togo -04/29* Arbor Day in Wyoming (last Monday) -04/29* Confederate Memorial Day in Alabama & Mississippi (last Monday) +04/27* Arbor Day in Wyoming (last Monday) +04/27* Confederate Memorial Day in Alabama & Mississippi (last Monday)
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sun Mar 3 03:20:43 UTC 2019
Modified Files:
src/sbin/gpt: show.c
Log Message:
Make it clear when displaying data from the MBR.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sbin/gpt/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/show.c
diff -u src/sbin/gpt/show.c:1.41 src/sbin/gpt/show.c:1.42
--- src/sbin/gpt/show.c:1.41 Thu Sep 7 10:23:33 2017
+++ src/sbin/gpt/show.c Sun Mar 3 03:20:42 2019
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: show.c,v 1.41 2017/09/07 10:23:33 christos Exp $");
+__RCSID("$NetBSD: show.c,v 1.42 2019/03/03 03:20:42 jnemeth Exp $");
#endif
#include
@@ -344,6 +344,9 @@ cmd_show(gpt_t gpt, int argc, char *argv
if (argc != optind)
return usage();
+ if (map_find(gpt, MAP_TYPE_PRI_GPT_HDR) == NULL)
+ printf("GPT not found, displaying data from MBR.\n\n");
+
if (xshow & SHOW_ALL)
return show_all(gpt);
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sun Mar 3 02:28:14 UTC 2019
Modified Files:
src/sbin/gpt: migrate.c
Log Message:
add some more FAT file system types
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sbin/gpt/migrate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/migrate.c
diff -u src/sbin/gpt/migrate.c:1.34 src/sbin/gpt/migrate.c:1.35
--- src/sbin/gpt/migrate.c:1.34 Sun Feb 10 10:35:51 2019
+++ src/sbin/gpt/migrate.c Sun Mar 3 02:28:14 2019
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.16 2005/09/01 02:42:52 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: migrate.c,v 1.34 2019/02/10 10:35:51 martin Exp $");
+__RCSID("$NetBSD: migrate.c,v 1.35 2019/03/03 02:28:14 jnemeth Exp $");
#endif
#include
@@ -289,13 +289,20 @@ migrate(gpt_t gpt, u_int parts, int forc
type = GPT_TYPE_EFI;
break;
- case MBR_PTYPE_NTFS:
case MBR_PTYPE_FAT12:
case MBR_PTYPE_FAT16S:
case MBR_PTYPE_FAT16B:
+ case MBR_PTYPE_NTFS:
case MBR_PTYPE_FAT32:
case MBR_PTYPE_FAT32L:
case MBR_PTYPE_FAT16L:
+ case MBR_PTYPE_OS2_DOS12:
+ case MBR_PTYPE_OS2_DOS16S:
+ case MBR_PTYPE_OS2_DOS16B:
+ case MBR_PTYPE_OS2_IFS:
+ case MBR_PTYPE_HID_FAT32:
+ case MBR_PTYPE_HID_FAT32_LBA:
+ case MBR_PTYPE_HID_FAT16_LBA:
type = GPT_TYPE_MS_BASIC_DATA;
break;
CVS commit: src/sys/conf
Module Name:src Committed By: jnemeth Date: Tue Jan 1 01:52:40 UTC 2019 Modified Files: src/sys/conf: copyright Log Message: Welcome to 2019! To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.16 src/sys/conf/copyright:1.17 --- src/sys/conf/copyright:1.16 Mon Jan 1 01:26:06 2018 +++ src/sys/conf/copyright Tue Jan 1 01:52:40 2019 @@ -1,5 +1,5 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, -2018 The NetBSD Foundation, Inc. All rights reserved. +2018, 2019 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
Re: CVS commit: src/sys/sys
On Nov 6, 4:26pm, "Maya Rashish" wrote: } } Module Name: src } Committed By: maya } Date: Tue Nov 6 16:26:44 UTC 2018 } } Modified Files: } src/sys/sys: stdint.h types.h } } Log Message: } Guard from type redefinition (needed by pre-C11 C) in a safer way. Why was this committed with only one day of discussion? When you post something for discussion, allowing only one day is extremely inappropriate! It is appropriate to state when you intend to make the commit which be an ABSOLUTE MINIMUM of one week. Please revert and allow for proper discussion. }-- End of excerpt from "Maya Rashish"
CVS commit: src/share/man/man4
Module Name:src Committed By: jnemeth Date: Sun Jul 8 20:29:08 UTC 2018 Modified Files: src/share/man/man4: puc.4 Log Message: mention Oxford Semiconductor OXPCIe954 4-port PCIe serial card To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/share/man/man4/puc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/puc.4 diff -u src/share/man/man4/puc.4:1.40 src/share/man/man4/puc.4:1.41 --- src/share/man/man4/puc.4:1.40 Mon May 4 21:29:38 2015 +++ src/share/man/man4/puc.4 Sun Jul 8 20:29:08 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: puc.4,v 1.40 2015/05/04 21:29:38 wiz Exp $ +.\" $NetBSD: puc.4,v 1.41 2018/07/08 20:29:08 jnemeth Exp $ .\" .\" Copyright (c) 1998 Christopher G. Demetriou .\" All rights reserved. @@ -32,7 +32,7 @@ .\" .\" <> .\" -.Dd May 4, 2015 +.Dd July 8, 2018 .Dt PUC 4 .Os .Sh NAME @@ -130,6 +130,7 @@ The driver currently supports the follow .It Tn "Oxford Semiconductor OX16PCI954 (4 port serial)" .It Tn "Oxford Semiconductor OX16PCI958 (8 port serial)" .It Tn "Oxford Semiconductor OXPCIe952 (2 port serial, legacy mode)" +.It Tn "Oxford Semiconductor OXPCIe954 (4 port serial)" .It Tn "Oxford Semiconductor OXmPCI952 (2 port serial)" .It Tn "Perle Systems PCI-RAS 4 modem ports" .It Tn "Perle Systems PCI-RAS 8 modem ports"
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Tue Jul 3 03:41:24 UTC 2018
Modified Files:
src/sbin/gpt: add.c gpt.c gpt.h label.c migrate.c recover.c remove.c
resize.c restore.c type.c
Log Message:
Not all things that write to the disk do something that dk(4) will
be interested in. Let individual commands decide if ioctl(DIOCMWEDGES)
should be done. I was conservative and set the flag on any command
that might create/modify/delete partitions in any way.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sbin/gpt/add.c
cvs rdiff -u -r1.74 -r1.75 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.37 -r1.38 src/sbin/gpt/gpt.h
cvs rdiff -u -r1.28 -r1.29 src/sbin/gpt/label.c
cvs rdiff -u -r1.32 -r1.33 src/sbin/gpt/migrate.c
cvs rdiff -u -r1.17 -r1.18 src/sbin/gpt/recover.c src/sbin/gpt/restore.c
cvs rdiff -u -r1.21 -r1.22 src/sbin/gpt/remove.c
cvs rdiff -u -r1.22 -r1.23 src/sbin/gpt/resize.c
cvs rdiff -u -r1.14 -r1.15 src/sbin/gpt/type.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/add.c
diff -u src/sbin/gpt/add.c:1.43 src/sbin/gpt/add.c:1.44
--- src/sbin/gpt/add.c:1.43 Tue Dec 29 16:45:04 2015
+++ src/sbin/gpt/add.c Tue Jul 3 03:41:23 2018
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: add.c,v 1.43 2015/12/29 16:45:04 christos Exp $");
+__RCSID("$NetBSD: add.c,v 1.44 2018/07/03 03:41:23 jnemeth Exp $");
#endif
#include
@@ -62,7 +62,7 @@ struct gpt_cmd c_add = {
"add",
cmd_add,
addhelp, __arraycount(addhelp),
- 0,
+ GPT_SYNC,
};
#define usage() gpt_usage(NULL, _add)
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.74 src/sbin/gpt/gpt.c:1.75
--- src/sbin/gpt/gpt.c:1.74 Tue Feb 13 00:34:11 2018
+++ src/sbin/gpt/gpt.c Tue Jul 3 03:41:23 2018
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.74 2018/02/13 00:34:11 sevan Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.75 2018/07/03 03:41:23 jnemeth Exp $");
#endif
#include
@@ -587,7 +587,7 @@ void
gpt_close(gpt_t gpt)
{
- if (!(gpt->flags & GPT_MODIFIED))
+ if (!(gpt->flags & GPT_MODIFIED) || !(gpt->flags & GPT_SYNC))
goto out;
if (!(gpt->flags & GPT_NOSYNC)) {
Index: src/sbin/gpt/gpt.h
diff -u src/sbin/gpt/gpt.h:1.37 src/sbin/gpt/gpt.h:1.38
--- src/sbin/gpt/gpt.h:1.37 Mon Mar 19 09:06:20 2018
+++ src/sbin/gpt/gpt.h Tue Jul 3 03:41:23 2018
@@ -81,6 +81,7 @@ gpt_t gpt_open(const char *, int, int, o
#define GPT_NOSYNC 0x08
#define GPT_FILE 0x10
#define GPT_TIMESTAMP 0x20
+#define GPT_SYNC 0x40
#define GPT_OPTDEV 0x8000
void* gpt_read(gpt_t, off_t, size_t);
Index: src/sbin/gpt/label.c
diff -u src/sbin/gpt/label.c:1.28 src/sbin/gpt/label.c:1.29
--- src/sbin/gpt/label.c:1.28 Fri Dec 4 01:47:48 2015
+++ src/sbin/gpt/label.c Tue Jul 3 03:41:24 2018
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3 2006/10/04 18:20:25 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: label.c,v 1.28 2015/12/04 01:47:48 christos Exp $");
+__RCSID("$NetBSD: label.c,v 1.29 2018/07/03 03:41:24 jnemeth Exp $");
#endif
#include
@@ -62,7 +62,7 @@ struct gpt_cmd c_label = {
"label",
cmd_label,
labelhelp, __arraycount(labelhelp),
- 0,
+ GPT_SYNC,
};
#define usage() gpt_usage(NULL, _label)
Index: src/sbin/gpt/migrate.c
diff -u src/sbin/gpt/migrate.c:1.32 src/sbin/gpt/migrate.c:1.33
--- src/sbin/gpt/migrate.c:1.32 Thu Jun 9 19:04:43 2016
+++ src/sbin/gpt/migrate.c Tue Jul 3 03:41:24 2018
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.16 2005/09/01 02:42:52 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: migrate.c,v 1.32 2016/06/09 19:04:43 christos Exp $");
+__RCSID("$NetBSD: migrate.c,v 1.33 2018/07/03 03:41:24 jnemeth Exp $");
#endif
#include
@@ -88,7 +88,7 @@ struct gpt_cmd c_migrate = {
"migrate",
cmd_migrate,
migratehelp, __arraycount(migratehelp),
- 0,
+ GPT_SYNC,
};
#define usage() gpt_usage(NULL, _migrate)
Index: src/sbin/gpt/recover.c
diff -u src/sbin/gpt/recover.c:1.17 src/sbin/gpt/recover.c:1.18
--- src/sbin/gpt/recover.c:1.17 Wed Mar 22 19:59:16 2017
+++ src/sbin/gpt/recover.c Tue Jul 3 03:41:24 2018
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/recover.c,v 1.8 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: recover.c,v 1.17 2017/03/22 19:59:16 martin Exp $");
+__RCSID("$NetBSD: recover.c,v 1.18 2018/07/03 03:41:24 jnemeth Exp $");
#endif
#include
@@ -59,7 +59,7 @@ struct gpt_cmd c_recover = {
"recover",
cmd_recover,
recoverhelp, __arraycount(recoverhelp),
- 0,
+ GPT_SYNC,
};
#define usage() gpt_usage(NULL, _recover)
Index: src/sbin/gpt/restore.c
diff -u src/sbin/gpt/restore.c:1.17 src/sbin/gpt/restore.c:1.18
--- src/sbin/gpt/restore.c:1.17 Thu Sep 7 10:23:33
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Sat Jun 2 05:55:47 UTC 2018 Modified Files: src/usr.bin/calendar/calendars: calendar.christian calendar.holiday calendar.judaic calendar.netbsd calendar.usholiday Log Message: Update calendar files for the upcoming NetBSD 8.0 release. I'm assuming that it will be released by August 1, which is two months from now. Thus I used 2018 dates for all holidays between Aug. 1st and Dec. 31st, and 2019 dates for all holidays between Jan. 1st and Jul. 31st. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/calendar/calendars/calendar.christian \ src/usr.bin/calendar/calendars/calendar.judaic cvs rdiff -u -r1.28 -r1.29 src/usr.bin/calendar/calendars/calendar.holiday cvs rdiff -u -r1.38 -r1.39 src/usr.bin/calendar/calendars/calendar.netbsd cvs rdiff -u -r1.7 -r1.8 src/usr.bin/calendar/calendars/calendar.usholiday Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.christian diff -u src/usr.bin/calendar/calendars/calendar.christian:1.6 src/usr.bin/calendar/calendars/calendar.christian:1.7 --- src/usr.bin/calendar/calendars/calendar.christian:1.6 Tue Dec 6 04:54:00 2016 +++ src/usr.bin/calendar/calendars/calendar.christian Sat Jun 2 05:55:47 2018 @@ -1,17 +1,17 @@ 01/06* Epiphany -02/28* Shrove Tuesday / Mardi Gras (day before Ash Wednesday) -03/01* Ash Wednesday (First day of Lent) -04/09* Palm Sunday (7 days before Easter) -04/13* Maundy Thursday (3 days before Easter) -04/14* Good Friday (2 days before Easter) -04/16* Easter Sunday -05/21* Rogation Sunday -05/25* Ascension Day (10 days before Pentecost) -06/04* Pentecost (Whitsunday) -06/05* Whitmonday -06/11* Trinity Sunday (7 days after Pentecost) -06/15* Corpus Christi (11 days after Pentecost) +03/05* Shrove Tuesday / Mardi Gras (day before Ash Wednesday) +03/06* Ash Wednesday (First day of Lent) +04/14* Palm Sunday (7 days before Easter) +04/17* Maundy Thursday (3 days before Easter) +04/18* Good Friday (2 days before Easter) +04/20* Easter Sunday +05/26* Rogation Sunday +05/30* Ascension Day (10 days before Pentecost) +06/09* Pentecost (Whitsunday) +06/10* Whitmonday +06/16* Trinity Sunday (7 days after Pentecost) +06/20* Corpus Christi (11 days after Pentecost) 10/18 Feast Day of St. Luke -12/03* First Sunday of Advent (4th Sunday before Christmas) +12/02* First Sunday of Advent (4th Sunday before Christmas) 12/06 St. Nicholas' Day 12/25 Feast of the Nativity (Christmas) Index: src/usr.bin/calendar/calendars/calendar.judaic diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.6 src/usr.bin/calendar/calendars/calendar.judaic:1.7 --- src/usr.bin/calendar/calendars/calendar.judaic:1.6 Tue Dec 6 04:54:00 2016 +++ src/usr.bin/calendar/calendars/calendar.judaic Sat Jun 2 05:55:47 2018 @@ -1,27 +1,27 @@ -02/11* Tu B'Shvat (Feast of Trees) -03/10* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) -03/11* Purim (Feast of Lots; 30 days before Pesach) -04/10* Pesach (First Day of Passover; sabbatical) -04/11* Pesach (sabbatical) -04/12* Pesach (sabbatical) -04/13* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) -05/02* Yom HaAtzma'ut (Israel Independence Day) -05/13* Lag B'Omer (Commemoration of the Great Rebellion) -05/24* Yom Yerushalayim (Reunification of Jerusalem) -05/30* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) -07/11* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; +01/21* Tu B'Shvat (Feast of Trees) +03/19* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) +03/20* Purim (Feast of Lots; 30 days before Pesach) +04/19* Pesach (First Day of Passover; sabbatical) +04/20* Pesach (sabbatical) +04/21* Pesach (sabbatical) +04/26* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) +05/09* Yom HaAtzma'ut (Israel Independence Day) +05/23* Lag B'Omer (Commemoration of the Great Rebellion) +06/01* Yom Yerushalayim (Reunification of Jerusalem) +06/08* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) +07/20* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; fast day) -08/01* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) -09/21* First Day of Rosh Hashanah (Jewish Lunar New Year; 5778 == 2017; +07/21* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) +09/09* First Day of Rosh Hashanah (Jewish Lunar New Year; 5778 == 2017; sabbatical) -09/21* Rosh Hashanah (sabbatical) -09/22* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day +09/09* Rosh Hashanah (sabbatical) +09/10* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day after Rosh Hashanah; fast day) -09/30* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; +09/18* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; sabbatical, fast day) -10/05* Succos (Festival of
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jnemeth
Date: Mon May 21 03:56:21 UTC 2018
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
add Oxford Semiconductor OXPCIe954 PCIe 4-port serial card
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.101 src/sys/dev/pci/pucdata.c:1.102
--- src/sys/dev/pci/pucdata.c:1.101 Fri Apr 13 07:57:04 2018
+++ src/sys/dev/pci/pucdata.c Mon May 21 03:56:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.101 2018/04/13 07:57:04 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.102 2018/05/21 03:56:21 jnemeth Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.101 2018/04/13 07:57:04 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.102 2018/05/21 03:56:21 jnemeth Exp $");
#include
#include
@@ -1108,6 +1108,19 @@ const struct puc_device_description puc_
},
},
+ /* Oxford Semiconductor OXPCIe954 PCIe UARTs */
+ { "Oxford Semiconductor OXPCIe954 UART",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE954,
+ 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1200, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1400, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1600, COM_FREQ * 0x22 },
+ },
+ },
+
/* Oxford Semiconductor OXmPCI952 PCI UARTs */
{ "Oxford Semiconductor OXmPCI952 UARTs",
{ PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_EXSYS_EX41092,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jnemeth Date: Mon May 21 03:45:50 UTC 2018 Modified Files: src/sys/dev/pci: pcidevs Log Message: add Oxford Semiconductor OXPCIe954 PCIe 4-port serial card To generate a diff of this commit: cvs rdiff -u -r1.1333 -r1.1334 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1333 src/sys/dev/pci/pcidevs:1.1334 --- src/sys/dev/pci/pcidevs:1.1333 Thu May 3 04:21:10 2018 +++ src/sys/dev/pci/pcidevs Mon May 21 03:45:50 2018 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1333 2018/05/03 04:21:10 maya Exp $ +$NetBSD: pcidevs,v 1.1334 2018/05/21 03:45:50 jnemeth Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -6280,6 +6280,7 @@ product OXFORDSEMI OXPCIE952_3 0xc140 OX product OXFORDSEMI OXPCIE952_4 0xc141 OXPCIe952 product OXFORDSEMI OXPCIE952_5 0xc144 OXPCIe952 product OXFORDSEMI OXPCIE952_6 0xc145 OXPCIe952 +product OXFORDSEMI OXPCIE954 0xc208 OXPCIe954 /* Packet Engines products */ product PACKETENGINES GNICII 0x0911 G-NIC II Ethernet
CVS commit: src/doc
Module Name:src Committed By: jnemeth Date: Thu May 3 20:15:49 UTC 2018 Modified Files: src/doc: 3RDPARTY Log Message: time marches on for lvm2tools To generate a diff of this commit: cvs rdiff -u -r1.1518 -r1.1519 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1518 src/doc/3RDPARTY:1.1519 --- src/doc/3RDPARTY:1.1518 Wed May 2 22:11:49 2018 +++ src/doc/3RDPARTY Thu May 3 20:15:49 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1518 2018/05/02 22:11:49 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1519 2018/05/03 20:15:49 jnemeth Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -763,7 +763,7 @@ All changes should come via import from Package: lvm2tools Version: 2.02.56 -Current Vers: 2.02.114 +Current Vers: 2.02.177 Maintainer: lvm-de...@redhat.com Archive Site: ftp://sources.redhat.com/pub/lvm2/ Home Page: http://sources.redhat.com/lvm2/
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jnemeth Date: Mon Jan 1 08:33:28 UTC 2018 Modified Files: src/sys/dev/pci: if_wm.c Log Message: PR/52885 - Shinichi Doyashiki -- typo in comment To generate a diff of this commit: cvs rdiff -u -r1.550 -r1.551 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.550 src/sys/dev/pci/if_wm.c:1.551 --- src/sys/dev/pci/if_wm.c:1.550 Thu Dec 28 06:13:50 2017 +++ src/sys/dev/pci/if_wm.c Mon Jan 1 08:33:28 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.550 2017/12/28 06:13:50 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.551 2018/01/01 08:33:28 jnemeth Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -83,7 +83,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.550 2017/12/28 06:13:50 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.551 2018/01/01 08:33:28 jnemeth Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -7870,7 +7870,7 @@ wm_nq_send_common_locked(struct ifnet *i lasttx = nexttx; nexttx = WM_NEXTTX(txq, nexttx); /* - * fill in the next descriptors. legacy or adcanced format + * fill in the next descriptors. legacy or advanced format * is the same here */ for (seg = 1; seg < dmamap->dm_nsegs;
Re: CVS commit: src/games/fortune/datfiles
On Nov 18, 8:48pm, "Maya Rashish" wrote: } } Module Name: src } Committed By: maya } Date: Sat Nov 18 20:48:50 UTC 2017 } } Modified Files: } src/games/fortune/datfiles: fortunes fortunes2 fortunes2-o.real } } Log Message: } Remove a few offensive quotes, put in as many new quotes. } } PR bin/52735 Why did you do this while the issue is still being discussed. That is completely inappropriate. Please revert. } To generate a diff of this commit: } cvs rdiff -u -r1.65 -r1.66 src/games/fortune/datfiles/fortunes } cvs rdiff -u -r1.59 -r1.60 src/games/fortune/datfiles/fortunes2 } cvs rdiff -u -r1.15 -r1.16 src/games/fortune/datfiles/fortunes2-o.real } }-- End of excerpt from "Maya Rashish"
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: jnemeth Date: Sat Nov 18 19:51:46 UTC 2017 Modified Files: src/games/fortune/datfiles: fortunes Log Message: add quote about libraries offending everyone To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.64 src/games/fortune/datfiles/fortunes:1.65 --- src/games/fortune/datfiles/fortunes:1.64 Tue Jun 13 17:18:00 2017 +++ src/games/fortune/datfiles/fortunes Sat Nov 18 19:51:46 2017 @@ -16207,3 +16207,6 @@ to do things in a sub-optimal manner. Q. What do you do if you find an abomination rooted in and need a druid in a hurry? A. Call the copse. +% +A truly great library contains something in it to offend everyone. +-- Jo Godwin
CVS commit: src/bin/chio
Module Name:src
Committed By: jnemeth
Date: Mon Oct 16 17:08:35 UTC 2017
Modified Files:
src/bin/chio: chio.c
Log Message:
typo: unvalid -> invalid
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/bin/chio/chio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/chio/chio.c
diff -u src/bin/chio/chio.c:1.32 src/bin/chio/chio.c:1.33
--- src/bin/chio/chio.c:1.32 Tue Aug 23 21:07:40 2016
+++ src/bin/chio/chio.c Mon Oct 16 17:08:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: chio.c,v 1.32 2016/08/23 21:07:40 sevan Exp $ */
+/* $NetBSD: chio.c,v 1.33 2017/10/16 17:08:35 jnemeth Exp $ */
/*-
* Copyright (c) 1996, 1998, 1999 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
__COPYRIGHT(
"@(#) Copyright (c) 1996, 1998, 1999\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: chio.c,v 1.32 2016/08/23 21:07:40 sevan Exp $");
+__RCSID("$NetBSD: chio.c,v 1.33 2017/10/16 17:08:35 jnemeth Exp $");
#endif
#include
@@ -620,7 +620,7 @@ do_status(const char *cname, int argc, c
}
if ((unit + ucount) > count)
- errx(EXIT_FAILURE, "%s: unvalid unit/count %d/%d",
+ errx(EXIT_FAILURE, "%s: invalid unit/count %d/%d",
cname, unit, ucount);
/* NOTREACHED */
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Sun Jul 2 08:25:52 UTC 2017 Modified Files: src/usr.bin/calendar/calendars: calendar.holiday Log Message: Only 35 years late. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/calendar/calendars/calendar.holiday Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.holiday diff -u src/usr.bin/calendar/calendars/calendar.holiday:1.27 src/usr.bin/calendar/calendars/calendar.holiday:1.28 --- src/usr.bin/calendar/calendars/calendar.holiday:1.27 Tue Dec 6 04:54:00 2016 +++ src/usr.bin/calendar/calendars/calendar.holiday Sun Jul 2 08:25:52 2017 @@ -217,7 +217,7 @@ 06/29 Independence Day in Seychelles 06/29 Last Day of Ramadan* in Algeria, Oman 06/30 Day of the Army in Guatemala -07/01 Dominion Day in Canada +07/01 Canada Day in Canada 07/01 Freedom Day in Suriname 07/01 Independence Day in Burundi 07/01 National Day in Rwanda
CVS commit: src/share/man/man4
Module Name:src Committed By: jnemeth Date: Tue May 30 20:32:08 UTC 2017 Modified Files: src/share/man/man4: uftdi.4 Log Message: mention RTSYS CT57A radio cable To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/uftdi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/uftdi.4 diff -u src/share/man/man4/uftdi.4:1.18 src/share/man/man4/uftdi.4:1.19 --- src/share/man/man4/uftdi.4:1.18 Sun Jan 20 14:03:28 2013 +++ src/share/man/man4/uftdi.4 Tue May 30 20:32:08 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: uftdi.4,v 1.18 2013/01/20 14:03:28 pgoyette Exp $ +.\" $NetBSD: uftdi.4,v 1.19 2017/05/30 20:32:08 jnemeth Exp $ .\" .\" Copyright (c) 2000 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 18, 2012 +.Dd May 30, 2017 .Dt UFTDI 4 .Os .Sh NAME @@ -84,6 +84,7 @@ driver supports the following adapters: .It Tn QVS USC-1000 .It Tn RATOC Systems REX-USB60F .It Tn Robot Electronics USB to I2C Communications Module +.It Tn RT Systems Inc. CT57A Radio Cable .It Tn Sealevel Systems USB-Serial adapter .It Tn SIIG US2308 Serial .It Tn Telldus Tellstick and Tellstick Duo
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jnemeth
Date: Tue May 30 20:26:26 UTC 2017
Modified Files:
src/sys/dev/usb: uftdi.c
Log Message:
add RTSYS CT57A to list of FTDI based USB serial devices
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/usb/uftdi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.64 src/sys/dev/usb/uftdi.c:1.65
--- src/sys/dev/usb/uftdi.c:1.64 Thu Dec 15 17:21:21 2016
+++ src/sys/dev/usb/uftdi.c Tue May 30 20:26:26 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.64 2016/12/15 17:21:21 maya Exp $ */
+/* $NetBSD: uftdi.c,v 1.65 2017/05/30 20:26:26 jnemeth Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.64 2016/12/15 17:21:21 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.65 2017/05/30 20:26:26 jnemeth Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -165,6 +165,7 @@ static const struct usb_devno uftdi_devs
{ USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI },
{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_PCOPRS1 },
{ USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60F },
+ { USB_VENDOR_RTSYS, USB_PRODUCT_RTSYS_CT57A },
{ USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_USBSERIAL },
{ USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_SEAPORT4P1 },
{ USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_SEAPORT4P2 },
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jnemeth Date: Tue May 30 20:13:35 UTC 2017 Modified Files: src/sys/dev/usb: usbdevs Log Message: add RT Systems Inc. CT57A Radio Cable for programming Yaesu FT-60 radios (and possibly others) To generate a diff of this commit: cvs rdiff -u -r1.735 -r1.736 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.735 src/sys/dev/usb/usbdevs:1.736 --- src/sys/dev/usb/usbdevs:1.735 Tue May 23 00:29:20 2017 +++ src/sys/dev/usb/usbdevs Tue May 30 20:13:35 2017 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.735 2017/05/23 00:29:20 khorben Exp $ +$NetBSD: usbdevs,v 1.736 2017/05/30 20:13:35 jnemeth Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -554,6 +554,7 @@ vendor ENCORE 0x203d Encore vendor HAUPPAUGE2 0x2040 Hauppauge Computer Works vendor PARA 0x20b8 PARA Industrial vendor TRENDNET 0x20f4 TRENDnet +vendor RTSYS 0x2100 RT Systems vendor DLINK3 0x2101 D-Link vendor VIALABS 0x2109 VIA Labs vendor ERICSSON 0x2282 Ericsson @@ -2824,6 +2825,9 @@ product ROLAND UA4FX 0x00A3 EDIROL UA- product ROLAND SONICCELL 0x00C2 SonicCell product ROLAND UMONE 0x012a UM-ONE MIDI I/F +/* RT Systems products */ +product RTSYS CT57A 0x9e51 CT57A Radio Cable + /* Sagem products */ product SAGEM XG760A 0x004a XG-760A product SAGEM XG76NA 0x0062 XG-76NA
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jnemeth
Date: Wed May 3 15:34:05 UTC 2017
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
PR/52212 - Kai-Uwe Eckhardt -- add TP-Link TL-WN722N v2
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.52 src/sys/dev/usb/if_urtwn.c:1.53
--- src/sys/dev/usb/if_urtwn.c:1.52 Sun Dec 4 10:12:35 2016
+++ src/sys/dev/usb/if_urtwn.c Wed May 3 15:34:05 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.52 2016/12/04 10:12:35 skrll Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.53 2017/05/03 15:34:05 jnemeth Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.52 2016/12/04 10:12:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53 2017/05/03 15:34:05 jnemeth Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -191,6 +191,7 @@ static const struct urtwn_dev {
URTWN_RTL8188E_DEV(REALTEK, RTL8188ETV),
URTWN_RTL8188E_DEV(REALTEK, RTL8188EU),
URTWN_RTL8188E_DEV(ABOCOM, RTL8188EU),
+ URTWN_RTL8188E_DEV(TPLINK, RTL8188EU),
/* URTWN_RTL8192EU */
URTWN_RTL8192EU_DEV(REALTEK, RTL8192EU),
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jnemeth
Date: Wed May 3 15:20:27 UTC 2017
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
PR/52212 - Kai-Uwe Eckhardt -- add TP-Link TL-WN722N v2
To generate a diff of this commit:
cvs rdiff -u -r1.723 -r1.724 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.724 -r1.725 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.723 src/sys/dev/usb/usbdevs.h:1.724
--- src/sys/dev/usb/usbdevs.h:1.723 Tue Apr 18 19:10:58 2017
+++ src/sys/dev/usb/usbdevs.h Wed May 3 15:20:27 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.723 2017/04/18 19:10:58 riastradh Exp $ */
+/* $NetBSD: usbdevs.h,v 1.724 2017/05/03 15:20:27 jnemeth Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.732 2017/04/18 19:09:12 riastradh Exp
+ * NetBSD: usbdevs,v 1.733 2017/05/03 15:14:27 jnemeth Exp
*/
/*
@@ -3267,6 +3267,7 @@
/* TP-Link products */
#define USB_PRODUCT_TPLINK_RTL8192CU 0x0100 /* RTL8192CU */
+#define USB_PRODUCT_TPLINK_RTL8188EU 0x010c /* RTL8188EU */
/* Trek Technology products */
#define USB_PRODUCT_TREK_THUMBDRIVE 0x /* ThumbDrive */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.724 src/sys/dev/usb/usbdevs_data.h:1.725
--- src/sys/dev/usb/usbdevs_data.h:1.724 Tue Apr 18 19:10:58 2017
+++ src/sys/dev/usb/usbdevs_data.h Wed May 3 15:20:27 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.724 2017/04/18 19:10:58 riastradh Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.725 2017/05/03 15:20:27 jnemeth Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.732 2017/04/18 19:09:12 riastradh Exp
+ * NetBSD: usbdevs,v 1.733 2017/05/03 15:14:27 jnemeth Exp
*/
/*
@@ -4448,6 +4448,8 @@ static const uint16_t usb_products[] = {
8474, 6344, 4869, 5661, 0,
USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_RTL8192CU,
5081, 0,
+ USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_RTL8188EU,
+ 5091, 0,
USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,
18679, 0,
USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB,
@@ -5447,7 +5449,7 @@ static const char usb_words[] = { "."
"USB2.0\0" /* 6 refs @ 5069 */
"WL54\0" /* 1 refs @ 5076 */
"RTL8192CU\0" /* 24 refs @ 5081 */
- "RTL8188EU\0" /* 2 refs @ 5091 */
+ "RTL8188EU\0" /* 3 refs @ 5091 */
"RTL8188CU\0" /* 21 refs @ 5101 */
"XX10\0" /* 1 refs @ 5111 */
"BWU613\0" /* 1 refs @ 5116 */
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jnemeth Date: Wed May 3 15:14:27 UTC 2017 Modified Files: src/sys/dev/usb: usbdevs Log Message: PR/52212 - Kai-Uwe Eckhardt -- add TP-Link TL-WN722N v2 To generate a diff of this commit: cvs rdiff -u -r1.732 -r1.733 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.732 src/sys/dev/usb/usbdevs:1.733 --- src/sys/dev/usb/usbdevs:1.732 Tue Apr 18 19:09:12 2017 +++ src/sys/dev/usb/usbdevs Wed May 3 15:14:27 2017 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.732 2017/04/18 19:09:12 riastradh Exp $ +$NetBSD: usbdevs,v 1.733 2017/05/03 15:14:27 jnemeth Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -3260,6 +3260,7 @@ product TOSHIBA HSDPA_MODEM_EU870DT1 0x1 /* TP-Link products */ product TPLINK RTL8192CU 0x0100 RTL8192CU +product TPLINK RTL8188EU 0x010c RTL8188EU /* Trek Technology products */ product TREK THUMBDRIVE 0x ThumbDrive
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: jnemeth Date: Tue Jan 3 00:35:07 UTC 2017 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: add rtsold to rc_obsolete_files :-( To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.207 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.206 src/usr.sbin/postinstall/postinstall:1.207 --- src/usr.sbin/postinstall/postinstall:1.206 Wed Oct 19 22:17:08 2016 +++ src/usr.sbin/postinstall/postinstall Tue Jan 3 00:35:07 2017 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.206 2016/10/19 22:17:08 christos Exp $ +# $NetBSD: postinstall,v 1.207 2017/01/03 00:35:07 jnemeth Exp $ # # Copyright (c) 2002-2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -1463,6 +1463,7 @@ login nfsiod poffd portmap +rtsold sdpd servers sunndd
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Tue Dec 6 04:54:00 UTC 2016 Modified Files: src/usr.bin/calendar/calendars: calendar.christian calendar.holiday calendar.judaic calendar.netbsd calendar.usholiday Log Message: update floating holidays for 2017 in preparation for pullup for 7.1 release To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/calendar/calendars/calendar.christian \ src/usr.bin/calendar/calendars/calendar.judaic cvs rdiff -u -r1.26 -r1.27 src/usr.bin/calendar/calendars/calendar.holiday cvs rdiff -u -r1.36 -r1.37 src/usr.bin/calendar/calendars/calendar.netbsd cvs rdiff -u -r1.6 -r1.7 src/usr.bin/calendar/calendars/calendar.usholiday Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.christian diff -u src/usr.bin/calendar/calendars/calendar.christian:1.5 src/usr.bin/calendar/calendars/calendar.christian:1.6 --- src/usr.bin/calendar/calendars/calendar.christian:1.5 Wed Sep 23 05:21:00 2015 +++ src/usr.bin/calendar/calendars/calendar.christian Tue Dec 6 04:54:00 2016 @@ -1,17 +1,17 @@ 01/06* Epiphany -02/09* Shrove Tuesday / Mardi Gras (day before Ash Wednesday) -02/10* Ash Wednesday (First day of Lent) -03/20* Palm Sunday (7 days before Easter) -03/24* Maundy Thursday (3 days before Easter) -03/25* Good Friday (2 days before Easter) -03/27* Easter Sunday -05/01* Rogation Sunday -05/05* Ascension Day (10 days before Pentecost) -05/15* Pentecost (Whitsunday) -05/16* Whitmonday -05/22* Trinity Sunday (7 days after Pentecost) -05/26* Corpus Christi (11 days after Pentecost) +02/28* Shrove Tuesday / Mardi Gras (day before Ash Wednesday) +03/01* Ash Wednesday (First day of Lent) +04/09* Palm Sunday (7 days before Easter) +04/13* Maundy Thursday (3 days before Easter) +04/14* Good Friday (2 days before Easter) +04/16* Easter Sunday +05/21* Rogation Sunday +05/25* Ascension Day (10 days before Pentecost) +06/04* Pentecost (Whitsunday) +06/05* Whitmonday +06/11* Trinity Sunday (7 days after Pentecost) +06/15* Corpus Christi (11 days after Pentecost) 10/18 Feast Day of St. Luke -11/29* First Sunday of Advent (4th Sunday before Christmas) +12/03* First Sunday of Advent (4th Sunday before Christmas) 12/06 St. Nicholas' Day 12/25 Feast of the Nativity (Christmas) Index: src/usr.bin/calendar/calendars/calendar.judaic diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.5 src/usr.bin/calendar/calendars/calendar.judaic:1.6 --- src/usr.bin/calendar/calendars/calendar.judaic:1.5 Wed Sep 23 05:21:00 2015 +++ src/usr.bin/calendar/calendars/calendar.judaic Tue Dec 6 04:54:00 2016 @@ -1,27 +1,27 @@ -01/25* Tu B'Shvat (Feast of Trees) -03/23* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) -03/24* Purim (Feast of Lots; 30 days before Pesach) -04/23* Pesach (First Day of Passover; sabbatical) -04/24* Pesach (sabbatical) -04/25* Pesach (sabbatical) -04/26* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) -05/12* Yom HaAtzma'ut (Israel Independence Day) -05/26* Lag B'Omer (Commemoration of the Great Rebellion) -06/04* Yom Yerushalayim (Reunification of Jerusalem) -06/12* Shavuos (Festival of Weeks; 50 days after Pesach; sabbatical) -07/24* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; +02/11* Tu B'Shvat (Feast of Trees) +03/10* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) +03/11* Purim (Feast of Lots; 30 days before Pesach) +04/10* Pesach (First Day of Passover; sabbatical) +04/11* Pesach (sabbatical) +04/12* Pesach (sabbatical) +04/13* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) +05/02* Yom HaAtzma'ut (Israel Independence Day) +05/13* Lag B'Omer (Commemoration of the Great Rebellion) +05/24* Yom Yerushalayim (Reunification of Jerusalem) +05/30* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) +07/11* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; fast day) -08/14* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) -10/03* First Day of Rosh Hashanah (Jewish Lunar New Year; 5767 == 2006; +08/01* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) +09/21* First Day of Rosh Hashanah (Jewish Lunar New Year; 5778 == 2017; sabbatical) -10/03* Rosh Hashanah (sabbatical) -10/04* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day +09/21* Rosh Hashanah (sabbatical) +09/22* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day after Rosh Hashanah; fast day) -10/12* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; +09/30* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; sabbatical, fast day) -10/17* Succos (Festival of Tabernacles; 14 days after Rosh Hashanah; +10/05* Succos (Festival of Tabernacles; 14 days after Rosh Hashanah; sabbatical) -10/23* Hoshanah Rabba (7th day of Succos) -10/24* Shmini Atzeres (8th Day of
CVS commit: src/external/bsd/blacklist/port
Module Name:src Committed By: jnemeth Date: Sat Nov 26 02:12:18 UTC 2016 Modified Files: src/external/bsd/blacklist/port: Makefile.am Log Message: Set path for includes_HEADERS. Change suggested by christos@. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/blacklist/port/Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/blacklist/port/Makefile.am diff -u src/external/bsd/blacklist/port/Makefile.am:1.5 src/external/bsd/blacklist/port/Makefile.am:1.6 --- src/external/bsd/blacklist/port/Makefile.am:1.5 Sun Nov 13 22:37:39 2016 +++ src/external/bsd/blacklist/port/Makefile.am Sat Nov 26 02:12:18 2016 @@ -1,7 +1,7 @@ # ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libblacklist.la -include_HEADERS = blacklist.h +include_HEADERS = ../include/blacklist.h bin_PROGRAMS = blacklistd blacklistctl srvtest cltest
CVS commit: src/sys/net/npf
Module Name:src Committed By: jnemeth Date: Mon Nov 7 18:16:07 UTC 2016 Modified Files: src/sys/net/npf: npf_inet.c Log Message: fixup misplaced #endif To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/net/npf/npf_inet.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/npf/npf_inet.c diff -u src/sys/net/npf/npf_inet.c:1.34 src/sys/net/npf/npf_inet.c:1.35 --- src/sys/net/npf/npf_inet.c:1.34 Fri Mar 18 10:09:46 2016 +++ src/sys/net/npf/npf_inet.c Mon Nov 7 18:16:07 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_inet.c,v 1.34 2016/03/18 10:09:46 mrg Exp $ */ +/* $NetBSD: npf_inet.c,v 1.35 2016/11/07 18:16:07 jnemeth Exp $ */ /*- * Copyright (c) 2009-2014 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.34 2016/03/18 10:09:46 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.35 2016/11/07 18:16:07 jnemeth Exp $"); #include #include @@ -657,10 +657,10 @@ npf_napt_rwr(const npf_cache_t *npc, u_i case IPPROTO_ICMP: #ifdef INET6 case IPPROTO_ICMPV6: +#endif KASSERT(npf_iscached(npc, NPC_ICMP)); /* Nothing. */ break; -#endif default: return ENOTSUP; }
CVS commit: src/external/bsd/blacklist/bin
Module Name:src
Committed By: jnemeth
Date: Wed Nov 2 03:15:07 UTC 2016
Modified Files:
src/external/bsd/blacklist/bin: blacklistctl.c
Log Message:
Correct misplaced break; from FreeBSD.
Approved By: christos
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/blacklist/bin/blacklistctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blacklist/bin/blacklistctl.c
diff -u src/external/bsd/blacklist/bin/blacklistctl.c:1.20 src/external/bsd/blacklist/bin/blacklistctl.c:1.21
--- src/external/bsd/blacklist/bin/blacklistctl.c:1.20 Mon Apr 4 15:52:56 2016
+++ src/external/bsd/blacklist/bin/blacklistctl.c Wed Nov 2 03:15:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: blacklistctl.c,v 1.20 2016/04/04 15:52:56 christos Exp $ */
+/* $NetBSD: blacklistctl.c,v 1.21 2016/11/02 03:15:07 jnemeth Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#endif
#include
-__RCSID("$NetBSD: blacklistctl.c,v 1.20 2016/04/04 15:52:56 christos Exp $");
+__RCSID("$NetBSD: blacklistctl.c,v 1.21 2016/11/02 03:15:07 jnemeth Exp $");
#include
#include
@@ -96,10 +96,10 @@ main(int argc, char *argv[])
break;
case 'b':
blocked = 1;
+ break;
case 'D':
dbname = optarg;
break;
- break;
case 'd':
debug++;
break;
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sun Jun 12 12:48:33 UTC 2016
Modified Files:
src/sbin/gpt: recover.c
Log Message:
- fix setting of hdr_lba_alt which was broken in revision 1.10 on 2015/12/2
- switch to using gpt_last
- PR/51230 -- recreate the PMBR if it was lost
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/gpt/recover.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/recover.c
diff -u src/sbin/gpt/recover.c:1.15 src/sbin/gpt/recover.c:1.16
--- src/sbin/gpt/recover.c:1.15 Fri Dec 4 16:46:24 2015
+++ src/sbin/gpt/recover.c Sun Jun 12 12:48:32 2016
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/recover.c,v 1.8 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: recover.c,v 1.15 2015/12/04 16:46:24 christos Exp $");
+__RCSID("$NetBSD: recover.c,v 1.16 2016/06/12 12:48:32 jnemeth Exp $");
#endif
#include
@@ -68,7 +68,7 @@ static int
recover_gpt_hdr(gpt_t gpt, int type, off_t last)
{
const char *name, *origname;
- map_t *dgpt, dtbl, sgpt, stbl;
+ map_t *dgpt, dtbl, sgpt, stbl __unused;
struct gpt_hdr *hdr;
if (gpt_add_hdr(gpt, type, last) == -1)
@@ -99,7 +99,7 @@ recover_gpt_hdr(gpt_t gpt, int type, off
memcpy((*dgpt)->map_data, sgpt->map_data, gpt->secsz);
hdr = (*dgpt)->map_data;
hdr->hdr_lba_self = htole64((uint64_t)(*dgpt)->map_start);
- hdr->hdr_lba_alt = htole64((uint64_t)stbl->map_start);
+ hdr->hdr_lba_alt = htole64((uint64_t)sgpt->map_start);
hdr->hdr_lba_table = htole64((uint64_t)dtbl->map_start);
hdr->hdr_crc_self = 0;
hdr->hdr_crc_self = htole32(crc32(hdr, le32toh(hdr->hdr_size)));
@@ -151,7 +151,9 @@ recover_gpt_tbl(gpt_t gpt, int type, off
static int
recover(gpt_t gpt, int recoverable)
{
- uint64_t last;
+ off_t last = gpt_last(gpt);
+ map_t map;
+ struct mbr *mbr;
if (map_find(gpt, MAP_TYPE_MBR) != NULL) {
gpt_warnx(gpt, "Device contains an MBR");
@@ -174,10 +176,9 @@ recover(gpt_t gpt, int recoverable)
return -1;
}
- last = (uint64_t)(gpt->mediasz / gpt->secsz - 1LL);
-
if (gpt->gpt != NULL &&
- ((struct gpt_hdr *)(gpt->gpt->map_data))->hdr_lba_alt != last) {
+ ((struct gpt_hdr *)(gpt->gpt->map_data))->hdr_lba_alt !=
+ (uint64_t)last) {
gpt_warnx(gpt, "Media size has changed, please use "
"'%s resizedisk'", getprogname());
return -1;
@@ -185,7 +186,7 @@ recover(gpt_t gpt, int recoverable)
if (gpt->tbl != NULL && gpt->lbt == NULL) {
if (recover_gpt_tbl(gpt, MAP_TYPE_SEC_GPT_TBL,
- (off_t)last - gpt->tbl->map_size) == -1)
+ last - gpt->tbl->map_size) == -1)
return -1;
} else if (gpt->tbl == NULL && gpt->lbt != NULL) {
if (recover_gpt_tbl(gpt, MAP_TYPE_PRI_GPT_TBL, 2LL) == -1)
@@ -193,13 +194,38 @@ recover(gpt_t gpt, int recoverable)
}
if (gpt->gpt != NULL && gpt->tpg == NULL) {
- if (recover_gpt_hdr(gpt, MAP_TYPE_SEC_GPT_HDR,
- (off_t)last) == -1)
+ if (recover_gpt_hdr(gpt, MAP_TYPE_SEC_GPT_HDR, last) == -1)
return -1;
} else if (gpt->gpt == NULL && gpt->tpg != NULL) {
if (recover_gpt_hdr(gpt, MAP_TYPE_PRI_GPT_HDR, 1LL) == -1)
return -1;
}
+
+ /*
+ * Create PMBR if it doesn't already exist.
+ */
+ if (map_find(gpt, MAP_TYPE_PMBR) == NULL) {
+ if (map_free(gpt, 0LL, 1LL) == 0) {
+ gpt_warnx(gpt, "No room for the PMBR");
+ return -1;
+ }
+ mbr = gpt_read(gpt, 0LL, 1);
+ if (mbr == NULL) {
+ gpt_warnx(gpt, "Error reading MBR");
+ return -1;
+ }
+ memset(mbr, 0, sizeof(*mbr));
+ mbr->mbr_sig = htole16(MBR_SIG);
+ gpt_create_pmbr_part(mbr->mbr_part, last, 0);
+
+ map = map_add(gpt, 0LL, 1LL, MAP_TYPE_PMBR, mbr, 1);
+ if (gpt_write(gpt, map) == -1) {
+ gpt_warn(gpt, "Can't write PMBR");
+ return -1;
+ }
+ gpt_msg(gpt,
+ "Recreated PMBR (you may need to rerun 'gpt biosboot'");
+ }
return 0;
}
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: jnemeth
Date: Sun Jun 12 09:08:09 UTC 2016
Modified Files:
src/sys/arch/xen/xen: clock.c hypervisor.c
Log Message:
- add machdep.xen.version sysctl to easily get hypervisor version
- move machdep.xen_timepush_ticks to machdep.xen.timepush_ticks to
consolidate all Xen related sysctls under machdep.xen
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/xen/xen/clock.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/xen/xen/hypervisor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/clock.c
diff -u src/sys/arch/xen/xen/clock.c:1.63 src/sys/arch/xen/xen/clock.c:1.64
--- src/sys/arch/xen/xen/clock.c:1.63 Sun Sep 21 12:46:15 2014
+++ src/sys/arch/xen/xen/clock.c Sun Jun 12 09:08:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.63 2014/09/21 12:46:15 bouyer Exp $ */
+/* $NetBSD: clock.c,v 1.64 2016/06/12 09:08:09 jnemeth Exp $ */
/*
*
@@ -29,7 +29,7 @@
#include "opt_xen.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.63 2014/09/21 12:46:15 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.64 2016/06/12 09:08:09 jnemeth Exp $");
#include
#include
@@ -471,15 +471,27 @@ xen_initclocks(void)
KASSERT(err == 0);
#ifdef DOM0OPS
+ const struct sysctlnode *node = NULL;
+
if (!tcdone) { /* Do this only once */
xen_timepush_ticks = 53 * hz + 3; /* avoid exact # of min/sec */
if (xendomain_is_privileged()) {
- sysctl_createv(NULL, 0, NULL, NULL, CTLFLAG_READWRITE,
- CTLTYPE_INT, "xen_timepush_ticks", SYSCTL_DESCR("How often"
- " to update the hypervisor's time-of-day; 0 to disable"),
- sysctl_xen_timepush, 0, _timepush_ticks, 0,
- CTL_MACHDEP, CTL_CREATE, CTL_EOL);
+ sysctl_createv(NULL, 0, NULL, , 0,
+ CTLTYPE_NODE, "xen",
+ SYSCTL_DESCR("Xen top level node"),
+ NULL, 0, NULL, 0,
+ CTL_MACHDEP, CTL_CREATE, CTL_EOL);
+ if (node != NULL) {
+sysctl_createv(NULL, 0, , NULL,
+CTLFLAG_READWRITE, CTLTYPE_INT,
+"timepush_ticks",
+SYSCTL_DESCR("How often to update the "
+"hypervisor's time-of-day; 0 to disable"),
+sysctl_xen_timepush, 0,
+_timepush_ticks, 0,
+CTL_CREATE, CTL_EOL);
+ }
callout_reset(_timepush_co, xen_timepush_ticks,
_timepush, _timepush_co);
}
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.66 src/sys/arch/xen/xen/hypervisor.c:1.67
--- src/sys/arch/xen/xen/hypervisor.c:1.66 Sun May 29 17:06:17 2016
+++ src/sys/arch/xen/xen/hypervisor.c Sun Jun 12 09:08:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.66 2016/05/29 17:06:17 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.67 2016/06/12 09:08:09 jnemeth Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -53,12 +53,13 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.66 2016/05/29 17:06:17 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.67 2016/06/12 09:08:09 jnemeth Exp $");
#include
#include
#include
#include
+#include
#include "xenbus.h"
#include "xencons.h"
@@ -203,14 +204,32 @@ hypervisor_attach(device_t parent, devic
#endif /* NPCI */
union hypervisor_attach_cookie hac;
char xen_extra_version[XEN_EXTRAVERSION_LEN];
+ static char xen_version_string[20];
+ int rc;
+ const struct sysctlnode *node = NULL;
xenkernfs_init();
xen_version = HYPERVISOR_xen_version(XENVER_version, NULL);
memset(xen_extra_version, 0, sizeof(xen_extra_version));
HYPERVISOR_xen_version(XENVER_extraversion, xen_extra_version);
- aprint_normal(": Xen version %d.%d%s\n", XEN_MAJOR(xen_version),
+ rc = snprintf(xen_version_string, 20, "%d.%d%s", XEN_MAJOR(xen_version),
XEN_MINOR(xen_version), xen_extra_version);
+ aprint_normal(": Xen version %s\n", xen_version_string);
+ if (rc >= 20)
+ aprint_debug(": xen_version_string truncated\n");
+
+ sysctl_createv(NULL, 0, NULL, , 0,
+ CTLTYPE_NODE, "xen",
+ SYSCTL_DESCR("Xen top level node"),
+ NULL, 0, NULL, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL);
+
+ if (node != NULL) {
+ sysctl_createv(NULL, 0, , NULL, CTLFLAG_READONLY,
+ CTLTYPE_STRING, "version",
+ SYSCTL_DESCR("Xen hypervisor version"),
+ NULL, 0, xen_version_string, 0, CTL_CREATE, CTL_EOL);
+ }
aprint_verbose_dev(self, "features: ");
#define XEN_TST_F(n) \
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: jnemeth
Date: Wed Jun 8 01:59:06 UTC 2016
Modified Files:
src/sys/arch/xen/xen: xen_machdep.c
Log Message:
Feeding uninitialised garbage to the hypervisor is likely to be a bad idea.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/xen/xen_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/xen_machdep.c
diff -u src/sys/arch/xen/xen/xen_machdep.c:1.14 src/sys/arch/xen/xen/xen_machdep.c:1.15
--- src/sys/arch/xen/xen/xen_machdep.c:1.14 Sun May 29 17:06:17 2016
+++ src/sys/arch/xen/xen/xen_machdep.c Wed Jun 8 01:59:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_machdep.c,v 1.14 2016/05/29 17:06:17 bouyer Exp $ */
+/* $NetBSD: xen_machdep.c,v 1.15 2016/06/08 01:59:06 jnemeth Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.14 2016/05/29 17:06:17 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.15 2016/06/08 01:59:06 jnemeth Exp $");
#include "opt_xen.h"
@@ -406,6 +406,7 @@ xen_init_features(void)
xen_feature_info_t features;
for (int sm = 0; sm < XENFEAT_NR_SUBMAPS; sm++) {
+ features.submap_idx = sm;
if (HYPERVISOR_xen_version(XENVER_get_features, ) < 0)
break;
for (int f = 0; f < 32; f++) {
CVS commit: src/share/misc
Module Name:src
Committed By: jnemeth
Date: Tue May 31 23:15:05 UTC 2016
Modified Files:
src/share/misc: acronyms.comp
Log Message:
PR/51205 - Nikolai Lifanov -- add EAPOL, PEAP, and RSN
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.165 src/share/misc/acronyms.comp:1.166
--- src/share/misc/acronyms.comp:1.165 Sun May 15 23:54:19 2016
+++ src/share/misc/acronyms.comp Tue May 31 23:15:05 2016
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.165 2016/05/15 23:54:19 jnemeth Exp $
+$NetBSD: acronyms.comp,v 1.166 2016/05/31 23:15:05 jnemeth Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -377,6 +377,7 @@ EABI embedded-application binary interfa
EAI Email Address Internationalization
EAI Enterprise Application Integration
EAP Extensible Authentication Protocol
+EAPOL EAP over Lan
EBCDIC Extended Binary Coded Decimal Interchange Code
EBR extended boot record
EC elliptical curve
@@ -919,6 +920,7 @@ PDP page {descriptor,directory} page
PDS product data sheet
PDU protocol data unit
PE protection enable
+PEAP Protected EAP
PECI platform environment control interface
PEP protocol extension protocol
PER packed encoding rules
@@ -1062,6 +1064,7 @@ RR round robin
RS relay station
RSA Rivest, Shamir, [and] Adleman
RSIP Realm Specific IP
+RSN Robust Secure Network
RSS really simple syndication
RSS residual sum of squares
RT real time
CVS commit: src/sys/arch/xen/conf
Module Name:src Committed By: jnemeth Date: Fri May 20 03:41:20 UTC 2016 Modified Files: src/sys/arch/xen/conf: files.xen Log Message: make CPU microcode loading dependent on both DOM0OPS AND CPU_UCODE To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 src/sys/arch/xen/conf/files.xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/xen/conf/files.xen diff -u src/sys/arch/xen/conf/files.xen:1.140 src/sys/arch/xen/conf/files.xen:1.141 --- src/sys/arch/xen/conf/files.xen:1.140 Sat Feb 27 15:42:20 2016 +++ src/sys/arch/xen/conf/files.xen Fri May 20 03:41:20 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files.xen,v 1.140 2016/02/27 15:42:20 mlelstv Exp $ +# $NetBSD: files.xen,v 1.141 2016/05/20 03:41:20 jnemeth Exp $ # NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp # NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp @@ -93,9 +93,9 @@ file arch/xen/x86/xen_pmap.c file arch/xen/x86/xen_intr.c file arch/xen/x86/xenfunc.c -file arch/xen/xen/xen_ucode.c dom0ops | cpu_ucode needs-flag -file arch/x86/x86/cpu_ucode_amd.c dom0ops | cpu_ucode needs-flag -file arch/x86/x86/cpu_ucode_intel.c dom0ops | cpu_ucode needs-flag +file arch/xen/xen/xen_ucode.c dom0ops & cpu_ucode needs-flag +file arch/x86/x86/cpu_ucode_amd.c dom0ops & cpu_ucode needs-flag +file arch/x86/x86/cpu_ucode_intel.c dom0ops & cpu_ucode needs-flag file arch/xen/xen/xen_machdep.c file arch/xen/xen/xen_debug.c
CVS commit: src/share/misc
Module Name:src Committed By: jnemeth Date: Sun May 15 23:54:19 UTC 2016 Modified Files: src/share/misc: acronyms.comp Log Message: PR/51028 - Nikolai Lifanov -- add RPKI, BGPSEC To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.164 src/share/misc/acronyms.comp:1.165 --- src/share/misc/acronyms.comp:1.164 Sun May 15 23:40:46 2016 +++ src/share/misc/acronyms.comp Sun May 15 23:54:19 2016 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.164 2016/05/15 23:40:46 jnemeth Exp $ +$NetBSD: acronyms.comp,v 1.165 2016/05/15 23:54:19 jnemeth Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -109,6 +109,7 @@ BFS breadth-first search BFT binary file transfer BGA ball grid array BGP Border Gateway Protocol +BGPSEC BGP Security BIND Berkeley Internet Name Daemon BIOS Basic Input/Output System BIOS built-in operating system @@ -1052,6 +1053,7 @@ RMW read, modify, write RNG random number generator ROM read only memory RPC remote procedure call +RPKI resource PKI RPL requested privilege level RPM revolutions per minute RPN reverse Polish notation
CVS commit: src/share/misc
Module Name:src
Committed By: jnemeth
Date: Sun May 15 23:40:46 UTC 2016
Modified Files:
src/share/misc: acronyms acronyms.comp
Log Message:
PR/51023 - Nikolai Lifanov -- add more acronyms
To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 src/share/misc/acronyms
cvs rdiff -u -r1.163 -r1.164 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.245 src/share/misc/acronyms:1.246
--- src/share/misc/acronyms:1.245 Sat Feb 13 23:12:34 2016
+++ src/share/misc/acronyms Sun May 15 23:40:46 2016
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.245 2016/02/13 23:12:34 dholland Exp $
+$NetBSD: acronyms,v 1.246 2016/05/15 23:40:46 jnemeth Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -443,6 +443,7 @@ SFAICT so far as I can tell
SHID slaps head in disgust
SIMCA sitting in my chair amused
SITD still in the dark
+SMAP Soil Moisture Active Passive
SMH shaking my head
SMLSFB so many losers, so few bullets
SMOP simple matter of programming
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.163 src/share/misc/acronyms.comp:1.164
--- src/share/misc/acronyms.comp:1.163 Sat May 7 12:22:57 2016
+++ src/share/misc/acronyms.comp Sun May 15 23:40:46 2016
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.163 2016/05/07 12:22:57 pgoyette Exp $
+$NetBSD: acronyms.comp,v 1.164 2016/05/15 23:40:46 jnemeth Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -618,6 +618,8 @@ IST interrupt stack table
ISV independent software vendor
IT information technology
ITB Intel Turbo Boost
+ITIL information technology infrastructure library
+ITSM IT service management
IV initialization vector
IVT interrupt vector table
JBOD just a bunch of disks
@@ -1121,6 +1123,7 @@ SFTP SSH File Transfer Protocol
SFTP Serial File Transfer Protocol
SFTP Simple File Transfer Protocol
SGRAM synchronous graphics random access memory
+SIEM security information and event management
SIFS short inter-frame space
SIMD single instruction, multiple data
SIMM single inline memory module
@@ -1137,6 +1140,8 @@ SLOC source lines of code
SLRU segmented LRU
SMA smart memory access
SMAF system management action field
+SMAP Simple Mail Access Protocol
+SMAP supervisor mode access prevention
SMART self-monitoring analysis and reporting technology
SMBIOS System Management BIOS
SMC system management controller
CVS commit: src/share/misc
Module Name:src Committed By: jnemeth Date: Fri Feb 26 08:20:27 UTC 2016 Modified Files: src/share/misc: acronyms.comp Log Message: PR/50851 - Nikolai Lifanov -- add EAI To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.158 src/share/misc/acronyms.comp:1.159 --- src/share/misc/acronyms.comp:1.158 Thu Jan 28 10:20:40 2016 +++ src/share/misc/acronyms.comp Fri Feb 26 08:20:27 2016 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.158 2016/01/28 10:20:40 pgoyette Exp $ +$NetBSD: acronyms.comp,v 1.159 2016/02/26 08:20:27 jnemeth Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -370,6 +370,8 @@ DVI Digital Visual Interface DVR digital video recorder E-XER extended XML encoding rules EABI embedded-application binary interface +EAI Email Address Internationalization +EAI Enterprise Application Integration EAP Extensible Authentication Protocol EBCDIC Extended Binary Coded Decimal Interchange Code EBR extended boot record
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: jnemeth
Date: Thu Jan 28 06:52:55 UTC 2016
Modified Files:
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
move #ifdef notyet to encompass all relevant parts
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/x86/x86/x86_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.69 src/sys/arch/x86/x86/x86_machdep.c:1.70
--- src/sys/arch/x86/x86/x86_machdep.c:1.69 Thu Jan 28 01:08:43 2016
+++ src/sys/arch/x86/x86/x86_machdep.c Thu Jan 28 06:52:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.69 2016/01/28 01:08:43 christos Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.70 2016/01/28 06:52:55 jnemeth Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.69 2016/01/28 01:08:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.70 2016/01/28 06:52:55 jnemeth Exp $");
#include "opt_modular.h"
#include "opt_physmem.h"
@@ -127,6 +127,7 @@ lookup_bootinfo(int type)
return found ? bic : NULL;
}
+#ifdef notyet
/*
* List the available bootinfo entries.
*/
@@ -134,7 +135,6 @@ static const char *btinfo_str[] = {
BTINFO_STR
};
-#ifdef notyet
void
aprint_bootinfo(void)
{
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: jnemeth Date: Mon Jan 25 03:14:30 UTC 2016 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add t_hypot to fix build break. Hi gson! To generate a diff of this commit: cvs rdiff -u -r1.659 -r1.660 src/distrib/sets/lists/tests/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/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.659 src/distrib/sets/lists/tests/mi:1.660 --- src/distrib/sets/lists/tests/mi:1.659 Tue Jan 5 17:22:38 2016 +++ src/distrib/sets/lists/tests/mi Mon Jan 25 03:14:29 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.659 2016/01/05 17:22:38 jakllsch Exp $ +# $NetBSD: mi,v 1.660 2016/01/25 03:14:29 jnemeth Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2888,6 +2888,7 @@ ./usr/tests/lib/libm/t_fenv tests-lib-tests compattestfile,atf ./usr/tests/lib/libm/t_floor tests-obsolete obsolete ./usr/tests/lib/libm/t_fmod tests-lib-tests compattestfile,atf +./usr/tests/lib/libm/t_hypot tests-lib-tests compattestfile,atf ./usr/tests/lib/libm/t_infinity tests-lib-tests compattestfile,atf ./usr/tests/lib/libm/t_ldexp tests-lib-tests compattestfile,atf ./usr/tests/lib/libm/t_libm tests-obsolete obsolete
CVS commit: src/share/misc
Module Name:src Committed By: jnemeth Date: Fri Jan 22 19:13:53 UTC 2016 Modified Files: src/share/misc: acronyms.comp Log Message: PR/50691 - Nikolai Lifanov -- add LTS To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.156 src/share/misc/acronyms.comp:1.157 --- src/share/misc/acronyms.comp:1.156 Fri Jan 8 08:37:18 2016 +++ src/share/misc/acronyms.comp Fri Jan 22 19:13:53 2016 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.156 2016/01/08 08:37:18 jnemeth Exp $ +$NetBSD: acronyms.comp,v 1.157 2016/01/22 19:13:53 jnemeth Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -690,6 +690,7 @@ LTO link time optimization LTR left to right LTR load task register LTR letter(-sized paper) +LTS long term support LUA Lua Uppercase Accident LUN logical unit number LV logical volume
CVS commit: src/share/misc
Module Name:src
Committed By: jnemeth
Date: Fri Jan 8 08:37:18 UTC 2016
Modified Files:
src/share/misc: acronyms acronyms.comp
Log Message:
PR/50630 - Nikolai Lifanov -- add some acronyms
To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 src/share/misc/acronyms
cvs rdiff -u -r1.155 -r1.156 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.242 src/share/misc/acronyms:1.243
--- src/share/misc/acronyms:1.242 Thu Dec 3 03:28:47 2015
+++ src/share/misc/acronyms Fri Jan 8 08:37:18 2016
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.242 2015/12/03 03:28:47 jnemeth Exp $
+$NetBSD: acronyms,v 1.243 2016/01/08 08:37:18 jnemeth Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -184,6 +184,7 @@ GM game master
GMT Greenwich mean time
GMTA great minds think alike
GOK God only knows
+GOP Grand Old Party
GOWI get on with it
GPS global positioning system
GR8 great
@@ -557,3 +558,4 @@ YMMV your mileage may vary
YOLO you only live once
YW you're welcome
YWSYLS you win some, you lose some
+ZIP zoning improvement plan
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.155 src/share/misc/acronyms.comp:1.156
--- src/share/misc/acronyms.comp:1.155 Thu Dec 3 03:28:47 2015
+++ src/share/misc/acronyms.comp Fri Jan 8 08:37:18 2016
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.155 2015/12/03 03:28:47 jnemeth Exp $
+$NetBSD: acronyms.comp,v 1.156 2016/01/08 08:37:18 jnemeth Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -482,6 +482,7 @@ GID group identifier
GIF graphics interchange format
GMCH graphics and memory controller hub
GNU GNU's Not Unix
+GOP graphics output protocol
GOT global offset table
GPE general purpose event
GPF general protection fault
@@ -1267,7 +1268,9 @@ UCS uniform-cost search
UDMA ultra DMA
UDO ultra density optical
UDP User Datagram Protocol
+UEFI unified extensible firmware interface
UFS Unix File System
+UGA universal graphics adapter
UI unit interval
UI user interface
UID unique identifier
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sat Dec 26 13:12:17 UTC 2015
Modified Files:
src/sbin/gpt: gpt.c
Log Message:
pretty up attribute display a bit
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sbin/gpt/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.64 src/sbin/gpt/gpt.c:1.65
--- src/sbin/gpt/gpt.c:1.64 Sun Dec 6 00:39:26 2015
+++ src/sbin/gpt/gpt.c Sat Dec 26 13:12:16 2015
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.64 2015/12/06 00:39:26 christos Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.65 2015/12/26 13:12:16 jnemeth Exp $");
#endif
#include
@@ -1154,7 +1154,7 @@ gpt_attr_list(char *buf, size_t len, uin
for (i = 0; i < __arraycount(gpt_attr); i++)
if (attributes & gpt_attr[i].mask) {
- strlcat(buf, buf[0] ? "," : "", len);
+ strlcat(buf, buf[0] ? ", " : "", len);
strlcat(buf, gpt_attr[i].name, len);
}
return buf;
CVS commit: src/sys/miscfs/specfs
Module Name:src
Committed By: jnemeth
Date: Sat Dec 5 07:59:34 UTC 2015
Modified Files:
src/sys/miscfs/specfs: spec_vnops.c
Log Message:
messing with uninitialized structs is a bad thing
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/miscfs/specfs/spec_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.154 src/sys/miscfs/specfs/spec_vnops.c:1.155
--- src/sys/miscfs/specfs/spec_vnops.c:1.154 Fri Dec 4 23:54:06 2015
+++ src/sys/miscfs/specfs/spec_vnops.c Sat Dec 5 07:59:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: spec_vnops.c,v 1.154 2015/12/04 23:54:06 christos Exp $ */
+/* $NetBSD: spec_vnops.c,v 1.155 2015/12/05 07:59:34 jnemeth Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.154 2015/12/04 23:54:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.155 2015/12/05 07:59:34 jnemeth Exp $");
#include
#include
@@ -668,7 +668,8 @@ spec_open(void *v)
printf("ioctl DIOCGMEDIASIZE failed %d\n", error);
#endif
error = (*ioctl)(vp->v_rdev, DIOCGPART, , FREAD, curlwp);
- off = (off_t)pi.disklab->d_secsize * pi.part->p_size;
+ if (error == 0)
+ off = (off_t)pi.disklab->d_secsize * pi.part->p_size;
}
if (error == 0)
CVS commit: src/share/misc
Module Name:src
Committed By: jnemeth
Date: Thu Dec 3 03:28:47 UTC 2015
Modified Files:
src/share/misc: acronyms acronyms.comp
Log Message:
PR/50492 - Nikolai Lifanov -- add MBA
To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/share/misc/acronyms
cvs rdiff -u -r1.154 -r1.155 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.241 src/share/misc/acronyms:1.242
--- src/share/misc/acronyms:1.241 Sat Oct 10 22:51:05 2015
+++ src/share/misc/acronyms Thu Dec 3 03:28:47 2015
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.241 2015/10/10 22:51:05 dholland Exp $
+$NetBSD: acronyms,v 1.242 2015/12/03 03:28:47 jnemeth Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -311,6 +311,7 @@ LTNS long time no see
LWYL laugh with you later
M8 mate
MAD mutually assured destruction
+MBA master of business administration
MFW my face when
MIA missing in action
MMB message me back
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.154 src/share/misc/acronyms.comp:1.155
--- src/share/misc/acronyms.comp:1.154 Tue Oct 27 15:33:07 2015
+++ src/share/misc/acronyms.comp Thu Dec 3 03:28:47 2015
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.154 2015/10/27 15:33:07 jakllsch Exp $
+$NetBSD: acronyms.comp,v 1.155 2015/12/03 03:28:47 jnemeth Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -701,6 +701,7 @@ MAC medium access control
MAC message authentication {check,code}
MADT multiple APIC descriptor table
MB megabyte
+MBA multi-boot agent
MBR master boot record
MBS megabits per second
MC memory controller
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Wed Dec 2 10:19:58 UTC 2015
Modified Files:
src/sbin/gpt: gpt.c
Log Message:
- dereferencing NULL is generally bad, found by visual inspection
- automatically set nosync when opening a file to avoid spurious errors
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sbin/gpt/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.54 src/sbin/gpt/gpt.c:1.55
--- src/sbin/gpt/gpt.c:1.54 Wed Dec 2 04:17:25 2015
+++ src/sbin/gpt/gpt.c Wed Dec 2 10:19:58 2015
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.54 2015/12/02 04:17:25 christos Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.55 2015/12/02 10:19:58 jnemeth Exp $");
#endif
#include
@@ -467,7 +467,7 @@ gpt_open(const char *dev, int flags, int
if ((gpt = calloc(1, sizeof(*gpt))) == NULL) {
- if (!(gpt->flags & GPT_QUIET))
+ if (!(flags & GPT_QUIET))
warn("Cannot allocate `%s'", dev);
return NULL;
}
@@ -525,6 +525,7 @@ gpt_open(const char *dev, int flags, int
goto close;
}
gpt->mediasz = gpt->sb.st_size;
+ gpt->flags |= GPT_NOSYNC;
}
}
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Wed Dec 2 11:20:34 UTC 2015
Modified Files:
src/sbin/gpt: add.c
Log Message:
hrmm...
i386devel: {245} ./gpt add -b 1000 -s 1000 disk
Segmentation fault (core dumped)
Where's my flyswatter? ...zzzap
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sbin/gpt/add.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/add.c
diff -u src/sbin/gpt/add.c:1.36 src/sbin/gpt/add.c:1.37
--- src/sbin/gpt/add.c:1.36 Wed Dec 2 04:07:11 2015
+++ src/sbin/gpt/add.c Wed Dec 2 11:20:34 2015
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: add.c,v 1.36 2015/12/02 04:07:11 christos Exp $");
+__RCSID("$NetBSD: add.c,v 1.37 2015/12/02 11:20:34 jnemeth Exp $");
#endif
#include
@@ -158,7 +158,7 @@ cmd_add(gpt_t gpt, int argc, char *argv[
{
int ch;
- while ((ch = getopt(argc, argv, GPT_AIS "bl:t:")) != -1) {
+ while ((ch = getopt(argc, argv, GPT_AIS "b:l:t:")) != -1) {
switch(ch) {
case 'b':
if (gpt_human_get() == -1)
Re: CVS commit: src/sbin/gpt
On Nov 30, 9:03pm, "Christos Zoulas" wrote:
}
} This is a multi-part message in MIME format.
}
} --_--=_1448935435147560
} Content-Disposition: inline
} Content-Transfer-Encoding: 8bit
} Content-Type: text/plain; charset="US-ASCII"
}
} Module Name: src
} Committed By: christos
} Date: Tue Dec 1 02:03:55 UTC 2015
}
} Modified Files:
} src/sbin/gpt: add.c gpt.c resize.c
}
} Log Message:
} - use gpt_msg to print informational messages (perhaps these should be printed
} only with -v)
} - don't print any messages with gpt_msg if quiet
} - print a message if we didn't reconfigure the wedges
}
}
} To generate a diff of this commit:
} cvs rdiff -u -r1.29 -r1.30 src/sbin/gpt/add.c
} cvs rdiff -u -r1.47 -r1.48 src/sbin/gpt/gpt.c
} cvs rdiff -u -r1.13 -r1.14 src/sbin/gpt/resize.c
}
} Please note that diffs are not public domain; they are subject to the
} copyright notices on the relevant files.
}
}
} --_--=_1448935435147560
} Content-Disposition: inline
} Content-Length: 2767
} Content-Transfer-Encoding: binary
} Content-Type: text/x-diff; charset=us-ascii
}
} Modified files:
}
} Index: src/sbin/gpt/gpt.c
} diff -u src/sbin/gpt/gpt.c:1.47 src/sbin/gpt/gpt.c:1.48
} --- src/sbin/gpt/gpt.c:1.47 Mon Nov 30 20:49:23 2015
} +++ src/sbin/gpt/gpt.cMon Nov 30 21:03:55 2015
} @@ -573,15 +573,22 @@ void
} gpt_close(int fd)
} {
}
} - if (modified && !nosync) {
} + if (!modified)
} + goto out;
} +
} + if (!nosync) {
} #ifdef DIOCMWEDGES
} int bits;
} if (ioctl(fd, DIOCMWEDGES, ) == -1)
} warn("Can't update wedge information");
} + else
} + goto out;
} #endif
} }
} + gpt_msg("You need to run \"dkctl %s makewedges\""
} + " for the changes to take effect\n", device_name);
dkctl makewedges is just ioctl(DIOCMWEDGES), so if DIOCMWEDGES
doesn't exist or it fails, then dkctl makewedges won't do anything,
which means that the user would either need to use dkctl add, etc.,
or reboot.
}
} - /* XXX post processing? */
} +out:
} close(fd);
} }
}
} --_--=_1448935435147560--
}
}-- End of excerpt from "Christos Zoulas"
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sun Nov 29 13:24:28 UTC 2015
Modified Files:
src/sbin/gpt: gpt.c
Log Message:
fix build breakage for systems that do not have DIOCG{SECTOR,MEDIA}SIZE
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sbin/gpt/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.42 src/sbin/gpt/gpt.c:1.43
--- src/sbin/gpt/gpt.c:1.42 Sun Nov 29 00:14:46 2015
+++ src/sbin/gpt/gpt.c Sun Nov 29 13:24:28 2015
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.42 2015/11/29 00:14:46 christos Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.43 2015/11/29 13:24:28 jnemeth Exp $");
#endif
#include
@@ -486,34 +486,24 @@ gpt_open(const char *dev, int flags)
}
if ((sb.st_mode & S_IFMT) != S_IFREG) {
- if (secsz == 0) {
- if (ioctl(fd, DIOCGSECTORSIZE, ) == -1) {
-if (!quiet)
- warn("Cannot get sector size for `%s'",
- device_name);
-goto close;
- }
- if (secsz == 0) {
-if (!quiet)
- warnx("Sector size for `%s' can't be 0",
- device_name);
-goto close;
- }
- }
- if (mediasz == 0) {
- if (ioctl(fd, DIOCGMEDIASIZE, ) == -1) {
-if (!quiet)
- warn("Cannot get media size for `%s'",
- device_name);
-goto close;
- }
- if (mediasz == 0) {
-if (!quiet)
- warnx("Media size for `%s' can't be 0",
- device_name);
-goto close;
- }
+#ifdef DIOCGSECTORSIZE
+ if ((secsz == 0 && ioctl(fd, DIOCGSECTORSIZE, ) == -1) ||
+ (mediasz == 0 && ioctl(fd, DIOCGMEDIASIZE, ) == -1)) {
+ if (!quiet)
+warn("Cannot get sector/media size for `%s'",
+device_name);
+ goto close;
+ }
+#else
+ if (getdisksize(device_name, , ) == -1) {
+ if (!quiet)
+warn("Cannot get sector/media size for `%s'",
+device_name);
+ goto close;
}
+#endif
+ if (secsz == 0 || mediasz == 0)
+ errx(1, "Please specify sector/media size");
} else {
if (secsz == 0)
secsz = 512; /* Fixed size for files. */
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Mon Nov 16 12:24:13 UTC 2015
Modified Files:
src/sbin/gpt: header.c
Log Message:
correctly print the gpt header revision as a "float"
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/gpt/header.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/header.c
diff -u src/sbin/gpt/header.c:1.1 src/sbin/gpt/header.c:1.2
--- src/sbin/gpt/header.c:1.1 Tue Nov 3 02:19:24 2015
+++ src/sbin/gpt/header.c Mon Nov 16 12:24:13 2015
@@ -33,7 +33,7 @@
#include
#ifdef __RCSID
-__RCSID("$NetBSD: header.c,v 1.1 2015/11/03 02:19:24 jnemeth Exp $");
+__RCSID("$NetBSD: header.c,v 1.2 2015/11/16 12:24:13 jnemeth Exp $");
#endif
#include
@@ -62,6 +62,7 @@ usage_header(void)
static void
header(void)
{
+ unsigned int revision;
map_t *gpt;
struct gpt_hdr *hdr;
char buf[128];
@@ -103,7 +104,9 @@ header(void)
}
hdr = gpt->map_data;
- printf("- GPT Revision: %u\n", hdr->hdr_revision);
+ revision = le32toh(hdr->hdr_revision);
+ printf("- GPT Header Revision: %u.%u\n", revision >> 16,
+ revision & 0x);
printf("- First Data Sector: %llu\n",
(long long unsigned)hdr->hdr_lba_start);
#ifdef HN_AUTOSCALE
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Fri Nov 6 12:49:06 UTC 2015 Modified Files: src/usr.bin/calendar/calendars: calendar.history Log Message: typo To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.bin/calendar/calendars/calendar.history Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.history diff -u src/usr.bin/calendar/calendars/calendar.history:1.32 src/usr.bin/calendar/calendars/calendar.history:1.33 --- src/usr.bin/calendar/calendars/calendar.history:1.32 Tue Sep 8 11:07:37 2015 +++ src/usr.bin/calendar/calendars/calendar.history Fri Nov 6 12:49:06 2015 @@ -464,7 +464,7 @@ 11/03 Beef rises to 3 cents a pound, IL, 1837 11/03 Linus Pauling wins Nobel Chemistry Prize, 1954 11/03 Sputnik II launched, 1957, bearing spacedog Laika -11/04 Iranian militants seize US embassy personnel in Teheran, 1979 +11/04 Iranian militants seize US embassy personnel in Tehran, 1979 11/04 Soviet forces crush the anti-communist revolt in Hungary, 1956 11/05 Guy Fawkes' Plot, 1605 11/06 Anniversary of the October Socialist Revolution (2 days) in U.S.S.R.
CVS commit: src/sbin/gpt
_recover(int, char *[]);
Added files:
Index: src/sbin/gpt/header.c
diff -u /dev/null src/sbin/gpt/header.c:1.1
--- /dev/null Tue Nov 3 02:19:24 2015
+++ src/sbin/gpt/header.c Tue Nov 3 02:19:24 2015
@@ -0,0 +1,145 @@
+/*-
+ * Copyright (c) 2015 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by John Nemeth
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#include
+#ifdef __RCSID
+__RCSID("$NetBSD: header.c,v 1.1 2015/11/03 02:19:24 jnemeth Exp $");
+#endif
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "map.h"
+#include "gpt.h"
+
+const char headermsg[] = "header device ...";
+
+__dead static void
+usage_header(void)
+{
+
+ fprintf(stderr,
+ "usage: %s %s\n", getprogname(), headermsg);
+ exit(1);
+}
+
+static void
+header(void)
+{
+ map_t *gpt;
+ struct gpt_hdr *hdr;
+ char buf[128];
+#ifdef HN_AUTOSCALE
+ char human_num[5];
+#endif
+
+#ifdef HN_AUTOSCALE
+ if (humanize_number(human_num, 5, mediasz,
+ "", HN_AUTOSCALE, HN_NOSPACE|HN_B) < 0)
+ human_num[0] = '\0';
+ if (human_num[0] != '\0')
+ printf("Media Size: %llu (%s)\n", (long long unsigned)mediasz,
+ human_num);
+ else
+#endif
+ printf("Media Size: %llu\n", (long long unsigned)mediasz);
+
+ printf("Sector Size: %u\n", secsz);
+
+#ifdef HN_AUTOSCALE
+ if (humanize_number(human_num, 5, mediasz / secsz,
+ "", HN_AUTOSCALE, HN_NOSPACE|HN_B) < 0)
+ human_num[0] = '\0';
+ if (human_num[0] != '\0')
+ printf("Number of Sectors: %llu (%s)\n",
+ (long long unsigned)(mediasz / secsz), human_num);
+ else
+#endif
+ printf("Number of Sectors: %llu\n",
+ (long long unsigned)(mediasz / secsz));
+
+ printf("\nHeader Information:\n");
+
+ gpt = map_find(MAP_TYPE_PRI_GPT_HDR);
+ if (gpt == NULL) {
+ printf("- GPT Header not found\n");
+ return;
+ }
+
+ hdr = gpt->map_data;
+ printf("- GPT Revision: %u\n", hdr->hdr_revision);
+ printf("- First Data Sector: %llu\n",
+ (long long unsigned)hdr->hdr_lba_start);
+#ifdef HN_AUTOSCALE
+ if (humanize_number(human_num, 5, hdr->hdr_lba_end,
+ "", HN_AUTOSCALE, HN_NOSPACE|HN_B) < 0)
+ human_num[0] = '\0';
+ if (human_num[0] != '\0')
+ printf("- Last Data Sector: %llu (%s)\n",
+ (long long unsigned)hdr->hdr_lba_end, human_num);
+ else
+#endif
+ printf("- Last Data Sector: %llu\n",
+ (long long unsigned)hdr->hdr_lba_end);
+ gpt_uuid_snprintf(buf, sizeof(buf), "%d", hdr->hdr_guid);
+ printf("- Media GUID: %s\n", buf);
+ printf("- Number of GPT Entries: %u\n", hdr->hdr_entries);
+}
+
+int
+cmd_header(int argc, char *argv[])
+{
+ int fd;
+
+ if (argc == optind)
+ usage_header();
+
+ while (optind < argc) {
+ fd = gpt_open(argv[optind++]);
+ if (fd == -1) {
+ warn("unable to open device '%s'", device_name);
+ continue;
+ }
+ header();
+
+ gpt_close(fd);
+ }
+
+ return (0);
+}
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Fri Oct 9 00:09:52 UTC 2015 Modified Files: src/usr.bin/calendar/calendars: calendar.netbsd Log Message: note the release of NetBSD 7.0 To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/usr.bin/calendar/calendars/calendar.netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.netbsd diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.35 src/usr.bin/calendar/calendars/calendar.netbsd:1.36 --- src/usr.bin/calendar/calendars/calendar.netbsd:1.35 Mon Sep 7 12:29:19 2015 +++ src/usr.bin/calendar/calendars/calendar.netbsd Fri Oct 9 00:09:52 2015 @@ -81,6 +81,7 @@ 09/22 NetBSD 6.0.6 released, 2014 09/22 NetBSD 6.1.5 released, 2014 09/25 NetBSD/hpcmips port started, 1999 +09/25 NetBSD 7.0 released, 2015 09/28 NetBSD 5.1.3 released, 2013 09/28 NetBSD 5.2.1 released, 2013 09/29 NetBSD/mac68k port started, 1993
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Wed Sep 23 05:21:00 UTC 2015 Modified Files: src/usr.bin/calendar/calendars: calendar.christian calendar.holiday calendar.judaic calendar.usholiday Log Message: Adjust dates for floating holidays. Use 2015 for things happening from mid-October onwards, and 2016 for things happening earlier. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/calendar/calendars/calendar.christian \ src/usr.bin/calendar/calendars/calendar.judaic cvs rdiff -u -r1.24 -r1.25 src/usr.bin/calendar/calendars/calendar.holiday cvs rdiff -u -r1.5 -r1.6 src/usr.bin/calendar/calendars/calendar.usholiday Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.christian diff -u src/usr.bin/calendar/calendars/calendar.christian:1.4 src/usr.bin/calendar/calendars/calendar.christian:1.5 --- src/usr.bin/calendar/calendars/calendar.christian:1.4 Sat May 5 01:29:56 2012 +++ src/usr.bin/calendar/calendars/calendar.christian Wed Sep 23 05:21:00 2015 @@ -1,17 +1,17 @@ -01/18* Epiphany -02/12* Shrove Tuesday / Mardi Gras (day before Ash Wednesday) -02/13* Ash Wednesday (First day of Lent) -03/24* Palm Sunday (7 days before Easter) -03/28* Maundy Thursday (3 days before Easter) -03/29* Good Friday (2 days before Easter) -03/31* Easter Sunday -05/05* Rogation Sunday -05/09* Ascension Day (10 days before Pentecost) -05/19* Pentecost (Whitsunday) -05/20* Whitmonday -05/26* Trinity Sunday (7 days after Pentecost) -05/30* Corpus Christi (11 days after Pentecost) +01/06* Epiphany +02/09* Shrove Tuesday / Mardi Gras (day before Ash Wednesday) +02/10* Ash Wednesday (First day of Lent) +03/20* Palm Sunday (7 days before Easter) +03/24* Maundy Thursday (3 days before Easter) +03/25* Good Friday (2 days before Easter) +03/27* Easter Sunday +05/01* Rogation Sunday +05/05* Ascension Day (10 days before Pentecost) +05/15* Pentecost (Whitsunday) +05/16* Whitmonday +05/22* Trinity Sunday (7 days after Pentecost) +05/26* Corpus Christi (11 days after Pentecost) 10/18 Feast Day of St. Luke -12/01* First Sunday of Advent (4th Sunday before Christmas) +11/29* First Sunday of Advent (4th Sunday before Christmas) 12/06 St. Nicholas' Day 12/25 Feast of the Nativity (Christmas) Index: src/usr.bin/calendar/calendars/calendar.judaic diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.4 src/usr.bin/calendar/calendars/calendar.judaic:1.5 --- src/usr.bin/calendar/calendars/calendar.judaic:1.4 Sat May 5 01:29:56 2012 +++ src/usr.bin/calendar/calendars/calendar.judaic Wed Sep 23 05:21:00 2015 @@ -1,27 +1,27 @@ -01/26* Tu B'Shvat (Feast of Trees) -02/22* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) -02/23* Purim (Feast of Lots; 30 days before Pesach) -03/25* Pesach (First Day of Passover; sabbatical) -03/26* Pesach (sabbatical) -03/27* Pesach (sabbatical) -03/28* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) -04/16* Yom HaAtzma'ut (Israel Independence Day) -05/12* Lag B'Omer (Commemoration of the Great Rebellion) -05/22* Yom Yerushalayim (Reunification of Jerusalem) -05/29* Shavuos (Festival of Weeks; 50 days after Pesach; sabbatical) -07/09* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; +01/25* Tu B'Shvat (Feast of Trees) +03/23* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) +03/24* Purim (Feast of Lots; 30 days before Pesach) +04/23* Pesach (First Day of Passover; sabbatical) +04/24* Pesach (sabbatical) +04/25* Pesach (sabbatical) +04/26* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) +05/12* Yom HaAtzma'ut (Israel Independence Day) +05/26* Lag B'Omer (Commemoration of the Great Rebellion) +06/04* Yom Yerushalayim (Reunification of Jerusalem) +06/12* Shavuos (Festival of Weeks; 50 days after Pesach; sabbatical) +07/24* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; fast day) -07/30* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) -09/19* First Day of Rosh Hashanah (Jewish Lunar New Year; 5767 == 2006; +08/14* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) +10/03* First Day of Rosh Hashanah (Jewish Lunar New Year; 5767 == 2006; sabbatical) -09/04* Rosh Hashanah (sabbatical) -09/05* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day +10/03* Rosh Hashanah (sabbatical) +10/04* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day after Rosh Hashanah; fast day) -09/13* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; +10/12* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; sabbatical, fast day) -09/28* Succos (Festival of Tabernacles; 14 days after Rosh Hashanah; +10/17* Succos (Festival of Tabernacles; 14 days after Rosh Hashanah; sabbatical) -10/04* Hoshanah Rabba (7th day of Succos) -10/15* Shmini Atzeres (8th Day of Gathering; 1 day
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Tue Sep 8 11:07:38 UTC 2015 Modified Files: src/usr.bin/calendar/calendars: calendar.history Log Message: Pretty difficult for a TV show (Star Trek) to have a first airing on two different dates. Dump the erroneous one. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/usr.bin/calendar/calendars/calendar.history Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.history diff -u src/usr.bin/calendar/calendars/calendar.history:1.31 src/usr.bin/calendar/calendars/calendar.history:1.32 --- src/usr.bin/calendar/calendars/calendar.history:1.31 Tue Sep 1 00:56:17 2015 +++ src/usr.bin/calendar/calendars/calendar.history Tue Sep 8 11:07:37 2015 @@ -374,7 +374,6 @@ 09/02 Japan signs unconditional surrender on US battleship `Missouri', 1945 09/05 The first Continental Congress was convened in Philadelphia, 1774 09/06 149 Pilgrims set forth from England aboard the Mayflower, 1620 -09/06 First Star Trek episode (The Man Trap) aired 1966 09/06 Pres. McKinley shot, 1901 09/08 "Star Trek" debuts on NBC (1966) 09/08 Jack the Ripper kills again, Annie Chapman is second victim, 1888
CVS commit: src/lib/libc/gen
Module Name:src Committed By: jnemeth Date: Thu Sep 3 04:05:38 UTC 2015 Modified Files: src/lib/libc/gen: gethostname.3 Log Message: PR/49641 - Henning Petersen -- wordo To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/lib/libc/gen/gethostname.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/gethostname.3 diff -u src/lib/libc/gen/gethostname.3:1.17 src/lib/libc/gen/gethostname.3:1.18 --- src/lib/libc/gen/gethostname.3:1.17 Tue Feb 7 18:59:56 2006 +++ src/lib/libc/gen/gethostname.3 Thu Sep 3 04:05:38 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: gethostname.3,v 1.17 2006/02/07 18:59:56 wiz Exp $ +.\" $NetBSD: gethostname.3,v 1.18 2015/09/03 04:05:38 jnemeth Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)gethostname.3 8.1 (Berkeley) 6/4/93 .\" -.Dd October 14, 2005 +.Dd September 2, 2015 .Dt GETHOSTNAME 3 .Os .Sh NAME @@ -46,7 +46,7 @@ .Fn sethostname "const char *name" "size_t namelen" .Sh DESCRIPTION .Fn gethostname -returns the standard host name for the current processor, as +returns the standard host name for the current machine, as previously set by .Fn sethostname . The parameter
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Tue Sep 1 00:56:17 UTC 2015 Modified Files: src/usr.bin/calendar/calendars: calendar.history Log Message: If we're going to note the USSR shooting down civilian airliners, we should be fair and pick on the USA as well. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.bin/calendar/calendars/calendar.history Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.history diff -u src/usr.bin/calendar/calendars/calendar.history:1.30 src/usr.bin/calendar/calendars/calendar.history:1.31 --- src/usr.bin/calendar/calendars/calendar.history:1.30 Thu Dec 5 22:06:13 2013 +++ src/usr.bin/calendar/calendars/calendar.history Tue Sep 1 00:56:17 2015 @@ -294,6 +294,7 @@ 06/30 China and Soviet Union announce split over ideology, 1960 07/01 Battle of Gettysburg begins, 1863 +07/03 290 people killed after Iran Airlines A300 shot down by USA, 1988 07/04 Battles of Vicksburg and Gettysburg won by Union forces, 1863 07/04 Cloudy, 76 degrees, Philadelphia PA, 1776 07/04 New York abstains on Declaration of Independence vote, 1776
CVS commit: src/sbin/iscsictl
Module Name:src Committed By: jnemeth Date: Sun Aug 30 10:49:57 UTC 2015 Modified Files: src/sbin/iscsictl: iscsictl.8 Log Message: update client OS version as well To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sbin/iscsictl/iscsictl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/iscsictl/iscsictl.8 diff -u src/sbin/iscsictl/iscsictl.8:1.8 src/sbin/iscsictl/iscsictl.8:1.9 --- src/sbin/iscsictl/iscsictl.8:1.8 Sun Aug 30 10:46:52 2015 +++ src/sbin/iscsictl/iscsictl.8 Sun Aug 30 10:49:57 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: iscsictl.8,v 1.8 2015/08/30 10:46:52 jnemeth Exp $ +.\ $NetBSD: iscsictl.8,v 1.9 2015/08/30 10:49:57 jnemeth Exp $ .\ .\ Copyright (c) 2011 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -260,7 +260,7 @@ can be specified as well as an is intended to be used as follows: .Pp The initiator itself can be loaded as a kernel module, and works successfully -on 2.0 (the host called burner), running against the +on 5.0 (the host called burner), running against the .Nx target on a 5.99 host. .Pp
CVS commit: src/sbin/iscsictl
Module Name:src Committed By: jnemeth Date: Sun Aug 30 10:46:53 UTC 2015 Modified Files: src/sbin/iscsictl: iscsictl.8 Log Message: PR/49616 - Andreas Gustafsson -- bring modload example into era of MODULAR To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sbin/iscsictl/iscsictl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/iscsictl/iscsictl.8 diff -u src/sbin/iscsictl/iscsictl.8:1.7 src/sbin/iscsictl/iscsictl.8:1.8 --- src/sbin/iscsictl/iscsictl.8:1.7 Tue Mar 18 18:20:38 2014 +++ src/sbin/iscsictl/iscsictl.8 Sun Aug 30 10:46:52 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: iscsictl.8,v 1.7 2014/03/18 18:20:38 riastradh Exp $ +.\ $NetBSD: iscsictl.8,v 1.8 2015/08/30 10:46:52 jnemeth Exp $ .\ .\ Copyright (c) 2011 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -23,7 +23,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 26, 2012 +.Dd August 30, 2015 .Dt ISCSICTL 8 .Os .Sh NAME @@ -265,9 +265,10 @@ on 2.0 (the host called burner), runni target on a 5.99 host. .Pp .Bd -literal -burner# modload -v -s -p /usr/lkm/iscsi_post.sh /usr/lkm/iscsidrv.o -modload: reserving 36864 bytes of memory -Module loaded as ID 0 +burner# modload iscsi +burner# modstat iscsi +NAME CLASS SOURCE REFS ADDRESS SIZE REQUIRES +iscsidriver filesys0 813c6000 44208- burner# iscsid iSCSI Daemon loaded burner# iscsictl add_send_target -a 172.16.135.133
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: jnemeth Date: Fri Aug 21 12:02:07 UTC 2015 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: PR/50158 - Simon Burge -- postinstall does not know about blacklistd To generate a diff of this commit: cvs rdiff -u -r1.199 -r1.200 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.199 src/usr.sbin/postinstall/postinstall:1.200 --- src/usr.sbin/postinstall/postinstall:1.199 Sat Aug 15 09:33:55 2015 +++ src/usr.sbin/postinstall/postinstall Fri Aug 21 12:02:07 2015 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.199 2015/08/15 09:33:55 uebayasi Exp $ +# $NetBSD: postinstall,v 1.200 2015/08/21 12:02:07 jnemeth Exp $ # # Copyright (c) 2002-2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -1336,6 +1336,7 @@ accounting altqd amd apmd +blacklistd bluetooth bootconf.sh bootparams
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Fri Aug 21 02:32:25 UTC 2015 Modified Files: src/usr.bin/calendar/calendars: calendar.netbsd Log Message: - sort - add a bunch of missing release To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.bin/calendar/calendars/calendar.netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.netbsd diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.32 src/usr.bin/calendar/calendars/calendar.netbsd:1.33 --- src/usr.bin/calendar/calendars/calendar.netbsd:1.32 Fri May 30 19:01:52 2014 +++ src/usr.bin/calendar/calendars/calendar.netbsd Fri Aug 21 02:32:24 2015 @@ -15,6 +15,7 @@ 02/13 NetBSD/alpha port started, 1995 02/18 NetBSD/newsmips port started, 1998 02/20 NetBSD/hpcarm port started, 2001 +02/24 NetBSD/hp700 port renamed NetBSD/hppa, 2014 02/27 NetBSD/mvmeppc, port started, 2002 02/29 NetBSD/prep port started, 2000 03/01 NetBSD 1.6.2 released, 2004 @@ -76,6 +77,8 @@ 09/09 NetBSD/pc532 port started, 1993 09/13 NetBSD 1.5.2 released, 2001 09/14 NetBSD 1.6 released, 2002 +09/22 NetBSD 6.0.6 released, 2014 +09/22 NetBSD 6.1.5 released, 2014 09/25 NetBSD/hpcmips port started, 1999 09/28 NetBSD 5.1.3 released, 2013 09/28 NetBSD 5.2.1 released, 2013 @@ -97,6 +100,8 @@ 11/02 NetBSD 2.1 released, 2005 11/04 NetBSD 3.0.2 released, 2006 11/04 NetBSD 3.1 released, 2006 +11/15 NetBSD 5.1.5 released, 2014 +11/15 NetBSD 5.2.3 released, 2014 11/17 pkgsrc/FreeBSD support added, 2002 11/18 NetBSD/acorn32 port started, 2001 11/19 NetBSD 5.1 released, 2010 @@ -107,6 +112,7 @@ 12/02 pkgsrc/IRIX support added, 2002 12/03 pkgsrc/AIX support added, 2003 12/03 pkgsrc/BSDI support added, 2003 +12/03 NetBSD 5.2 released, 2012 12/06 NetBSD 1.5 released, 2000 12/09 NetBSD 2.0 released, 2004 12/09 NetBSD/news68k port started, 1999 @@ -115,5 +121,5 @@ 12/19 NetBSD 4.0 released, 2007 12/23 NetBSD 1.3.3 released, 1998 12/23 NetBSD 3.0 released, 2005 +12/26 NetBSD 6.0.1 released, 2012 12/29 NetBSD/ews4800mips port started, 2005 -02/24 NetBSD/hp700 port renamed NetBSD/hppa, 2014
CVS commit: src/usr.sbin/mountd
Module Name:src Committed By: jnemeth Date: Wed Aug 5 23:23:47 UTC 2015 Modified Files: src/usr.sbin/mountd: mountd.c Log Message: PR/50125 - Jarle Greipsland -- Incorrect PID in /var/run/mountd.pid Move call to pidfile() after daemon() so that correct (child) pid is written to pidfile. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/usr.sbin/mountd/mountd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/mountd/mountd.c diff -u src/usr.sbin/mountd/mountd.c:1.126 src/usr.sbin/mountd/mountd.c:1.127 --- src/usr.sbin/mountd/mountd.c:1.126 Fri Apr 4 12:45:59 2014 +++ src/usr.sbin/mountd/mountd.c Wed Aug 5 23:23:47 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mountd.c,v 1.126 2014/04/04 12:45:59 gson Exp $ */ +/* $NetBSD: mountd.c,v 1.127 2015/08/05 23:23:47 jnemeth Exp $ */ /* * Copyright (c) 1989, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1989, 19 #if 0 static char sccsid[] = @(#)mountd.c 8.15 (Berkeley) 5/1/95; #else -__RCSID($NetBSD: mountd.c,v 1.126 2014/04/04 12:45:59 gson Exp $); +__RCSID($NetBSD: mountd.c,v 1.127 2015/08/05 23:23:47 jnemeth Exp $); #endif #endif/* not lint */ @@ -336,7 +336,6 @@ main(int argc, char **argv) (void)fprintf(stderr, Here we go.\n); (void)signal(SIGHUP, get_exportlist); (void)signal(SIGTERM, send_umntall); - pidfile(NULL); rpcb_unset(RPCPROG_MNT, RPCMNT_VER1, NULL); rpcb_unset(RPCPROG_MNT, RPCMNT_VER3, NULL); @@ -463,6 +462,7 @@ main(int argc, char **argv) (void)signal(SIGINT, SIG_IGN); (void)signal(SIGQUIT, SIG_IGN); } + pidfile(NULL); svc_run(); syslog(LOG_ERR, Mountd died); exit(1);
CVS commit: src/share/man/man7
Module Name:src Committed By: jnemeth Date: Thu Jul 30 03:21:33 UTC 2015 Modified Files: src/share/man/man7: tests.atf.7 tests.kyua.7 Log Message: typo from Timo Buhrmester To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man7/tests.atf.7 \ src/share/man/man7/tests.kyua.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/tests.atf.7 diff -u src/share/man/man7/tests.atf.7:1.6 src/share/man/man7/tests.atf.7:1.7 --- src/share/man/man7/tests.atf.7:1.6 Sun Jul 13 09:32:05 2014 +++ src/share/man/man7/tests.atf.7 Thu Jul 30 03:21:33 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: tests.atf.7,v 1.6 2014/07/13 09:32:05 mbalmer Exp $ +.\ $NetBSD: tests.atf.7,v 1.7 2015/07/30 03:21:33 jnemeth Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -25,7 +25,7 @@ .\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd July 13, 2014 +.Dd July 29, 2015 .Dt TESTS 7 .Os .Sh NAME @@ -147,7 +147,7 @@ debugging failing tests. Tests can be invoked as an unprivileged user, in which case tests that require privileges will be skipped. If run as root, an unprivileged user will be used for tests that -require privileges. +do not require privileges. For maximal coverage, the standard approach is to invoke tests as root. .Pp Ideally, tests are self-contained and do not either depend on or Index: src/share/man/man7/tests.kyua.7 diff -u src/share/man/man7/tests.kyua.7:1.6 src/share/man/man7/tests.kyua.7:1.7 --- src/share/man/man7/tests.kyua.7:1.6 Mon Oct 27 11:55:08 2014 +++ src/share/man/man7/tests.kyua.7 Thu Jul 30 03:21:33 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: tests.kyua.7,v 1.6 2014/10/27 11:55:08 christos Exp $ +.\ $NetBSD: tests.kyua.7,v 1.7 2015/07/30 03:21:33 jnemeth Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -25,7 +25,7 @@ .\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 27, 2014 +.Dd July 29, 2015 .Dt TESTS 7 .Os .Sh NAME @@ -142,7 +142,7 @@ to its manual page Tests can be invoked as an unprivileged user, in which case tests that require privileges will be skipped. If run as root, an unprivileged user will be used for tests that -require privileges. +do not require privileges. For maximal coverage, the standard approach is to invoke tests as root. .Pp Ideally, tests are self-contained and do not either depend on or
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: jnemeth
Date: Wed Jul 8 05:00:15 UTC 2015
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Check for an out of date /etc/fonts/fonts.conf and if so, forcibly
update it (it is not intended to be user editable). This is
primarily intended so that pkgsrc fonts installed in the new location
can be found.
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.196 src/usr.sbin/postinstall/postinstall:1.197
--- src/usr.sbin/postinstall/postinstall:1.196 Thu Jul 2 09:53:12 2015
+++ src/usr.sbin/postinstall/postinstall Wed Jul 8 05:00:15 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.196 2015/07/02 09:53:12 martin Exp $
+# $NetBSD: postinstall,v 1.197 2015/07/08 05:00:15 jnemeth Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -991,7 +991,17 @@ do_fontconfig()
80-delicious.conf \
90-synthetic.conf
failed=$(( ${failed} + $? ))
+
+ if ! $SOURCEMODE; then
+ FONTS_DIR=${SRC_DIR}/etc/fonts
+ else
+ FONTS_DIR=${SRC_DIR}/external/mit/xorg/lib/fontconfig/etc
+ fi
+ populate_dir $op false ${FONTS_DIR} ${DEST_DIR}/etc/fonts 444 \
+ fonts.conf
+ failed=$(( ${failed} + $? ))
+
# We can't modify conf.d easily; someone might have removed a file.
conf_d_failed=0
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Thu Jun 18 01:37:23 UTC 2015
Modified Files:
src/sbin/gpt: recover.c
Log Message:
Instruct user to use resizedisk if media size has changed, as
resizedisk will adjust the media size in the headers, whereas
recover simply copies the existing header over the missing one.
XXX recover and resizedisk should probably be merged (even if just
partially, so that recover can properly handle media size changes).
Also, reading in the GPT should probably be centralised so that
error handling can be centralised, and users aren't given misleading
messages (i.e. they aren't told to run recover when they should be
running resizedisk). However, something that can be quickly pulled
up to netbsd-7 was needed, and there isn't time for a major overhaul
or rewrite.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sbin/gpt/recover.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/recover.c
diff -u src/sbin/gpt/recover.c:1.5 src/sbin/gpt/recover.c:1.6
--- src/sbin/gpt/recover.c:1.5 Mon Sep 29 20:28:57 2014
+++ src/sbin/gpt/recover.c Thu Jun 18 01:37:23 2015
@@ -33,7 +33,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/recover.c,v 1.8 2005/08/31 01:47:19 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: recover.c,v 1.5 2014/09/29 20:28:57 christos Exp $);
+__RCSID($NetBSD: recover.c,v 1.6 2015/06/18 01:37:23 jnemeth Exp $);
#endif
#include sys/types.h
@@ -64,7 +64,7 @@ usage_recover(void)
static void
recover(int fd)
{
- off_t last;
+ uint64_t last;
map_t *gpt, *tpg;
map_t *tbl, *lbt;
struct gpt_hdr *hdr;
@@ -92,6 +92,13 @@ recover(int fd)
last = mediasz / secsz - 1LL;
+ if (gpt != NULL
+ ((struct gpt_hdr *)(gpt-map_data))-hdr_lba_alt != last) {
+ warnx(%s: media size has changed, please use 'gpt resizedisk',
+ device_name);
+ return;
+ }
+
if (tbl != NULL lbt == NULL) {
lbt = map_add(last - tbl-map_size, tbl-map_size,
MAP_TYPE_SEC_GPT_TBL, tbl-map_data);
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Wed Mar 11 17:35:16 UTC 2015 Modified Files: src/usr.bin/calendar/calendars: calendar.birthday Log Message: note birth and death of Douglas Adams To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.bin/calendar/calendars/calendar.birthday Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.birthday diff -u src/usr.bin/calendar/calendars/calendar.birthday:1.24 src/usr.bin/calendar/calendars/calendar.birthday:1.25 --- src/usr.bin/calendar/calendars/calendar.birthday:1.24 Sun Apr 14 08:03:15 2013 +++ src/usr.bin/calendar/calendars/calendar.birthday Wed Mar 11 17:35:16 2015 @@ -76,6 +76,7 @@ 03/08 Howard Aiken born, 1900 03/11 Robert Treat Paine born, 1737 03/11 Vannevar Bush born, 1890 +03/11 Douglas Adams born, 1952 03/12 Gustav Robert Kirchhoff born, 1824, physicist 03/14 Albert Einstein born, 1879 03/14 Casey Jones born, 1864 @@ -122,6 +123,7 @@ 05/09 Pinza died, 1957 05/10 Fred Astaire (Frederick Austerlitz) born in Omaha, Nebraska, 1899 05/11 Johnny Appleseed born, 1768 +05/11 Douglas Adams died, 2001 05/12 Florence Nightingale born in Florence, Italy, 1820 05/13 Arthur S. Sullivan born, 1842 05/15 Mike Oldfield born in Essex, England, 1953
CVS commit: src/sys/dev
Module Name:src Committed By: jnemeth Date: Tue Dec 30 12:42:16 UTC 2014 Modified Files: src/sys/dev: ccd.c Log Message: Slowly bring this thing kicking and screaming into the 21st century: - use struct disk_geom - add wedge support To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 src/sys/dev/ccd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ccd.c diff -u src/sys/dev/ccd.c:1.155 src/sys/dev/ccd.c:1.156 --- src/sys/dev/ccd.c:1.155 Tue Dec 30 02:21:10 2014 +++ src/sys/dev/ccd.c Tue Dec 30 12:42:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ccd.c,v 1.155 2014/12/30 02:21:10 christos Exp $ */ +/* $NetBSD: ccd.c,v 1.156 2014/12/30 12:42:16 jnemeth Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.155 2014/12/30 02:21:10 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.156 2014/12/30 12:42:16 jnemeth Exp $); #if defined(_KERNEL_OPT) #include opt_compat_netbsd.h @@ -305,6 +305,7 @@ ccdinit(struct ccd_softc *cs, char **cpa int error, path_alloced; uint64_t psize, minsize; unsigned secsize, maxsecsize; + struct disk_geom *dg; #ifdef DEBUG if (ccddebug (CCDB_FOLLOW|CCDB_INIT)) @@ -430,6 +431,14 @@ ccdinit(struct ccd_softc *cs, char **cpa ccg-ccg_ntracks = 1; ccg-ccg_nsectors = 1024 * (1024 / ccg-ccg_secsize); ccg-ccg_ncylinders = cs-sc_size / ccg-ccg_nsectors; + +dg = cs-sc_dkdev.dk_geom; +memset(dg, 0, sizeof(*dg)); +dg-dg_secperunit = cs-sc_size; +dg-dg_secsize = ccg-ccg_secsize; +dg-dg_nsectors = ccg-ccg_nsectors; +dg-dg_ntracks = ccg-ccg_ntracks; +dg-dg_ncylinders = ccg-ccg_ncylinders; if (cs-sc_ileave 0) aprint_normal(%s: Interleaving %d component%s @@ -1243,6 +1252,8 @@ ccdioctl(dev_t dev, u_long cmd, void *da bufq_free(cs-sc_bufq); goto out; } + disk_set_info(NULL, cs-sc_dkdev, NULL); + dkwedge_discover(cs-sc_dkdev); /* We can free the temporary variables now. */ kmem_free(vpp, ccio-ccio_ndisks * sizeof(*vpp)); @@ -1326,6 +1337,7 @@ ccdioctl(dev_t dev, u_long cmd, void *da aprint_normal(%s: detached\n, cs-sc_xname); /* Detach the disk. */ + dkwedge_delall(cs-sc_dkdev); disk_detach(cs-sc_dkdev); bufq_free(cs-sc_bufq); ccdput(cs);
CVS commit: src/games/monop
Module Name:src
Committed By: jnemeth
Date: Mon Dec 29 10:27:03 UTC 2014
Modified Files:
src/games/monop: cards.c
Log Message:
PR/49513 - Henning Petersen -- tyop
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/games/monop/cards.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/monop/cards.c
diff -u src/games/monop/cards.c:1.25 src/games/monop/cards.c:1.26
--- src/games/monop/cards.c:1.25 Tue Jun 19 05:35:32 2012
+++ src/games/monop/cards.c Mon Dec 29 10:27:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cards.c,v 1.25 2012/06/19 05:35:32 dholland Exp $ */
+/* $NetBSD: cards.c,v 1.26 2014/12/29 10:27:03 jnemeth Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)cards.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: cards.c,v 1.25 2012/06/19 05:35:32 dholland Exp $);
+__RCSID($NetBSD: cards.c,v 1.26 2014/12/29 10:27:03 jnemeth Exp $);
#endif
#endif /* not lint */
@@ -132,7 +132,7 @@ static const struct cardinfo ch_cards[]
{ MU,
Advance to the nearest Utility.\n
If unowned, you may buy it from the bank.\n
- If owned, throw dice and pay oner a total of ten times\n
+ If owned, throw dice and pay onwer a total of ten times\n
the amount thrown.\n
},
{ MB3,
CVS commit: src/games/monop
Module Name:src
Committed By: jnemeth
Date: Mon Dec 29 10:38:52 UTC 2014
Modified Files:
src/games/monop: cards.c
Log Message:
PR/49513 - Henning Petersen -- tyop
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/games/monop/cards.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/monop/cards.c
diff -u src/games/monop/cards.c:1.26 src/games/monop/cards.c:1.27
--- src/games/monop/cards.c:1.26 Mon Dec 29 10:27:03 2014
+++ src/games/monop/cards.c Mon Dec 29 10:38:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cards.c,v 1.26 2014/12/29 10:27:03 jnemeth Exp $ */
+/* $NetBSD: cards.c,v 1.27 2014/12/29 10:38:52 jnemeth Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)cards.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: cards.c,v 1.26 2014/12/29 10:27:03 jnemeth Exp $);
+__RCSID($NetBSD: cards.c,v 1.27 2014/12/29 10:38:52 jnemeth Exp $);
#endif
#endif /* not lint */
@@ -132,7 +132,7 @@ static const struct cardinfo ch_cards[]
{ MU,
Advance to the nearest Utility.\n
If unowned, you may buy it from the bank.\n
- If owned, throw dice and pay onwer a total of ten times\n
+ If owned, throw dice and pay owner a total of ten times\n
the amount thrown.\n
},
{ MB3,
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jnemeth Date: Wed Dec 17 10:02:01 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: PR/49484 - Sprow -- some additional SMSC devices To generate a diff of this commit: cvs rdiff -u -r1.686 -r1.687 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.686 src/sys/dev/usb/usbdevs:1.687 --- src/sys/dev/usb/usbdevs:1.686 Fri Dec 12 07:21:05 2014 +++ src/sys/dev/usb/usbdevs Wed Dec 17 10:02:01 2014 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.686 2014/12/12 07:21:05 msaitoh Exp $ +$NetBSD: usbdevs,v 1.687 2014/12/17 10:02:01 jnemeth Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2981,10 +2981,14 @@ product SMK MCE_IR 0x031d eHome Infrare /* SMSC products */ product SMSC 2020HUB 0x2020 USB Hub +product SMSC 2512HUB 0x2512 USB 2.0 2-Port Hub +product SMSC 2513HUB 0x2513 USB 2.0 3-Port Hub +product SMSC 2514HUB 0x2514 USB 2.0 4-Port Hub product SMSC LAN7500 0x7500 LAN7500 USB 2.0 gigabit ethernet device product SMSC SMSC9500 0x9500 SMSC9500 Ethernet device product SMSC SMSC9505 0x9505 SMSC9505 Ethernet device -product SMSC SMSC9512 0x9512 SMSC9512 USB Hub +product SMSC SMSC9512 0x9512 SMSC9512 USB Hub Ethernet device +product SMSC SMSC9514 0x9514 SMSC9514 USB Hub Ethernet device product SMSC LAN9530 0x9530 LAN9530 Ethernet Device product SMSC LAN9730 0x9730 LAN9730 Ethernet Device product SMSC SMSC9500_SAL10 0x9900 SMSC9500 Ethernet device (SAL10)
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jnemeth
Date: Wed Dec 17 10:02:46 UTC 2014
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.678 -r1.679 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.679 -r1.680 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.678 src/sys/dev/usb/usbdevs.h:1.679
--- src/sys/dev/usb/usbdevs.h:1.678 Fri Dec 12 07:21:28 2014
+++ src/sys/dev/usb/usbdevs.h Wed Dec 17 10:02:46 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.678 2014/12/12 07:21:28 msaitoh Exp $ */
+/* $NetBSD: usbdevs.h,v 1.679 2014/12/17 10:02:46 jnemeth Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.686 2014/12/12 07:21:05 msaitoh Exp
+ * NetBSD: usbdevs,v 1.687 2014/12/17 10:02:01 jnemeth Exp
*/
/*
@@ -2988,10 +2988,14 @@
/* SMSC products */
#define USB_PRODUCT_SMSC_2020HUB 0x2020 /* USB Hub */
+#define USB_PRODUCT_SMSC_2512HUB 0x2512 /* USB 2.0 2-Port Hub */
+#define USB_PRODUCT_SMSC_2513HUB 0x2513 /* USB 2.0 3-Port Hub */
+#define USB_PRODUCT_SMSC_2514HUB 0x2514 /* USB 2.0 4-Port Hub */
#define USB_PRODUCT_SMSC_LAN7500 0x7500 /* LAN7500 USB 2.0 gigabit ethernet device */
#define USB_PRODUCT_SMSC_SMSC9500 0x9500 /* SMSC9500 Ethernet device */
#define USB_PRODUCT_SMSC_SMSC9505 0x9505 /* SMSC9505 Ethernet device */
-#define USB_PRODUCT_SMSC_SMSC9512 0x9512 /* SMSC9512 USB Hub */
+#define USB_PRODUCT_SMSC_SMSC9512 0x9512 /* SMSC9512 USB Hub Ethernet device */
+#define USB_PRODUCT_SMSC_SMSC9514 0x9514 /* SMSC9514 USB Hub Ethernet device */
#define USB_PRODUCT_SMSC_LAN9530 0x9530 /* LAN9530 Ethernet Device */
#define USB_PRODUCT_SMSC_LAN9730 0x9730 /* LAN9730 Ethernet Device */
#define USB_PRODUCT_SMSC_SMSC9500_SAL10 0x9900 /* SMSC9500 Ethernet device (SAL10) */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.679 src/sys/dev/usb/usbdevs_data.h:1.680
--- src/sys/dev/usb/usbdevs_data.h:1.679 Fri Dec 12 07:21:28 2014
+++ src/sys/dev/usb/usbdevs_data.h Wed Dec 17 10:02:46 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.679 2014/12/12 07:21:28 msaitoh Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.680 2014/12/17 10:02:46 jnemeth Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.686 2014/12/12 07:21:05 msaitoh Exp
+ * NetBSD: usbdevs,v 1.687 2014/12/17 10:02:01 jnemeth Exp
*/
/*
@@ -4060,102 +4060,110 @@ static const uint16_t usb_products[] = {
17212, 17218, 13276, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_2020HUB,
4656, 5602, 0,
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_2512HUB,
+ 4656, 5121, 17227, 5602, 0,
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_2513HUB,
+ 4656, 5121, 17234, 5602, 0,
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_2514HUB,
+ 4656, 5121, 17241, 5602, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN7500,
- 17227, 4656, 5121, 6348, 4939, 9777, 0,
+ 17248, 4656, 5121, 6348, 4939, 9777, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500,
- 17235, 4686, 9777, 0,
+ 17256, 4686, 9777, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505,
- 17244, 4686, 9777, 0,
+ 17265, 4686, 9777, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512,
- 17253, 4656, 5602, 0,
+ 17274, 4656, 5602, 3001, 4686, 9777, 0,
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9514,
+ 17283, 4656, 5602, 3001, 4686, 9777, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9530,
- 17262, 4686, 7456, 0,
+ 17292, 4686, 7456, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9730,
- 17270, 4686, 7456, 0,
+ 17300, 4686, 7456, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500_SAL10,
- 17235, 4686, 9777, 17278, 0,
+ 17256, 4686, 9777, 17308, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505_SAL10,
- 17244, 4686, 9777, 17278, 0,
+ 17265, 4686, 9777, 17308, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_SAL10,
- 17286, 4686, 9777, 17278, 0,
+ 17316, 4686, 9777, 17308, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A_SAL10,
- 17296, 4686, 9777, 17278, 0,
+ 17326, 4686, 9777, 17308, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14_SAL10,
- 17306, 5602, 3001, 4686, 7456, 17278, 0,
+ 17336, 5602, 3001, 4686, 7456, 17308, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_HAL,
- 17286, 4686, 7456, 17318, 0,
+ 17316, 4686, 7456, 17348, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A_HAL,
- 17296, 4686, 7456, 17318, 0,
+ 17326, 4686, 7456, 17348, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500_ALT,
- 17235, 4686, 7456, 0,
+ 17256, 4686, 7456, 0,
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_ALT,
- 17286, 4686, 7456, 0,
+
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: jnemeth
Date: Tue Dec 16 05:30:40 UTC 2014
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
add powerpc variants to the list of potentially obsolete modules to check
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.186 src/usr.sbin/postinstall/postinstall:1.187
--- src/usr.sbin/postinstall/postinstall:1.186 Sat Dec 13 02:35:02 2014
+++ src/usr.sbin/postinstall/postinstall Tue Dec 16 05:30:40 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.186 2014/12/13 02:35:02 uebayasi Exp $
+# $NetBSD: postinstall,v 1.187 2014/12/16 05:30:40 jnemeth Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2142,6 +2142,8 @@ do_obsolete_stand()
for dir in \
/stand/${MACHINE} \
+ /stand/${MACHINE}-4xx \
+ /stand/${MACHINE}-booke \
/stand/${MACHINE}-xen \
/stand/${MACHINE}pae-xen
do
CVS commit: src/doc
Module Name:src Committed By: jnemeth Date: Sun Dec 7 10:05:21 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: LVM2 is up to 2.02.114 To generate a diff of this commit: cvs rdiff -u -r1.1178 -r1.1179 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1178 src/doc/3RDPARTY:1.1179 --- src/doc/3RDPARTY:1.1178 Fri Nov 28 15:14:39 2014 +++ src/doc/3RDPARTY Sun Dec 7 10:05:21 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1178 2014/11/28 15:14:39 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1179 2014/12/07 10:05:21 jnemeth Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -704,7 +704,7 @@ All changes should come via import from Package: lvm2tools Version: 2.02.56 -Current Vers: 2.02.56 +Current Vers: 2.02.114 Maintainer: lvm-de...@redhat.com Archive Site: ftp://sources.redhat.com/pub/lvm2/ Home Page: http://sources.redhat.com/lvm2/ @@ -712,10 +712,11 @@ Responsible: haad License: GPLv2 Location: external/gpl2/lvm2/dist Notes: -Use the src/external/gpl2/lvm2tools/dist/lvm2netbsd script to prepare source tree -for import. Keep eye on dist/include/configure.h it migh change over the releases. -We maintain our own version of libdevmapper ioctl protocol code, therefore we -should test it before import. Talk to haad before importing new version. +Use the src/external/gpl2/lvm2tools/dist/lvm2netbsd script to +prepare source tree for import. Keep eye on dist/include/configure.h +it migh change over the releases. We maintain our own version of +libdevmapper ioctl protocol code, therefore we should test it before +import. Talk to haad before importing new version. Package: libpcap Version: 1.6.2
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: jnemeth Date: Fri Dec 5 23:21:23 UTC 2014 Modified Files: src/games/fortune/datfiles: fortunes Log Message: PR/49451 - Ben Gergely -- add missing attribution To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.56 src/games/fortune/datfiles/fortunes:1.57 --- src/games/fortune/datfiles/fortunes:1.56 Wed Dec 11 11:52:27 2013 +++ src/games/fortune/datfiles/fortunes Fri Dec 5 23:21:23 2014 @@ -1489,6 +1489,7 @@ Any sufficiently advanced bug is indisti % Any sufficiently advanced technology is indistinguishable from a rigged demo. + -- Andy Finkel, Commodore-Amiga Inc. % Any sufficiently advanced technology is indistinguishable from magic. -- Arthur C. Clarke
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: jnemeth Date: Tue Oct 14 03:16:56 UTC 2014 Modified Files: src/sys/arch/x86/x86: identcpu.c Log Message: Force x86_xsave_features to 0 when running under XEN for AMD processors. This prevents the use of xsave and xrstor thus fixing the problem in PR/49150. The basic problem is that the way AMD implements those instructions means that information can leak between domains so XEN treats them as privileged. XXX If anybody else comes up with a better / more proper fix, go for it. However, this solves the problem I was having. And, given that XEN being broken is pretty much a show-stopper for a release, something needed to be done. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x86/x86/identcpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/identcpu.c diff -u src/sys/arch/x86/x86/identcpu.c:1.45 src/sys/arch/x86/x86/identcpu.c:1.46 --- src/sys/arch/x86/x86/identcpu.c:1.45 Tue Jul 8 19:35:36 2014 +++ src/sys/arch/x86/x86/identcpu.c Tue Oct 14 03:16:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: identcpu.c,v 1.45 2014/07/08 19:35:36 msaitoh Exp $ */ +/* $NetBSD: identcpu.c,v 1.46 2014/10/14 03:16:56 jnemeth Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: identcpu.c,v 1.45 2014/07/08 19:35:36 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: identcpu.c,v 1.46 2014/10/14 03:16:56 jnemeth Exp $); #include opt_xen.h @@ -757,7 +757,10 @@ cpu_probe_fpu(struct cpu_info *ci) /* XXX these probably ought to be per-cpu */ if (descs[2] 512) x86_fpu_save_size = descs[2]; - x86_xsave_features = (uint64_t)descs[3] 32 | descs[0]; +#ifdef XEN + if (cpu_vendor != CPUVENDOR_AMD) +#endif + x86_xsave_features = (uint64_t)descs[3] 32 | descs[0]; } void
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Fri Oct 3 00:51:31 UTC 2014
Modified Files:
src/sbin/gpt: create.c gpt_uuid.c gpt_uuid.h migrate.c
Log Message:
0 is not guaranteed to be unique
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sbin/gpt/create.c
cvs rdiff -u -r1.5 -r1.6 src/sbin/gpt/gpt_uuid.c
cvs rdiff -u -r1.1 -r1.2 src/sbin/gpt/gpt_uuid.h
cvs rdiff -u -r1.19 -r1.20 src/sbin/gpt/migrate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/create.c
diff -u src/sbin/gpt/create.c:1.10 src/sbin/gpt/create.c:1.11
--- src/sbin/gpt/create.c:1.10 Tue Sep 30 17:59:59 2014
+++ src/sbin/gpt/create.c Fri Oct 3 00:51:31 2014
@@ -33,7 +33,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: create.c,v 1.10 2014/09/30 17:59:59 christos Exp $);
+__RCSID($NetBSD: create.c,v 1.11 2014/10/03 00:51:31 jnemeth Exp $);
#endif
#include sys/types.h
@@ -174,7 +174,7 @@ create(int fd)
hdr-hdr_lba_alt = htole64(last);
hdr-hdr_lba_start = htole64(tbl-map_start + blocks);
hdr-hdr_lba_end = htole64(last - blocks - 1LL);
- gpt_uuid_copy(hdr-hdr_guid, gpt_uuid_nil);
+ gpt_uuid_create_new(hdr-hdr_guid);
hdr-hdr_lba_table = htole64(tbl-map_start);
hdr-hdr_entries = htole32((blocks * secsz) / sizeof(struct gpt_ent));
if (le32toh(hdr-hdr_entries) parts)
@@ -183,7 +183,7 @@ create(int fd)
ent = tbl-map_data;
for (i = 0; i le32toh(hdr-hdr_entries); i++) {
- gpt_uuid_copy(ent[i].ent_guid, gpt_uuid_nil);
+ gpt_uuid_create_new(ent[i].ent_guid);
}
hdr-hdr_crc_table = htole32(crc32(ent, le32toh(hdr-hdr_entries) *
Index: src/sbin/gpt/gpt_uuid.c
diff -u src/sbin/gpt/gpt_uuid.c:1.5 src/sbin/gpt/gpt_uuid.c:1.6
--- src/sbin/gpt/gpt_uuid.c:1.5 Thu Oct 2 21:27:41 2014
+++ src/sbin/gpt/gpt_uuid.c Fri Oct 3 00:51:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt_uuid.c,v 1.5 2014/10/02 21:27:41 apb Exp $ */
+/* $NetBSD: gpt_uuid.c,v 1.6 2014/10/03 00:51:31 jnemeth Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include sys/cdefs.h
#ifdef __RCSID
-__RCSID($NetBSD: gpt_uuid.c,v 1.5 2014/10/02 21:27:41 apb Exp $);
+__RCSID($NetBSD: gpt_uuid.c,v 1.6 2014/10/03 00:51:31 jnemeth Exp $);
#endif
#include stdio.h
@@ -44,6 +44,11 @@ __RCSID($NetBSD: gpt_uuid.c,v 1.5 2014/
#include sys/endian.h
#endif
+#if !defined(HAVE_NBTOOL_CONFIG_H)
+#include sys/types.h
+#include sys/uuid.h
+#endif
+
const gpt_uuid_t gpt_uuid_nil;
struct dce_uuid {
@@ -230,3 +235,14 @@ gpt_uuid_create(gpt_type_t t, gpt_uuid_t
if (b)
utf8_to_utf16((const uint8_t *)gpt_nv[t].d, b, s / sizeof(*b));
}
+
+#if !defined(HAVE_NBTOOL_CONFIG_H)
+void
+gpt_uuid_create_new(gpt_uuid_t t)
+{
+ struct uuid u;
+
+ uuidgen(u, 1);
+ gpt_dce_to_uuid((struct dce_uuid *)u, t);
+}
+#endif
Index: src/sbin/gpt/gpt_uuid.h
diff -u src/sbin/gpt/gpt_uuid.h:1.1 src/sbin/gpt/gpt_uuid.h:1.2
--- src/sbin/gpt/gpt_uuid.h:1.1 Tue Sep 30 17:59:59 2014
+++ src/sbin/gpt/gpt_uuid.h Fri Oct 3 00:51:31 2014
@@ -91,6 +91,8 @@ void gpt_uuid_create(gpt_type_t, gpt_uui
int gpt_uuid_parse(const char *, gpt_uuid_t);
+void gpt_uuid_create_new(gpt_uuid_t);
+
__END_DECLS
#endif /* _GPT_UUID_T */
Index: src/sbin/gpt/migrate.c
diff -u src/sbin/gpt/migrate.c:1.19 src/sbin/gpt/migrate.c:1.20
--- src/sbin/gpt/migrate.c:1.19 Tue Sep 30 17:59:59 2014
+++ src/sbin/gpt/migrate.c Fri Oct 3 00:51:31 2014
@@ -33,7 +33,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/migrate.c,v 1.16 2005/09/01 02:42:52 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: migrate.c,v 1.19 2014/09/30 17:59:59 christos Exp $);
+__RCSID($NetBSD: migrate.c,v 1.20 2014/10/03 00:51:31 jnemeth Exp $);
#endif
#include sys/types.h
@@ -335,7 +335,7 @@ migrate(int fd)
hdr-hdr_lba_alt = htole64(tpg-map_start);
hdr-hdr_lba_start = htole64(tbl-map_start + blocks);
hdr-hdr_lba_end = htole64(lbt-map_start - 1LL);
- gpt_uuid_copy(hdr-hdr_guid, gpt_uuid_nil);
+ gpt_uuid_create_new(hdr-hdr_guid);
hdr-hdr_lba_table = htole64(tbl-map_start);
hdr-hdr_entries = htole32((blocks * secsz) / sizeof(struct gpt_ent));
if (le32toh(hdr-hdr_entries) parts)
@@ -344,7 +344,7 @@ migrate(int fd)
ent = tbl-map_data;
for (i = 0; i le32toh(hdr-hdr_entries); i++) {
- gpt_uuid_copy(ent[i].ent_guid, gpt_uuid_nil);
+ gpt_uuid_create_new(ent[i].ent_guid);
}
/* Mirror partitions. */
CVS commit: src/sbin/gpt
Module Name:src Committed By: jnemeth Date: Tue Sep 30 20:23:23 UTC 2014 Modified Files: src/sbin/gpt: show.c Log Message: Check size of correct buffer. Note, just being pedantic as the buffer being checked is the same size as the one that should have been checked. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sbin/gpt/show.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/show.c diff -u src/sbin/gpt/show.c:1.19 src/sbin/gpt/show.c:1.20 --- src/sbin/gpt/show.c:1.19 Tue Sep 30 18:00:00 2014 +++ src/sbin/gpt/show.c Tue Sep 30 20:23:23 2014 @@ -33,7 +33,7 @@ __FBSDID($FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $); #endif #ifdef __RCSID -__RCSID($NetBSD: show.c,v 1.19 2014/09/30 18:00:00 christos Exp $); +__RCSID($NetBSD: show.c,v 1.20 2014/09/30 20:23:23 jnemeth Exp $); #endif #include sys/types.h @@ -191,7 +191,7 @@ show_one(void) printf(Size: %llu\n, (long long)m-map_size); gpt_uuid_snprintf(s1, sizeof(s1), %s, ent-ent_type); - gpt_uuid_snprintf(s2, sizeof(s1), %d, ent-ent_type); + gpt_uuid_snprintf(s2, sizeof(s2), %d, ent-ent_type); if (strcmp(s1, s2) == 0) strlcpy(s1, unknown, sizeof(s1)); printf(Type: %s (%s)\n, s1, s2);
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Tue Sep 30 22:56:36 UTC 2014
Modified Files:
src/sbin/gpt: gpt_uuid.c show.c
Log Message:
correctly show partition type in the new world order
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/gpt/gpt_uuid.c
cvs rdiff -u -r1.20 -r1.21 src/sbin/gpt/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt_uuid.c
diff -u src/sbin/gpt/gpt_uuid.c:1.1 src/sbin/gpt/gpt_uuid.c:1.2
--- src/sbin/gpt/gpt_uuid.c:1.1 Tue Sep 30 17:59:59 2014
+++ src/sbin/gpt/gpt_uuid.c Tue Sep 30 22:56:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt_uuid.c,v 1.1 2014/09/30 17:59:59 christos Exp $ */
+/* $NetBSD: gpt_uuid.c,v 1.2 2014/09/30 22:56:36 jnemeth Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include sys/cdefs.h
#ifdef __RCSID
-__RCSID($NetBSD: gpt_uuid.c,v 1.1 2014/09/30 17:59:59 christos Exp $);
+__RCSID($NetBSD: gpt_uuid.c,v 1.2 2014/09/30 22:56:36 jnemeth Exp $);
#endif
#include stdio.h
@@ -133,6 +133,17 @@ gpt_uuid_symbolic(char *buf, size_t bufs
return -1;
}
+static int
+gpt_uuid_descriptive(char *buf, size_t bufsiz, const struct dce_uuid *u)
+{
+ size_t i;
+
+ for (i = 0; i __arraycount(gpt_nv); i++)
+ if (memcmp(gpt_nv[i].u, u, sizeof(*u)) == 0)
+ return strlcpy(buf, gpt_nv[i].d, bufsiz);
+ return -1;
+}
+
int
gpt_uuid_snprintf(char *buf, size_t bufsiz, const char *fmt,
const gpt_uuid_t uu)
@@ -145,6 +156,11 @@ gpt_uuid_snprintf(char *buf, size_t bufs
if ((r = gpt_uuid_symbolic(buf, bufsiz, u)) != -1)
return r;
}
+ if (fmt[1] == 'l') {
+ int r;
+ if ((r = gpt_uuid_descriptive(buf, bufsiz, u)) != -1)
+ return r;
+ }
return gpt_uuid_numeric(buf, bufsiz, u);
}
Index: src/sbin/gpt/show.c
diff -u src/sbin/gpt/show.c:1.20 src/sbin/gpt/show.c:1.21
--- src/sbin/gpt/show.c:1.20 Tue Sep 30 20:23:23 2014
+++ src/sbin/gpt/show.c Tue Sep 30 22:56:36 2014
@@ -33,7 +33,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: show.c,v 1.20 2014/09/30 20:23:23 jnemeth Exp $);
+__RCSID($NetBSD: show.c,v 1.21 2014/09/30 22:56:36 jnemeth Exp $);
#endif
#include sys/types.h
@@ -135,8 +135,10 @@ show(void)
printf(- %s, buf);
} else {
char buf[128];
-gpt_uuid_snprintf(
-buf, sizeof(buf), %s, ent-ent_type);
+if (show_uuid || gpt_uuid_snprintf(buf,
+sizeof(buf), %ls, ent-ent_type) == -1)
+ gpt_uuid_snprintf(buf, sizeof(buf),
+ %d, ent-ent_type);
printf(- %s, buf);
}
break;
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Wed Oct 1 01:07:24 UTC 2014
Modified Files:
src/sbin/gpt: gpt_uuid.c
Log Message:
actually return the uuid when parsing one that is in numeric format
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/gpt/gpt_uuid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt_uuid.c
diff -u src/sbin/gpt/gpt_uuid.c:1.2 src/sbin/gpt/gpt_uuid.c:1.3
--- src/sbin/gpt/gpt_uuid.c:1.2 Tue Sep 30 22:56:36 2014
+++ src/sbin/gpt/gpt_uuid.c Wed Oct 1 01:07:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt_uuid.c,v 1.2 2014/09/30 22:56:36 jnemeth Exp $ */
+/* $NetBSD: gpt_uuid.c,v 1.3 2014/10/01 01:07:24 jnemeth Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include sys/cdefs.h
#ifdef __RCSID
-__RCSID($NetBSD: gpt_uuid.c,v 1.2 2014/09/30 22:56:36 jnemeth Exp $);
+__RCSID($NetBSD: gpt_uuid.c,v 1.3 2014/10/01 01:07:24 jnemeth Exp $);
#endif
#include stdio.h
@@ -211,8 +211,10 @@ gpt_uuid_parse(const char *s, gpt_uuid_t
{
struct dce_uuid u;
- if (gpt_uuid_parse_numeric(s, u) != -1)
+ if (gpt_uuid_parse_numeric(s, u) != -1) {
+ gpt_dce_to_uuid(u, uuid);
return 0;
+ }
if (gpt_uuid_parse_symbolic(s, u) == -1)
return -1;
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Wed Oct 1 01:08:25 UTC 2014
Modified Files:
src/sbin/gpt: restore.c
Log Message:
using random values for hdr-hdr_guid does not work very well
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sbin/gpt/restore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/restore.c
diff -u src/sbin/gpt/restore.c:1.6 src/sbin/gpt/restore.c:1.7
--- src/sbin/gpt/restore.c:1.6 Tue Sep 30 17:59:59 2014
+++ src/sbin/gpt/restore.c Wed Oct 1 01:08:25 2014
@@ -33,7 +33,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: restore.c,v 1.6 2014/09/30 17:59:59 christos Exp $);
+__RCSID($NetBSD: restore.c,v 1.7 2014/10/01 01:08:25 jnemeth Exp $);
#endif
#include sys/types.h
@@ -72,7 +72,7 @@ usage_restore(void)
static void
restore(int fd)
{
- gpt_uuid_t uuid;
+ gpt_uuid_t gpt_guid, uuid;
off_t firstdata, last, lastdata, gpe_start, gpe_end;
map_t *map;
struct mbr *mbr;
@@ -145,7 +145,7 @@ restore(int fd)
propstr = prop_dictionary_get(gpt_dict, guid);
PROP_ERR(propstr);
s = prop_string_cstring_nocopy(propstr);
- if (gpt_uuid_parse(s, uuid) != 0) {
+ if (gpt_uuid_parse(s, gpt_guid) != 0) {
warnx(%s: not able to convert to an UUID\n, s);
return;
}
@@ -355,7 +355,7 @@ restore(int fd)
hdr-hdr_lba_alt = htole64(last);
hdr-hdr_lba_start = htole64(firstdata);
hdr-hdr_lba_end = htole64(lastdata);
- gpt_uuid_copy(hdr-hdr_guid, uuid);
+ gpt_uuid_copy(hdr-hdr_guid, gpt_guid);
hdr-hdr_lba_table = htole64(2);
hdr-hdr_entries = htole32(entries);
hdr-hdr_entsz = htole32(sizeof(struct gpt_ent));
CVS commit: src/sbin/gpt
Module Name:src Committed By: jnemeth Date: Wed Oct 1 03:52:42 UTC 2014 Modified Files: src/sbin/gpt: resizedisk.c Log Message: oops, forgot to update end of data area To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sbin/gpt/resizedisk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/resizedisk.c diff -u src/sbin/gpt/resizedisk.c:1.5 src/sbin/gpt/resizedisk.c:1.6 --- src/sbin/gpt/resizedisk.c:1.5 Tue Sep 30 17:59:59 2014 +++ src/sbin/gpt/resizedisk.c Wed Oct 1 03:52:42 2014 @@ -33,7 +33,7 @@ __FBSDID($FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $); #endif #ifdef __RCSID -__RCSID($NetBSD: resizedisk.c,v 1.5 2014/09/30 17:59:59 christos Exp $); +__RCSID($NetBSD: resizedisk.c,v 1.6 2014/10/01 03:52:42 jnemeth Exp $); #endif #include sys/bootblock.h @@ -187,6 +187,7 @@ resizedisk(int fd) hdr = gpt-map_data; hdr-hdr_lba_alt = tpg-map_start; hdr-hdr_crc_self = 0; + hdr-hdr_lba_end = htole64(lbt-map_start - 1); hdr-hdr_crc_self = htole32(crc32(gpt-map_data, GPT_HDR_SIZE)); gpt_write(fd, gpt); @@ -194,6 +195,7 @@ resizedisk(int fd) hdr = tpg-map_data; hdr-hdr_lba_self = htole64(tpg-map_start); hdr-hdr_lba_alt = htole64(gpt-map_start); + hdr-hdr_lba_end = htole64(lbt-map_start - 1); hdr-hdr_lba_table = htole64(lbt-map_start); hdr-hdr_crc_self = 0; hdr-hdr_crc_self =
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sun Sep 28 08:14:51 UTC 2014
Modified Files:
src/sbin/gpt: Makefile gpt.8 gpt.c gpt.h
Added Files:
src/sbin/gpt: type.c
Log Message:
PR/44218 - David Young -- add type subcommand to change a partition type
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sbin/gpt/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.29 -r1.30 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.12 -r1.13 src/sbin/gpt/gpt.h
cvs rdiff -u -r0 -r1.1 src/sbin/gpt/type.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/Makefile
diff -u src/sbin/gpt/Makefile:1.9 src/sbin/gpt/Makefile:1.10
--- src/sbin/gpt/Makefile:1.9 Tue Sep 23 07:47:54 2014
+++ src/sbin/gpt/Makefile Sun Sep 28 08:14:51 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2014/09/23 07:47:54 jnemeth Exp $
+# $NetBSD: Makefile,v 1.10 2014/09/28 08:14:51 jnemeth Exp $
# $FreeBSD: src/sbin/gpt/Makefile,v 1.7 2005/09/01 02:49:20 marcel Exp $
PROG= gpt
SRCS= add.c backup.c biosboot.c create.c destroy.c gpt.c label.c map.c \
migrate.c recover.c remove.c resize.c resizedisk.c restore.c \
- set.c show.c unset.c
+ set.c show.c type.c unset.c
MAN= gpt.8
LDADD+= -lprop -lutil
Index: src/sbin/gpt/gpt.8
diff -u src/sbin/gpt/gpt.8:1.30 src/sbin/gpt/gpt.8:1.31
--- src/sbin/gpt/gpt.8:1.30 Tue Sep 23 07:47:54 2014
+++ src/sbin/gpt/gpt.8 Sun Sep 28 08:14:51 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: gpt.8,v 1.30 2014/09/23 07:47:54 jnemeth Exp $
+.\ $NetBSD: gpt.8,v 1.31 2014/09/28 08:14:51 jnemeth Exp $
.\
.\ Copyright (c) 2002 Marcel Moolenaar
.\ All rights reserved.
@@ -26,7 +26,7 @@
.\
.\ $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
.\
-.Dd September 23, 2014
+.Dd September 28, 2014
.Dt GPT 8
.Os
.Sh NAME
@@ -457,6 +457,18 @@ The order of precedence for the options
.Fl l ,
.Fl g ,
.Fl u .
+.\ type
+.It Nm Ic type Oo Fl a Oc Fl T Ar newtype Ar device ...
+.It Nm Ic type Oo Fl b Ar blocknr Oc Oo Fl i Ar index Oc \
+Oo Fl s Ar sectors Oc Oo Fl t Ar type Oc Fl T Ar newtype Ar device ...
+The
+.Ic type
+command allows the user to change the type of any and all partitions
+that match the selection.
+It uses the same selection options as the
+.Ic label
+command.
+See above for a description of these options.
.\ unset
.It Nm Ic unset Fl a Ar attribute Fl i Ar index Ar device ...
The
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.29 src/sbin/gpt/gpt.c:1.30
--- src/sbin/gpt/gpt.c:1.29 Tue Sep 23 07:47:54 2014
+++ src/sbin/gpt/gpt.c Sun Sep 28 08:14:51 2014
@@ -31,7 +31,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: gpt.c,v 1.29 2014/09/23 07:47:54 jnemeth Exp $);
+__RCSID($NetBSD: gpt.c,v 1.30 2014/09/28 08:14:51 jnemeth Exp $);
#endif
#include sys/param.h
@@ -732,6 +732,7 @@ static struct {
{ cmd_restore, restore },
{ cmd_set, set },
{ cmd_show, show },
+ { cmd_type, type },
{ cmd_unset, unset },
{ NULL, verify },
{ NULL, NULL }
@@ -744,7 +745,8 @@ usage(void)
extern const char createmsg[], destroymsg[], labelmsg1[], labelmsg2[];
extern const char labelmsg3[], migratemsg[], recovermsg[], removemsg1[];
extern const char removemsg2[], resizemsg[], resizediskmsg[];
- extern const char restoremsg[], setmsg[], showmsg[], unsetmsg[];
+ extern const char restoremsg[], setmsg[], showmsg[], typemsg1[];
+ extern const char typemsg2[], typemsg3[], unsetmsg[];
fprintf(stderr,
usage: %s %s\n
@@ -765,6 +767,9 @@ usage(void)
%s %s\n
%s %s\n
%s %s\n
+ %s %s\n
+ %s %s\n
+ %*s %s\n
%s %s\n,
getprogname(), addmsg1,
getprogname(), addmsg2,
@@ -784,6 +789,9 @@ usage(void)
getprogname(), restoremsg,
getprogname(), setmsg,
getprogname(), showmsg,
+ getprogname(), typemsg1,
+ getprogname(), typemsg2,
+ (int)strlen(getprogname()), , typemsg3,
getprogname(), unsetmsg);
exit(1);
}
Index: src/sbin/gpt/gpt.h
diff -u src/sbin/gpt/gpt.h:1.12 src/sbin/gpt/gpt.h:1.13
--- src/sbin/gpt/gpt.h:1.12 Tue Sep 23 07:47:54 2014
+++ src/sbin/gpt/gpt.h Sun Sep 28 08:14:51 2014
@@ -94,6 +94,7 @@ int cmd_resizedisk(int, char *[]);
int cmd_restore(int, char *[]);
int cmd_set(int, char *[]);
int cmd_show(int, char *[]);
+int cmd_type(int, char *[]);
int cmd_unset(int, char *[]);
#endif /* _GPT_H_ */
Added files:
Index: src/sbin/gpt/type.c
diff -u /dev/null src/sbin/gpt/type.c:1.1
--- /dev/null Sun Sep 28 08:14:51 2014
+++ src/sbin/gpt/type.c Sun Sep 28 08:14:51 2014
@@ -0,0 +1,227 @@
+/*-
+ * Copyright (c) 2004 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Mon Sep 29 05:56:43 UTC 2014
Modified Files:
src/sbin/gpt: biosboot.c gpt.8 label.c remove.c type.c
Log Message:
PR/47990 - Dr. Wolfgang Stukenbrock -- add -L label as selector option
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/gpt/biosboot.c
cvs rdiff -u -r1.31 -r1.32 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.14 -r1.15 src/sbin/gpt/label.c
cvs rdiff -u -r1.12 -r1.13 src/sbin/gpt/remove.c
cvs rdiff -u -r1.1 -r1.2 src/sbin/gpt/type.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/biosboot.c
diff -u src/sbin/gpt/biosboot.c:1.8 src/sbin/gpt/biosboot.c:1.9
--- src/sbin/gpt/biosboot.c:1.8 Fri Sep 26 05:34:15 2014
+++ src/sbin/gpt/biosboot.c Mon Sep 29 05:56:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: biosboot.c,v 1.8 2014/09/26 05:34:15 jnemeth Exp $ */
+/* $NetBSD: biosboot.c,v 1.9 2014/09/29 05:56:43 jnemeth Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include sys/cdefs.h
#ifdef __RCSID
-__RCSID($NetBSD: biosboot.c,v 1.8 2014/09/26 05:34:15 jnemeth Exp $);
+__RCSID($NetBSD: biosboot.c,v 1.9 2014/09/29 05:56:43 jnemeth Exp $);
#endif
#include sys/stat.h
@@ -65,8 +65,10 @@ static uint64_t size;
static char *bootpath;
static unsigned int entry;
+static uint8_t *label;
-const char biosbootmsg[] = biosboot [-c bootcode] [-i index] device ...;
+const char biosbootmsg[] = biosboot [-c bootcode] [-i index]
+ [-L label] device ...;
__dead static void
usage_biosboot(void)
@@ -196,8 +198,13 @@ biosboot(int fd)
if (entry 0 m-map_index == entry)
break;
+ if (label != NULL)
+ if (strcmp((char *)label,
+ (char *)utf16_to_utf8(ent-ent_name)) == 0)
+break;
+
/* next, partition as could be specified by wedge */
- if (entry 1 size 0
+ if (entry 1 label == NULL size 0
m-map_start == start m-map_size == (off_t)size)
break;
}
@@ -252,6 +259,8 @@ biosboot(int fd)
warnx(error: cannot update Protective MBR);
return;
}
+
+ printf(partition %d marked as bootable\n, i + 1);
}
int
@@ -263,7 +272,7 @@ cmd_biosboot(int argc, char *argv[])
char *dev, *p;
int ch, fd;
- while ((ch = getopt(argc, argv, c:i:)) != -1) {
+ while ((ch = getopt(argc, argv, c:i:L:)) != -1) {
switch(ch) {
case 'c':
if (bootpath != NULL)
@@ -278,6 +287,11 @@ cmd_biosboot(int argc, char *argv[])
if (*p != 0 || entry 1)
usage_biosboot();
break;
+ case 'L':
+ if (label != NULL)
+usage_biosboot();
+ label = (uint8_t *)strdup(optarg);
+ break;
default:
usage_biosboot();
}
Index: src/sbin/gpt/gpt.8
diff -u src/sbin/gpt/gpt.8:1.31 src/sbin/gpt/gpt.8:1.32
--- src/sbin/gpt/gpt.8:1.31 Sun Sep 28 08:14:51 2014
+++ src/sbin/gpt/gpt.8 Mon Sep 29 05:56:43 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: gpt.8,v 1.31 2014/09/28 08:14:51 jnemeth Exp $
+.\ $NetBSD: gpt.8,v 1.32 2014/09/29 05:56:43 jnemeth Exp $
.\
.\ Copyright (c) 2002 Marcel Moolenaar
.\ All rights reserved.
@@ -26,7 +26,7 @@
.\
.\ $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
.\
-.Dd September 28, 2014
+.Dd September 29, 2014
.Dt GPT 8
.Os
.Sh NAME
@@ -162,7 +162,8 @@ command.
The format is a plist.
It should not be modified.
.\ biosboot
-.It Nm Ic biosboot Oo Fl c Ar bootcode Oc Oo Fl i Ar index Oc Ar device ...
+.It Nm Ic biosboot Oo Fl c Ar bootcode Oc Oo Fl i Ar index Oc \
+Oo Fl L Ar label Oc Ar device ...
The
.Ic biosboot
command allows the user to configure the partition that contains the
@@ -182,6 +183,11 @@ The
option selects the partition that should contain the primary
bootstrap code, as installed via
.Xr installboot 8 .
+The
+.Fl L
+option selects the partition by label.
+If there are multiple partitions with the same label, it will use the
+first one found.
.\ create
.It Nm Ic create Oo Fl fp Oc Ar device ...
The
@@ -216,7 +222,7 @@ to destroy the table in a way that it ca
.\ label
.It Nm Ic label Oo Fl a Oc Ao Fl f Ar file | Fl l Ar label Ac Ar device ...
.It Nm Ic label Oo Fl b Ar blocknr Oc Oo Fl i Ar index Oc \
-Oo Fl s Ar sectors Oc Oo Fl t Ar type Oc \
+Oo Fl L Ar label Oc Oo Fl s Ar sectors Oc Oo Fl t Ar type Oc \
Ao Fl f Ar file | Fl l Ar label Ac Ar device ...
The
.Ic label
@@ -237,6 +243,11 @@ The
option selects the partition with the given partition number.
.Pp
The
+.Fl L Ar label
+option selects all partitions that have the given label.
+This can cause multiple partitions to be relabeled.
+.Pp
+The
.Fl s Ar sectors
option selects all partitions that have the given size.
This can cause multiple partitions to be labeled.
@@ -320,7 +331,7 @@ It is very useful in case the primary la
.\ remove
.It Nm Ic remove Oo Fl a Oc Ar device ...
.It Nm Ic remove Oo Fl b Ar blocknr Oc Oo Fl i Ar index Oc \
-Oo Fl s Ar sectors Oc Oo Fl t Ar type Oc Ar device ...
+Oo Fl L
CVS commit: src/doc
Module Name:src Committed By: jnemeth Date: Mon Sep 29 05:58:48 UTC 2014 Modified Files: src/doc: CHANGES Log Message: note addition of type subcommand to gpt(8) To generate a diff of this commit: cvs rdiff -u -r1.1986 -r1.1987 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1986 src/doc/CHANGES:1.1987 --- src/doc/CHANGES:1.1986 Sat Sep 27 16:22:47 2014 +++ src/doc/CHANGES Mon Sep 29 05:58:48 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1986 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1987 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -55,3 +55,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0: [jnemeth 20140926] dhcpcd(8): Import dhcpcd-6.4.7. [roy 20140927] mpt(4): added bio(4) support. [jmcneill 20140927] + gpt(8): added type subcommand to modify partition type. + [jnemeth 20140927]
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Fri Sep 26 08:56:35 UTC 2014
Modified Files:
src/sbin/gpt: restore.c
Log Message:
- handle a GPT that isn't an exact multiple of a sector
- adjust PMBR size, in case new disk is a different size
- don't leak as much memory
- clean up error handling somewhat
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/gpt/restore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/restore.c
diff -u src/sbin/gpt/restore.c:1.2 src/sbin/gpt/restore.c:1.3
--- src/sbin/gpt/restore.c:1.2 Sat Sep 20 22:11:27 2014
+++ src/sbin/gpt/restore.c Fri Sep 26 08:56:34 2014
@@ -29,7 +29,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: restore.c,v 1.2 2014/09/20 22:11:27 jnemeth Exp $);
+__RCSID($NetBSD: restore.c,v 1.3 2014/09/26 08:56:34 jnemeth Exp $);
#endif
#include sys/types.h
@@ -101,13 +101,15 @@ restore(int fd)
warnx(%s: error: device contains a MBR, device_name);
return;
}
-
/* Nuke the MBR in our internal map. */
map-map_type = MAP_TYPE_UNUSED;
}
props = prop_dictionary_internalize_from_file(/dev/stdin);
- PROP_ERR(props);
+ if (props == NULL) {
+ warnx(error: unable to read/parse backup file);
+ return;
+ }
propnum = prop_dictionary_get(props, sector_size);
PROP_ERR(propnum);
@@ -133,6 +135,10 @@ restore(int fd)
propnum = prop_dictionary_get(gpt_dict, entries);
PROP_ERR(propnum);
entries = prop_number_integer_value(propnum);
+ gpt_size = entries * sizeof(struct gpt_ent) / secsz;
+ if (gpt_size * sizeof(struct gpt_ent) % secsz)
+ gpt_size++;
+
propstr = prop_dictionary_get(gpt_dict, guid);
PROP_ERR(propstr);
s = prop_string_cstring_nocopy(propstr);
@@ -143,7 +149,6 @@ restore(int fd)
}
le_uuid_enc(gpt_guid, uuid);
- gpt_size = entries * sizeof(struct gpt_ent) / secsz;
firstdata = gpt_size + 2; /* PMBR and GPT header */
lastdata = last - gpt_size - 1; /* alt. GPT table and header */
@@ -187,12 +192,27 @@ restore(int fd)
warnx(not enough memory to create a sector buffer);
return;
}
- lseek(fd, 0LL, SEEK_SET);
- for (i = 0; i firstdata; i++)
- write(fd, secbuf, secsz);
- lseek(fd, (lastdata + 1) * secsz, SEEK_SET);
- for (i = lastdata + 1; i = last; i++)
- write(fd, secbuf, secsz);
+
+ if (lseek(fd, 0LL, SEEK_SET) == -1) {
+ warnx(%s: error: can't seek to beginning, device_name);
+ return;
+ }
+ for (i = 0; i firstdata; i++) {
+ if (write(fd, secbuf, secsz) == -1) {
+ warnx(%s: error: can't write, device_name);
+ return;
+ }
+ }
+ if (lseek(fd, (lastdata + 1) * secsz, SEEK_SET) == -1) {
+ warnx(%s: error: can't seek to end, device_name);
+ return;
+ }
+ for (i = lastdata + 1; i = last; i++) {
+ if (write(fd, secbuf, secsz) == -1) {
+ warnx(%s: error: can't write, device_name);
+ return;
+ }
+ }
mbr = (struct mbr *)secbuf;
type_dict = prop_dictionary_get(props, MBR);
@@ -249,19 +269,35 @@ restore(int fd)
PROP_ERR(propnum);
mbr-mbr_part[i].part_start_hi =
htole16(prop_number_unsigned_integer_value(propnum));
- propnum = prop_dictionary_get(mbr_dict, lba_size_low);
- PROP_ERR(propnum);
- mbr-mbr_part[i].part_size_lo =
- htole16(prop_number_unsigned_integer_value(propnum));
- propnum = prop_dictionary_get(mbr_dict, lba_size_high);
- PROP_ERR(propnum);
- mbr-mbr_part[i].part_size_hi =
- htole16(prop_number_unsigned_integer_value(propnum));
+ /* adjust PMBR size to size of device */
+if (mbr-mbr_part[i].part_typ == MBR_PTYPE_PMBR) {
+ if (last 0x) {
+mbr-mbr_part[0].part_size_lo = htole16(0x);
+mbr-mbr_part[0].part_size_hi = htole16(0x);
+ } else {
+mbr-mbr_part[0].part_size_lo = htole16(last);
+mbr-mbr_part[0].part_size_hi =
+htole16(last 16);
+ }
+ } else {
+ propnum = prop_dictionary_get(mbr_dict, lba_size_low);
+ PROP_ERR(propnum);
+ mbr-mbr_part[i].part_size_lo =
+ htole16(prop_number_unsigned_integer_value(propnum));
+ propnum =
+ prop_dictionary_get(mbr_dict, lba_size_high);
+ PROP_ERR(propnum);
+ mbr-mbr_part[i].part_size_hi =
+ htole16(prop_number_unsigned_integer_value(propnum));
+ }
}
prop_object_iterator_release(propiter);
mbr-mbr_sig = htole16(MBR_SIG);
- lseek(fd, 0LL, SEEK_SET);
- write(fd, mbr, secsz);
+ if (lseek(fd, 0LL, SEEK_SET) == -1 ||
+ write(fd, mbr, secsz) == -1) {
+ warnx(%s: error: unable to write MBR, device_name);
+ return;
+ }
propiter = prop_array_iterator(gpt_array);
PROP_ERR(propiter);
@@ -309,10 +345,16 @@ restore(int fd)
sizeof(ent));
}
prop_object_iterator_release(propiter);
- lseek(fd, 2 * secsz, SEEK_SET);
- write(fd, (char *)secbuf + 1 * secsz, gpt_size * secsz);
- lseek(fd, (lastdata + 1) * secsz, SEEK_SET);
- write(fd, (char *)secbuf + 1 * secsz, gpt_size * secsz);
+ if
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Fri Sep 26 05:34:15 UTC 2014
Modified Files:
src/sbin/gpt: biosboot.c
Log Message:
no C99isms in tool code
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/biosboot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/biosboot.c
diff -u src/sbin/gpt/biosboot.c:1.7 src/sbin/gpt/biosboot.c:1.8
--- src/sbin/gpt/biosboot.c:1.7 Wed Nov 27 01:47:53 2013
+++ src/sbin/gpt/biosboot.c Fri Sep 26 05:34:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: biosboot.c,v 1.7 2013/11/27 01:47:53 jnemeth Exp $ */
+/* $NetBSD: biosboot.c,v 1.8 2014/09/26 05:34:15 jnemeth Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include sys/cdefs.h
#ifdef __RCSID
-__RCSID($NetBSD: biosboot.c,v 1.7 2013/11/27 01:47:53 jnemeth Exp $);
+__RCSID($NetBSD: biosboot.c,v 1.8 2014/09/26 05:34:15 jnemeth Exp $);
#endif
#include sys/stat.h
@@ -138,7 +138,7 @@ biosboot(int fd)
struct mbr *mbr, *bootcode;
struct gpt_hdr *hdr;
struct gpt_ent *ent;
- int i;
+ unsigned int i, j;
/*
* Parse and validate partition maps
@@ -212,7 +212,7 @@ biosboot(int fd)
hdr = gpt-map_data;
- for (uint32_t j = 0; j le32toh(hdr-hdr_entries); j++) {
+ for (j = 0; j le32toh(hdr-hdr_entries); j++) {
ent = (void*)((char*)tbl-map_data + j * le32toh(hdr-hdr_entsz));
ent-ent_attr = ~GPT_ENT_ATTR_LEGACY_BIOS_BOOTABLE;
}
@@ -231,7 +231,7 @@ biosboot(int fd)
hdr = tpg-map_data;
- for (uint32_t j = 0; j le32toh(hdr-hdr_entries); j++) {
+ for (j = 0; j le32toh(hdr-hdr_entries); j++) {
ent = (void*)((char*)lbt-map_data + j * le32toh(hdr-hdr_entsz));
ent-ent_attr = ~GPT_ENT_ATTR_LEGACY_BIOS_BOOTABLE;
}
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Tue Sep 23 07:47:54 UTC 2014
Modified Files:
src/sbin/gpt: Makefile gpt.8 gpt.c gpt.h
Added Files:
src/sbin/gpt: resizedisk.c
Log Message:
- make gpt_gpt() available for use directly by subcommands
- create new resizedisk disk subcommand for relocating backup GPT
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/gpt/Makefile
cvs rdiff -u -r1.29 -r1.30 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.28 -r1.29 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.11 -r1.12 src/sbin/gpt/gpt.h
cvs rdiff -u -r0 -r1.1 src/sbin/gpt/resizedisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/Makefile
diff -u src/sbin/gpt/Makefile:1.8 src/sbin/gpt/Makefile:1.9
--- src/sbin/gpt/Makefile:1.8 Sun Aug 10 18:27:15 2014
+++ src/sbin/gpt/Makefile Tue Sep 23 07:47:54 2014
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2014/08/10 18:27:15 jnemeth Exp $
+# $NetBSD: Makefile,v 1.9 2014/09/23 07:47:54 jnemeth Exp $
# $FreeBSD: src/sbin/gpt/Makefile,v 1.7 2005/09/01 02:49:20 marcel Exp $
PROG= gpt
SRCS= add.c backup.c biosboot.c create.c destroy.c gpt.c label.c map.c \
- migrate.c recover.c remove.c resize.c restore.c set.c show.c unset.c
+ migrate.c recover.c remove.c resize.c resizedisk.c restore.c \
+ set.c show.c unset.c
MAN= gpt.8
LDADD+= -lprop -lutil
Index: src/sbin/gpt/gpt.8
diff -u src/sbin/gpt/gpt.8:1.29 src/sbin/gpt/gpt.8:1.30
--- src/sbin/gpt/gpt.8:1.29 Sat Sep 20 22:36:09 2014
+++ src/sbin/gpt/gpt.8 Tue Sep 23 07:47:54 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: gpt.8,v 1.29 2014/09/20 22:36:09 jnemeth Exp $
+.\ $NetBSD: gpt.8,v 1.30 2014/09/23 07:47:54 jnemeth Exp $
.\
.\ Copyright (c) 2002 Marcel Moolenaar
.\ All rights reserved.
@@ -26,7 +26,7 @@
.\
.\ $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
.\
-.Dd September 20, 2014
+.Dd September 23, 2014
.Dt GPT 8
.Os
.Sh NAME
@@ -354,6 +354,34 @@ If the
.Fl a
option is specified then the size will be adjusted to be a multiple of
alignment if possible.
+.\ resizedisk
+.It Nm Ic resizedisk Oo Fl s Ar size Oc Ar device ...
+The
+.Ic resizedisk
+command allows the user to resize a disk.
+With GPTs, a backup copy is stored at the end of the disk.
+If the underlying medium changes size
+.Pq or is going to change size ,
+then the backup copy needs to be moved to the new end of the disk,
+and the last sector available for data storage needs to be adjusted.
+This command does that.
+If the backup copy no longer exists due to the medium shrinking, then
+a new backup copy will be created using the primary copy.
+.Pp
+The
+.Fl s
+option allows the new size to be specified, otherwise the backup copy
+will automatically be placed at the current end of the disk.
+If there is no suffix, or the suffix is
+.Sq s
+or
+.Sq S
+then size is in sectors, otherwise size is in bytes which must be
+a multiple of the device's sector size.
+Using the
+.Fl s
+option allows you to move the backup copy prior to resizing the medium.
+This is primarily useful when shrinking the medium.
.\ restore
.It Nm Ic restore Oo Fl F Oc Ar device ...
The
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.28 src/sbin/gpt/gpt.c:1.29
--- src/sbin/gpt/gpt.c:1.28 Sun Aug 10 18:27:15 2014
+++ src/sbin/gpt/gpt.c Tue Sep 23 07:47:54 2014
@@ -31,7 +31,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: gpt.c,v 1.28 2014/08/10 18:27:15 jnemeth Exp $);
+__RCSID($NetBSD: gpt.c,v 1.29 2014/09/23 07:47:54 jnemeth Exp $);
#endif
#include sys/param.h
@@ -534,7 +534,7 @@ out:
return -1;
}
-static int
+int
gpt_gpt(int fd, off_t lba, int found)
{
uuid_t type;
@@ -728,6 +728,7 @@ static struct {
{ cmd_remove, remove },
{ NULL, rename },
{ cmd_resize, resize },
+ { cmd_resizedisk, resizedisk },
{ cmd_restore, restore },
{ cmd_set, set },
{ cmd_show, show },
@@ -742,8 +743,8 @@ usage(void)
extern const char addmsg1[], addmsg2[], backupmsg[], biosbootmsg[];
extern const char createmsg[], destroymsg[], labelmsg1[], labelmsg2[];
extern const char labelmsg3[], migratemsg[], recovermsg[], removemsg1[];
- extern const char removemsg2[], resizemsg[], restoremsg[], setmsg[];
- extern const char showmsg[], unsetmsg[];
+ extern const char removemsg2[], resizemsg[], resizediskmsg[];
+ extern const char restoremsg[], setmsg[], showmsg[], unsetmsg[];
fprintf(stderr,
usage: %s %s\n
@@ -763,6 +764,7 @@ usage(void)
%s %s\n
%s %s\n
%s %s\n
+ %s %s\n
%s %s\n,
getprogname(), addmsg1,
getprogname(), addmsg2,
@@ -778,6 +780,7 @@ usage(void)
getprogname(), removemsg1,
getprogname(), removemsg2,
getprogname(), resizemsg,
+ getprogname(), resizediskmsg,
getprogname(), restoremsg,
getprogname(), setmsg,
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sat Sep 20 22:11:27 UTC 2014
Modified Files:
src/sbin/gpt: restore.c
Log Message:
Initial cut of gpt restore. This functions correctly in testing,
but isn't all that pretty. It has minimal error testing and may
leak memory. It also only works with empty disks. If passed -F
flag, it will blank the disk for you.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/gpt/restore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/restore.c
diff -u src/sbin/gpt/restore.c:1.1 src/sbin/gpt/restore.c:1.2
--- src/sbin/gpt/restore.c:1.1 Sun Aug 10 18:27:15 2014
+++ src/sbin/gpt/restore.c Sat Sep 20 22:11:27 2014
@@ -29,11 +29,12 @@
__FBSDID($FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: restore.c,v 1.1 2014/08/10 18:27:15 jnemeth Exp $);
+__RCSID($NetBSD: restore.c,v 1.2 2014/09/20 22:11:27 jnemeth Exp $);
#endif
#include sys/types.h
#include sys/bootblock.h
+#include sys/disklabel_gpt.h
#include err.h
#include stddef.h
@@ -41,12 +42,12 @@ __RCSID($NetBSD: restore.c,v 1.1 2014/0
#include stdlib.h
#include string.h
#include unistd.h
+#include prop/proplib.h
#include map.h
#include gpt.h
static int force;
-static int primary_only;
const char restoremsg[] = restore [-F] device ...;
@@ -59,25 +60,40 @@ usage_restore(void)
exit(1);
}
+#define PROP_ERR(x) if (!(x)) { \
+warn(proplib failure);\
+return; \
+}
+
static void
restore(int fd)
{
- uuid_t uuid;
- off_t blocks, last;
- map_t *gpt, *tpg;
- map_t *tbl, *lbt;
+ uuid_t gpt_guid, uuid;
+ off_t firstdata, last, lastdata, gpe_start, gpe_end;
map_t *map;
struct mbr *mbr;
struct gpt_hdr *hdr;
- struct gpt_ent *ent;
+ struct gpt_ent ent;
unsigned int i;
+ prop_dictionary_t props, gpt_dict, mbr_dict, type_dict;
+ prop_object_iterator_t propiter;
+ prop_data_t propdata;
+ prop_array_t mbr_array, gpt_array;
+ prop_number_t propnum;
+ prop_string_t propstr;
+ int entries, gpt_size, rc;
+ const char *s;
+ void *secbuf;
+ uint32_t status;
last = mediasz / secsz - 1LL;
if (map_find(MAP_TYPE_PRI_GPT_HDR) != NULL ||
map_find(MAP_TYPE_SEC_GPT_HDR) != NULL) {
- warnx(%s: error: device already contains a GPT, device_name);
- return;
+ if (!force) {
+ warnx(%s: error: device contains a GPT, device_name);
+ return;
+ }
}
map = map_find(MAP_TYPE_MBR);
if (map != NULL) {
@@ -90,126 +106,241 @@ restore(int fd)
map-map_type = MAP_TYPE_UNUSED;
}
- /*
- * Create PMBR.
- */
- if (map_find(MAP_TYPE_PMBR) == NULL) {
- if (map_free(0LL, 1LL) == 0) {
- warnx(%s: error: no room for the PMBR, device_name);
- return;
- }
- mbr = gpt_read(fd, 0LL, 1);
- bzero(mbr, sizeof(*mbr));
- mbr-mbr_sig = htole16(MBR_SIG);
- mbr-mbr_part[0].part_shd = 0x00;
- mbr-mbr_part[0].part_ssect = 0x02;
- mbr-mbr_part[0].part_scyl = 0x00;
- mbr-mbr_part[0].part_typ = MBR_PTYPE_PMBR;
- mbr-mbr_part[0].part_ehd = 0xfe;
- mbr-mbr_part[0].part_esect = 0xff;
- mbr-mbr_part[0].part_ecyl = 0xff;
- mbr-mbr_part[0].part_start_lo = htole16(1);
- if (last 0x) {
- mbr-mbr_part[0].part_size_lo = htole16(0x);
- mbr-mbr_part[0].part_size_hi = htole16(0x);
- } else {
- mbr-mbr_part[0].part_size_lo = htole16(last);
- mbr-mbr_part[0].part_size_hi = htole16(last 16);
- }
- map = map_add(0LL, 1LL, MAP_TYPE_PMBR, mbr);
- gpt_write(fd, map);
- }
-
- /* Get the amount of free space after the MBR */
- blocks = map_free(1LL, 0LL);
- if (blocks == 0LL) {
- warnx(%s: error: no room for the GPT header, device_name);
+ props = prop_dictionary_internalize_from_file(/dev/stdin);
+ PROP_ERR(props);
+
+ propnum = prop_dictionary_get(props, sector_size);
+ PROP_ERR(propnum);
+ if (!prop_number_equals_integer(propnum, secsz)) {
+ warnx(%s: error: sector size does not match backup,
+ device_name);
+ prop_object_release(props);
return;
}
- /* Don't create more than parts entries. */
- if ((uint64_t)(blocks - 1) * secsz parts * sizeof(struct gpt_ent)) {
- blocks = (parts * sizeof(struct gpt_ent)) / secsz;
- if ((parts * sizeof(struct gpt_ent)) % secsz)
- blocks++;
- blocks++; /* Don't forget the header itself */
- }
-
- /* Never cross the median of the device. */
- if ((blocks + 1LL) ((last + 1LL) 1))
- blocks = ((last + 1LL) 1) - 1LL;
-
- /*
- * Get the amount of free space at the end of the device and
- * calculate the size for the GPT structures.
- */
- map = map_last();
- if (map-map_type != MAP_TYPE_UNUSED) {
- warnx(%s: error: no room for the backup header, device_name);
+ gpt_dict = prop_dictionary_get(props, GPT_HDR);
+ PROP_ERR(gpt_dict);
+
+ propnum = prop_dictionary_get(gpt_dict, revision);
+ PROP_ERR(propnum);
+ if
CVS commit: src/sbin/gpt
Module Name:src Committed By: jnemeth Date: Sat Sep 20 22:36:09 UTC 2014 Modified Files: src/sbin/gpt: gpt.8 Log Message: document the new restore subcommand To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/gpt.8 diff -u src/sbin/gpt/gpt.8:1.28 src/sbin/gpt/gpt.8:1.29 --- src/sbin/gpt/gpt.8:1.28 Thu Dec 19 07:49:50 2013 +++ src/sbin/gpt/gpt.8 Sat Sep 20 22:36:09 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: gpt.8,v 1.28 2013/12/19 07:49:50 wiz Exp $ +.\ $NetBSD: gpt.8,v 1.29 2014/09/20 22:36:09 jnemeth Exp $ .\ .\ Copyright (c) 2002 Marcel Moolenaar .\ All rights reserved. @@ -26,7 +26,7 @@ .\ .\ $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $ .\ -.Dd December 19, 2013 +.Dd September 20, 2014 .Dt GPT 8 .Os .Sh NAME @@ -354,6 +354,24 @@ If the .Fl a option is specified then the size will be adjusted to be a multiple of alignment if possible. +.\ restore +.It Nm Ic restore Oo Fl F Oc Ar device ... +The +.Ic restore +command restores a partition table that was previously saved using the +.Ic backup +command. +The partition table is read from standard input and is expected to be in +the format of a plist. +It assumes an empty disk. +The +.Fl F +option can be used to blank the disk. +The new disk does not have to be the same size as the old disk as long as all +the partitions fit, as +.Ic restore +will automatically adjust. +However, the new disk must use the same sector size as the old disk. .\ set .It Nm Ic set Fl a Ar attribute Fl i Ar index Ar device ... The
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Wed Sep 10 10:49:44 UTC 2014
Modified Files:
src/sbin/gpt: backup.c
Log Message:
- dump all partitions, not just ones that are in use
- while here, squash a memory leak
It shouldn't be necessary to backup unused partitions, however
the partition GUID is created at the time the GPT is created and
is never changed. It shouldn't matter if the GUID of an unused
partition changes, but there may be some special case where it
does. Since it isn't a big deal to record the unused partitions,
might as well do it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/gpt/backup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/backup.c
diff -u src/sbin/gpt/backup.c:1.2 src/sbin/gpt/backup.c:1.3
--- src/sbin/gpt/backup.c:1.2 Tue Sep 9 06:30:09 2014
+++ src/sbin/gpt/backup.c Wed Sep 10 10:49:44 2014
@@ -29,7 +29,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: backup.c,v 1.2 2014/09/09 06:30:09 jnemeth Exp $);
+__RCSID($NetBSD: backup.c,v 1.3 2014/09/10 10:49:44 jnemeth Exp $);
#endif
#include sys/bootblock.h
@@ -216,12 +216,11 @@ backup(void)
type_dict = prop_dictionary_create();
PROP_ERR(type_dict);
ent = m-map_data;
- gpt_array = NULL;
+ gpt_array = prop_array_create();
+ PROP_ERR(gpt_array);
for (i = 1, ent = m-map_data;
(char *)ent (char *)(m-map_data) +
m-map_size * secsz; i++, ent++) {
-if (uuid_is_nil((uuid_t *)ent-ent_type, NULL))
- continue;
gpt_dict = prop_dictionary_create();
PROP_ERR(gpt_dict);
propnum = prop_number_create_integer(i);
@@ -267,19 +266,13 @@ backup(void)
name, propstr);
PROP_ERR(rc);
}
-if (gpt_array == NULL) {
- gpt_array = prop_array_create();
- PROP_ERR(gpt_array);
-}
rc = prop_array_add(gpt_array, gpt_dict);
PROP_ERR(rc);
}
- if (gpt_array != NULL) {
-rc = prop_dictionary_set(type_dict,
-gpt_array, gpt_array);
-PROP_ERR(rc);
-prop_object_release(gpt_array);
- }
+ rc = prop_dictionary_set(type_dict,
+ gpt_array, gpt_array);
+ PROP_ERR(rc);
+ prop_object_release(gpt_array);
rc = prop_dictionary_set(props, GPT_TBL, type_dict);
PROP_ERR(rc);
prop_object_release(type_dict);
@@ -291,6 +284,7 @@ backup(void)
PROP_ERR(propext);
prop_object_release(props);
fputs(propext, stdout);
+ free(propext);
}
int
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Tue Sep 9 06:30:09 UTC 2014
Modified Files:
src/sbin/gpt: backup.c
Log Message:
- record the sector size of the disk
- correct confusion with end_cylinder and end_sector in MBRs
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/gpt/backup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/backup.c
diff -u src/sbin/gpt/backup.c:1.1 src/sbin/gpt/backup.c:1.2
--- src/sbin/gpt/backup.c:1.1 Thu Dec 19 06:46:51 2013
+++ src/sbin/gpt/backup.c Tue Sep 9 06:30:09 2014
@@ -29,7 +29,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: backup.c,v 1.1 2013/12/19 06:46:51 jnemeth Exp $);
+__RCSID($NetBSD: backup.c,v 1.2 2014/09/09 06:30:09 jnemeth Exp $);
#endif
#include sys/bootblock.h
@@ -82,6 +82,10 @@ backup(void)
props = prop_dictionary_create();
PROP_ERR(props);
+ propnum = prop_number_create_integer(secsz);
+ PROP_ERR(propnum);
+ rc = prop_dictionary_set(props, sector_size, propnum);
+ PROP_ERR(rc);
m = map_first();
while (m != NULL) {
switch (m-map_type) {
@@ -139,6 +143,11 @@ backup(void)
propnum = prop_number_create_unsigned_integer(mbr-mbr_part[i].part_esect);
PROP_ERR(propnum);
rc = prop_dictionary_set(mbr_dict,
+ end_sector, propnum);
+ PROP_ERR(rc);
+ propnum = prop_number_create_unsigned_integer(mbr-mbr_part[i].part_ecyl);
+ PROP_ERR(propnum);
+ rc = prop_dictionary_set(mbr_dict,
end_cylinder, propnum);
PROP_ERR(rc);
propnum = prop_number_create_unsigned_integer(le16toh(mbr-mbr_part[i].part_start_lo));
CVS commit: src
Module Name:src Committed By: jnemeth Date: Sun Aug 24 07:59:23 UTC 2014 Modified Files: src/share/man/man4: options.4 src/sys/arch/amd64/conf: ALL GENERIC src/sys/arch/dreamcast/conf: GENERIC src/sys/arch/epoc32/conf: GENERIC src/sys/arch/evbarm/conf: BCM5301X BCM56340 IMX23_OLINUXINO std.beagle std.cubie std.kobo std.netwalker std.odroid std.rpi src/sys/arch/evbppc/conf: P2020DS RB800 TWRP1025 src/sys/arch/hp300/conf: GENERIC src/sys/arch/hpcsh/conf: GENERIC src/sys/arch/i386/conf: GENERIC MONOLITHIC src/sys/arch/landisk/conf: GENERIC src/sys/arch/luna68k/conf: GENERIC src/sys/arch/macppc/conf: GENERIC GENERIC_601 src/sys/arch/mmeye/conf: MMEYE_WLF src/sys/arch/news68k/conf: GENERIC src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/shark/conf: GENERIC src/sys/arch/sparc/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC src/sys/arch/sun3/conf: GENERIC GENERIC3X src/sys/arch/x68k/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC src/sys/conf: files src/sys/kern: kern_module.c Log Message: Create an options MODULAR_DEFAULT_AUTOLOAD config option and add it to all kernel configs that contain options MODULAR. This option turns on module autoloading by default (which is the current default). This allows people who don't want module autoloading on by default to disable it by simply removing/commentting this line. To generate a diff of this commit: cvs rdiff -u -r1.441 -r1.442 src/share/man/man4/options.4 cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.395 -r1.396 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.118 -r1.119 src/sys/arch/dreamcast/conf/GENERIC cvs rdiff -u -r1.5 -r1.6 src/sys/arch/epoc32/conf/GENERIC cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/BCM5301X cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/BCM56340 \ src/sys/arch/evbarm/conf/IMX23_OLINUXINO cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/std.beagle cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/std.cubie \ src/sys/arch/evbarm/conf/std.odroid cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.kobo cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/std.netwalker cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/std.rpi cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbppc/conf/P2020DS cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/conf/RB800 cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/conf/TWRP1025 cvs rdiff -u -r1.186 -r1.187 src/sys/arch/hp300/conf/GENERIC cvs rdiff -u -r1.103 -r1.104 src/sys/arch/hpcsh/conf/GENERIC cvs rdiff -u -r1.1110 -r1. src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/MONOLITHIC cvs rdiff -u -r1.42 -r1.43 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.116 -r1.117 src/sys/arch/luna68k/conf/GENERIC cvs rdiff -u -r1.315 -r1.316 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.4 -r1.5 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mmeye/conf/MMEYE_WLF cvs rdiff -u -r1.122 -r1.123 src/sys/arch/news68k/conf/GENERIC cvs rdiff -u -r1.84 -r1.85 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.118 -r1.119 src/sys/arch/shark/conf/GENERIC cvs rdiff -u -r1.245 -r1.246 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.173 -r1.174 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.168 -r1.169 src/sys/arch/sun3/conf/GENERIC cvs rdiff -u -r1.124 -r1.125 src/sys/arch/sun3/conf/GENERIC3X cvs rdiff -u -r1.176 -r1.177 src/sys/arch/x68k/conf/GENERIC cvs rdiff -u -r1.61 -r1.62 src/sys/arch/zaurus/conf/GENERIC cvs rdiff -u -r1.1098 -r1.1099 src/sys/conf/files cvs rdiff -u -r1.97 -r1.98 src/sys/kern/kern_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.441 src/share/man/man4/options.4:1.442 --- src/share/man/man4/options.4:1.441 Thu Aug 21 07:51:32 2014 +++ src/share/man/man4/options.4 Sun Aug 24 07:59:22 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.441 2014/08/21 07:51:32 apb Exp $ +.\ $NetBSD: options.4,v 1.442 2014/08/24 07:59:22 jnemeth Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd August 16, 2014 +.Dd August 23, 2014 .Dt OPTIONS 4 .Os .Sh NAME @@ -1231,6 +1231,12 @@ Possible values include .It Cd options MODULAR Enables the framework for kernel modules (see .Xr module 7 ) . +.It Cd options MODULAR_DEFAULT_AUTOLOAD +Enables the autoloading of kernel modules by default. +This sets the default value of the +.Em kern.module.autoload +.Xr sysctl 3 +variable which may be changed at run time. .It Cd options VND_COMPRESSION Enables the .Xr vnd 4 Index: src/sys/arch/amd64/conf/ALL diff -u
CVS commit: src/doc
Module Name:src Committed By: jnemeth Date: Sun Aug 24 08:05:29 UTC 2014 Modified Files: src/doc: CHANGES Log Message: mention MODULAR_DEFAULT_AUTOLOAD To generate a diff of this commit: cvs rdiff -u -r1.1970 -r1.1971 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1970 src/doc/CHANGES:1.1971 --- src/doc/CHANGES:1.1970 Mon Aug 18 07:03:33 2014 +++ src/doc/CHANGES Sun Aug 24 08:05:29 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1970 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1971 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -28,4 +28,7 @@ Changes from NetBSD 7.0 to NetBSD 8.0: libc: Update to tzcode2014f. [christos 20140815] gmake: Update to gmake-3.81 in external/gpl2/gmake and remove gnu/dist/gmake (3.80) [christos 20140818] + module(7): Create MODULAR_DEFAULT_AUTOLOAD config flag to control + whether module autoloading is on by default. + [jnemeth 20140824]
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: jnemeth Date: Tue Aug 19 18:20:51 UTC 2014 Modified Files: src/sys/arch/sparc64/dev: fdc.c Log Message: Sync with sparc/dev/fd.c:1.155. Fix panic() on opening fd(4), caused by a wrong pointer passed to memset(). I'm not sure why this 18 year old bug didn't cause problem before (at least my old 5.99.23 kernel worked), but probably it's triggered by new gcc 4.8 which might do more aggressive memory allocation. The problem is found by Nobuyoshi Sato on trying eject(1) against fd(4). Should be pulled up to netbsd-7. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sparc64/dev/fdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/dev/fdc.c diff -u src/sys/arch/sparc64/dev/fdc.c:1.41 src/sys/arch/sparc64/dev/fdc.c:1.42 --- src/sys/arch/sparc64/dev/fdc.c:1.41 Fri Jul 25 08:10:35 2014 +++ src/sys/arch/sparc64/dev/fdc.c Tue Aug 19 18:20:51 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fdc.c,v 1.41 2014/07/25 08:10:35 dholland Exp $ */ +/* $NetBSD: fdc.c,v 1.42 2014/08/19 18:20:51 jnemeth Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fdc.c,v 1.41 2014/07/25 08:10:35 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: fdc.c,v 1.42 2014/08/19 18:20:51 jnemeth Exp $); #include opt_ddb.h #include opt_md.h @@ -2430,7 +2430,7 @@ fdgetdisklabel(dev_t dev) struct cpu_disklabel *clp = fd-sc_dk.dk_cpulabel; memset(lp, 0, sizeof(struct disklabel)); - memset(lp, 0, sizeof(struct cpu_disklabel)); + memset(clp, 0, sizeof(struct cpu_disklabel)); lp-d_type = DTYPE_FLOPPY; lp-d_secsize = FD_BSIZE(fd);
CVS commit: src/usr.sbin/syslogd
Module Name:src
Committed By: jnemeth
Date: Mon Aug 18 05:21:16 UTC 2014
Modified Files:
src/usr.sbin/syslogd: syslogd.c
Log Message:
- when checking hostname of incoming remote messages, fallback to checking
remote host if the message doesn't contain a hostname
- don't truncate IP addresses when reading syslogd.conf
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/usr.sbin/syslogd/syslogd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.119 src/usr.sbin/syslogd/syslogd.c:1.120
--- src/usr.sbin/syslogd/syslogd.c:1.119 Wed Nov 27 20:48:28 2013
+++ src/usr.sbin/syslogd/syslogd.c Mon Aug 18 05:21:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.119 2013/11/27 20:48:28 christos Exp $ */
+/* $NetBSD: syslogd.c,v 1.120 2014/08/18 05:21:16 jnemeth Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)syslogd.c 8.3 (Berkeley) 4/4/94;
#else
-__RCSID($NetBSD: syslogd.c,v 1.119 2013/11/27 20:48:28 christos Exp $);
+__RCSID($NetBSD: syslogd.c,v 1.120 2014/08/18 05:21:16 jnemeth Exp $);
#endif
#endif /* not lint */
@@ -1854,21 +1854,22 @@ logmsg(struct buf_msg *buffer)
}
for (f = Files; f; f = f-f_next) {
+ char *h; /* host to use for comparing */
+
/* skip messages that are incorrect priority */
if (!MATCH_PRI(f, fac, prilev)
|| f-f_pmask[fac] == INTERNAL_NOPRI)
continue;
/* skip messages with the incorrect host name */
- /* do we compare with host (IMHO correct) or recvhost */
- /* (compatible)? */
- if (f-f_host != NULL buffer-host != NULL) {
- char shost[MAXHOSTNAMELEN + 1], *h;
- if (!BSDOutputFormat) {
-h = buffer-host;
- } else {
-(void)strlcpy(shost, buffer-host,
-sizeof(shost));
+ /* compare with host (which is supposedly more correct), */
+ /* but fallback to recvhost if host is NULL */
+ h = (buffer-host != NULL) ? buffer-host : buffer-recvhost;
+ if (f-f_host != NULL h != NULL) {
+ char shost[MAXHOSTNAMELEN + 1];
+
+ if (BSDOutputFormat) {
+(void)strlcpy(shost, h, sizeof(shost));
trim_anydomain(shost);
h = shost;
}
@@ -3740,7 +3741,7 @@ cfline(size_t linenum, const char *line,
f-f_host = NULL;
else {
f-f_host = strdup(host);
- trim_anydomain(f-f_host);
+ trim_anydomain(f-f_host[1]); /* skip +/- at beginning */
}
/* save program name, if any */
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sun Aug 10 18:27:16 UTC 2014
Modified Files:
src/sbin/gpt: Makefile gpt.c gpt.h
Added Files:
src/sbin/gpt: restore.c
Log Message:
Add restore subcommand.
XXX It does not actually work yet. It is being committed now to make
later pullups easier.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/Makefile
cvs rdiff -u -r1.27 -r1.28 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.10 -r1.11 src/sbin/gpt/gpt.h
cvs rdiff -u -r0 -r1.1 src/sbin/gpt/restore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/Makefile
diff -u src/sbin/gpt/Makefile:1.7 src/sbin/gpt/Makefile:1.8
--- src/sbin/gpt/Makefile:1.7 Thu Dec 19 06:46:51 2013
+++ src/sbin/gpt/Makefile Sun Aug 10 18:27:15 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2013/12/19 06:46:51 jnemeth Exp $
+# $NetBSD: Makefile,v 1.8 2014/08/10 18:27:15 jnemeth Exp $
# $FreeBSD: src/sbin/gpt/Makefile,v 1.7 2005/09/01 02:49:20 marcel Exp $
PROG= gpt
SRCS= add.c backup.c biosboot.c create.c destroy.c gpt.c label.c map.c \
- migrate.c recover.c remove.c resize.c set.c show.c unset.c
+ migrate.c recover.c remove.c resize.c restore.c set.c show.c unset.c
MAN= gpt.8
LDADD+= -lprop -lutil
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.27 src/sbin/gpt/gpt.c:1.28
--- src/sbin/gpt/gpt.c:1.27 Thu Dec 19 06:46:51 2013
+++ src/sbin/gpt/gpt.c Sun Aug 10 18:27:15 2014
@@ -31,7 +31,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: gpt.c,v 1.27 2013/12/19 06:46:51 jnemeth Exp $);
+__RCSID($NetBSD: gpt.c,v 1.28 2014/08/10 18:27:15 jnemeth Exp $);
#endif
#include sys/param.h
@@ -728,6 +728,7 @@ static struct {
{ cmd_remove, remove },
{ NULL, rename },
{ cmd_resize, resize },
+ { cmd_restore, restore },
{ cmd_set, set },
{ cmd_show, show },
{ cmd_unset, unset },
@@ -741,8 +742,8 @@ usage(void)
extern const char addmsg1[], addmsg2[], backupmsg[], biosbootmsg[];
extern const char createmsg[], destroymsg[], labelmsg1[], labelmsg2[];
extern const char labelmsg3[], migratemsg[], recovermsg[], removemsg1[];
- extern const char removemsg2[], resizemsg[], setmsg[], showmsg[];
- extern const char unsetmsg[];
+ extern const char removemsg2[], resizemsg[], restoremsg[], setmsg[];
+ extern const char showmsg[], unsetmsg[];
fprintf(stderr,
usage: %s %s\n
@@ -761,6 +762,7 @@ usage(void)
%s %s\n
%s %s\n
%s %s\n
+ %s %s\n
%s %s\n,
getprogname(), addmsg1,
getprogname(), addmsg2,
@@ -776,6 +778,7 @@ usage(void)
getprogname(), removemsg1,
getprogname(), removemsg2,
getprogname(), resizemsg,
+ getprogname(), restoremsg,
getprogname(), setmsg,
getprogname(), showmsg,
getprogname(), unsetmsg);
Index: src/sbin/gpt/gpt.h
diff -u src/sbin/gpt/gpt.h:1.10 src/sbin/gpt/gpt.h:1.11
--- src/sbin/gpt/gpt.h:1.10 Thu Dec 19 06:46:51 2013
+++ src/sbin/gpt/gpt.h Sun Aug 10 18:27:15 2014
@@ -89,6 +89,7 @@ int cmd_migrate(int, char *[]);
int cmd_recover(int, char *[]);
int cmd_remove(int, char *[]);
int cmd_resize(int, char *[]);
+int cmd_restore(int, char *[]);
int cmd_set(int, char *[]);
int cmd_show(int, char *[]);
int cmd_unset(int, char *[]);
Added files:
Index: src/sbin/gpt/restore.c
diff -u /dev/null src/sbin/gpt/restore.c:1.1
--- /dev/null Sun Aug 10 18:27:16 2014
+++ src/sbin/gpt/restore.c Sun Aug 10 18:27:15 2014
@@ -0,0 +1,246 @@
+/*-
+ * Copyright (c) 2002 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
CVS commit: src
Module Name:src Committed By: jnemeth Date: Mon Aug 11 03:43:26 UTC 2014 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 src/doc: CHANGES src/share/mk: bsd.own.mk src/sys/arch/x86/x86: x86_machdep.c src/sys/kern: kern_module.c src/sys/modules/arch: archdirs.mk Added Files: src/sys/modules/arch/x86/amd64-xen: Makefile bsd.amd64-xen.mk src/sys/modules/arch/x86/i386-xen: Makefile bsd.i386-xen.mk src/sys/modules/arch/x86/i386pae-xen: Makefile bsd.i386pae-xen.mk Log Message: Add the infrastructure for MODULAR support for Xen kernels. At the moment, this can only load very simple modules due to missing symbols. It is being add at this time to make pullups to the netbsd-7 branch easier. It is not enabled by default in any kernels. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.1966 -r1.1967 src/doc/CHANGES cvs rdiff -u -r1.828 -r1.829 src/share/mk/bsd.own.mk cvs rdiff -u -r1.66 -r1.67 src/sys/arch/x86/x86/x86_machdep.c cvs rdiff -u -r1.96 -r1.97 src/sys/kern/kern_module.c cvs rdiff -u -r1.1 -r1.2 src/sys/modules/arch/archdirs.mk cvs rdiff -u -r0 -r1.1 src/sys/modules/arch/x86/amd64-xen/Makefile \ src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk cvs rdiff -u -r0 -r1.1 src/sys/modules/arch/x86/i386-xen/Makefile \ src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk cvs rdiff -u -r0 -r1.1 src/sys/modules/arch/x86/i386pae-xen/Makefile \ src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.39 src/distrib/sets/lists/modules/md.amd64:1.40 --- src/distrib/sets/lists/modules/md.amd64:1.39 Sat Aug 9 12:34:05 2014 +++ src/distrib/sets/lists/modules/md.amd64 Mon Aug 11 03:43:25 2014 @@ -1,4 +1,8 @@ -# $NetBSD: md.amd64,v 1.39 2014/08/09 12:34:05 bad Exp $ +# $NetBSD: md.amd64,v 1.40 2014/08/11 03:43:25 jnemeth Exp $ +# +# NOTE that there are two sets of files here: +# @MODULEDIR@ and amd64-xen +# ./@MODULEDIR@/acpiacadbase-kernel-modules kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod ./@MODULEDIR@/acpibatbase-kernel-modules kmod @@ -139,3 +143,358 @@ ./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod ./@MODULEDIR@/zl10353base-kernel-modules kmod ./@MODULEDIR@/zl10353/zl10353.kmod base-kernel-modules kmod +./stand/amd64-xen base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@ base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/accf_dataready base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/accf_dataready/accf_dataready.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/accf_httpready base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/accf_httpready/accf_httpready.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpiacadbase-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpiacad/acpiacad.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpibatbase-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpibat/acpibat.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpibutbase-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpibut/acpibut.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpicpubase-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpicpu/acpicpu.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpidalbbase-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpidalb/acpidalb.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpifanbase-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpifan/acpifan.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpilidbase-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpilid/acpilid.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpipmtrbase-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpipmtr/acpipmtr.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpitzbase-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/acpitz/acpitz.kmod base-kernel-modules
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: jnemeth Date: Mon Aug 11 05:19:16 UTC 2014 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 Log Message: remove debug cruft, the example module is not normally built To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/modules/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.40 src/distrib/sets/lists/modules/md.amd64:1.41 --- src/distrib/sets/lists/modules/md.amd64:1.40 Mon Aug 11 03:43:25 2014 +++ src/distrib/sets/lists/modules/md.amd64 Mon Aug 11 05:19:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.40 2014/08/11 03:43:25 jnemeth Exp $ +# $NetBSD: md.amd64,v 1.41 2014/08/11 05:19:16 jnemeth Exp $ # # NOTE that there are two sets of files here: # @MODULEDIR@ and amd64-xen @@ -258,8 +258,6 @@ ./stand/amd64-xen/@OSRELEASE@/modules/emdtv/emdtv.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/estbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/est/est.kmod base-kernel-modules kmod,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/examplebase-kernel-modules kmod,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/example/example.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/exec_elf32 base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/exec_elf32/exec_elf32.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/exec_elf64 base-kernel-modules kmod,compatmodules Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.45 src/distrib/sets/lists/modules/md.i386:1.46 --- src/distrib/sets/lists/modules/md.i386:1.45 Mon Aug 11 03:43:25 2014 +++ src/distrib/sets/lists/modules/md.i386 Mon Aug 11 05:19:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.45 2014/08/11 03:43:25 jnemeth Exp $ +# $NetBSD: md.i386,v 1.46 2014/08/11 05:19:16 jnemeth Exp $ # # NOTE that there are three sets of files here: # @MODULEDIR@, i386-xen, and i386pae-xen @@ -288,8 +288,6 @@ ./stand/i386-xen/@OSRELEASE@/modules/emdtv/emdtv.kmod base-kernel-modules kmod,compatmodules ./stand/i386-xen/@OSRELEASE@/modules/estbase-kernel-modules kmod,compatmodules ./stand/i386-xen/@OSRELEASE@/modules/est/est.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/examplebase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/example/example.kmod base-kernel-modules kmod,compatmodules ./stand/i386-xen/@OSRELEASE@/modules/exec_aoutbase-kernel-modules kmod,compatmodules ./stand/i386-xen/@OSRELEASE@/modules/exec_aout/exec_aout.kmod base-kernel-modules kmod,compatmodules ./stand/i386-xen/@OSRELEASE@/modules/exec_elf32base-kernel-modules kmod,compatmodules @@ -669,8 +667,6 @@ ./stand/i386pae-xen/@OSRELEASE@/modules/emdtv/emdtv.kmod base-kernel-modules kmod,compatmodules ./stand/i386pae-xen/@OSRELEASE@/modules/estbase-kernel-modules kmod,compatmodules ./stand/i386pae-xen/@OSRELEASE@/modules/est/est.kmod base-kernel-modules kmod,compatmodules -./stand/i386pae-xen/@OSRELEASE@/modules/examplebase-kernel-modules kmod,compatmodules -./stand/i386pae-xen/@OSRELEASE@/modules/example/example.kmod base-kernel-modules kmod,compatmodules ./stand/i386pae-xen/@OSRELEASE@/modules/exec_aout base-kernel-modules kmod,compatmodules ./stand/i386pae-xen/@OSRELEASE@/modules/exec_aout/exec_aout.kmod base-kernel-modules kmod,compatmodules ./stand/i386pae-xen/@OSRELEASE@/modules/exec_elf32 base-kernel-modules kmod,compatmodules
CVS commit: src/share/misc
Module Name:src Committed By: jnemeth Date: Sat Jun 14 02:05:38 UTC 2014 Modified Files: src/share/misc: acronyms.comp Log Message: PR/48902 - Nikolai Nifanov -- add XSI To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.141 src/share/misc/acronyms.comp:1.142 --- src/share/misc/acronyms.comp:1.141 Sat Sep 28 18:01:49 2013 +++ src/share/misc/acronyms.comp Sat Jun 14 02:05:38 2014 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.141 2013/09/28 18:01:49 dholland Exp $ +$NetBSD: acronyms.comp,v 1.142 2014/06/14 02:05:38 jnemeth Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1353,6 +1353,7 @@ XIP execute in place XML Extensible Markup Language XOR exclusive or XP extreme programming +XSI X/Open System Interface XSL extensible stylesheet language XSS cross site scripting XT extended technology
