Rename pb-nc, pb-twin to petitboot-nc, petitboot-twin

Signed-off-by: Geoff Levand <geoff@infradead.org>

diff --git a/man/Makefile.am b/man/Makefile.am
index ed81c99aaf07b66baeebc8a43d947256bf89aad7..4d4301bd4246ba96a9b5d7f7158ba819b07a7d3f 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -12,6 +12,6 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 

-dist_man_MANS = pb-discover.8 pb-event.8 pb-nc.8 pb-twin.8 pb-udhcpc.8 petitboot.8
+dist_man_MANS = pb-discover.8 pb-event.8 petitboot-nc.8 petitboot-twin.8 pb-udhcpc.8 petitboot.8

 
 MAINTAINERCLEANFILES = Makefile.in
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/man/pb-discover.8 b/man/pb-discover.8
index 6b7be182297f8e1474f3e13a6d72be48be0ecfcb..4f6bc3941917ed7e2dbbfb82b0be0d075456763c 100644 (file)
--- a/man/pb-discover.8
+++ b/man/pb-discover.8
@@ -14,12 +14,6 @@
 .\" along with this program; if not, write to the Free Software
 .\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 .\"
 .\" along with this program; if not, write to the Free Software
 .\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 .\"

-.\" Maintainer's Notes:
-.\"  * For syntax help see the man pages for 'mdoc' and 'mdoc.samples'.
-.\"  * To check syntax use this:
-.\"    'groff -C -mtty-char -Tutf8 -man pb-discover.8'.
-.\"  * To check format use this: 'less pb-discover.8'.
-.\"

 .Dd ""
 .Dt pb-discover 8
 .Os
 .Dd ""
 .Dt pb-discover 8
 .Os


@@ -41,7 +35,7 @@ pb-discover daemon and receive boot option information.
 .\"
 .Sh SEE ALSO
 .\" ========
 .\"
 .Sh SEE ALSO
 .\" ========

-.Xr petitboot 8 , Xr pb-nc 8 , Xr pb-twin 8 , Xr pb-event 8
+.Xr petitboot 8 , Xr petitboot-nc 8 , Xr petitboot-twin 8 , Xr pb-event 8

 .\"
 .Sh REPORTING BUGS
 .\" ==============
 .\"
 .Sh REPORTING BUGS
 .\" ==============

diff --git a/man/pb-event.8 b/man/pb-event.8
index d762aced8b4b571a7e8e8560ab73636aa7615e11..e2f99b93d6de04d7fd3a4a810fcfb7797fe6df69 100644 (file)
--- a/man/pb-event.8
+++ b/man/pb-event.8
@@ -14,12 +14,6 @@
 .\" along with this program; if not, write to the Free Software
 .\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 .\"
 .\" along with this program; if not, write to the Free Software
 .\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 .\"

-.\" Maintainer's Notes:
-.\"  * For syntax help see the man pages for 'mdoc' and 'mdoc.samples'.
-.\"  * To check syntax use this:
-.\"    'groff -C -mtty-char -Tutf8 -man pb-event.8'.
-.\"  * To check format use this: 'less pb-event.8'.
-.\"

 .Dd ""
 .Dt pb-event 8
 .Os
 .Dd ""
 .Dt pb-event 8
 .Os


@@ -40,7 +34,7 @@ petitboot device discovery daemon.
 .\"
 .Sh SEE ALSO
 .\" ========
 .\"
 .Sh SEE ALSO
 .\" ========

-.Xr petitboot 8 , Xr pb-nc 8 , Xr pb-twin 8 , Xr pb-discover 8
+.Xr petitboot 8 , Xr petitboot-nc 8 , Xr petitboot-twin 8 , Xr pb-discover 8

 .\"
 .Sh REPORTING BUGS
 .\" ==============
 .\"
 .Sh REPORTING BUGS
 .\" ==============

diff --git a/man/pb-nc.8 b/man/pb-nc.8
deleted file mode 100644 (file)
index 16ee654..0000000
--- a/man/pb-nc.8
+++ /dev/null
@@ -1,71 +0,0 @@
-.\" Copyright (C) 2009 Sony Computer Entertainment Inc.
-.\" Copyright 2009 Sony Corp.
-.\"
-.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; version 2 of the License.
-.\"
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-.\"
-.\" Maintainer's Notes:
-.\"  * For syntax help see the man pages for 'mdoc' and 'mdoc.samples'.
-.\"  * To check syntax use this:
-.\"    'groff -C -mtty-char -Tutf8 -man pb-nc.8'.
-.\"  * To check format use this: 'less pb-nc.8'.
-.\"
-.Dd ""
-.Dt pb-nc 8
-.Os
-.\"
-.Sh NAME
-.\" ====
-.Nm pb-nc
-.Nd Petitboot ncurses bootloader UI
-.\"
-.Sh SYNOPSIS
-.\" ========
-.Nm
-.Op Fl h, -help
-.Op Fl l, -log Ar log-file
-.Op Fl V, -version
-.\"
-.Sh DESCRIPTION
-.\" ===========
-pb-nc is an ncurses based interface to the Petitboot bootloader.
-.Pp
-Petitboot is a Linux kexec based bootloader that supports loading Linux
-kernel and initrd images from any device that can be mounted by Linux.
-It can also load images from the network using the
-HTTP, HTTPS, NFS, SFTP, and TFTP
-protocols.
-.\"
-.Sh OPTIONS
-.\" =======
-.Bl -tag -width indent
-.\"
-.It Fl h, -help
-Print a help message.
-.\"
-.It Fl l, -log Ar log-file
-Log messages to the file
-.Ar log-file .
-The default log is a file pb-nc.log in the directory where pb-nc
-is started.  New messages are appended to an existing log file.
-.\"
-.It Fl V, -version
-Display the program version number.
-.El
-.Sh SEE ALSO
-.\" ========
-.Xr petitboot 8 , Xr pb-twin 8 , Xr pb-discover 8 , Xr pb-event 8
-.\"
-.Sh REPORTING BUGS
-.\" ==============
-Send bug reports to Geoff Levand <geoff @ infradead.org>

diff --git a/man/pb-twin.8 b/man/pb-twin.8
deleted file mode 100644 (file)
index fe4265c..0000000
--- a/man/pb-twin.8
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" Copyright (C) 2009 Sony Computer Entertainment Inc.
-.\" Copyright 2009 Sony Corp.
-.\"
-.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; version 2 of the License.
-.\"
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-.\"
-.Dd ""
-.Dt pb-twin 8
-.Os
-.\"
-.Sh NAME
-.\" ====
-.Nm pb-twin
-.Nd Petitboot twin bootloader UI
-.\"
-.Sh SYNOPSIS
-.\" ========
-.Nm
-.Op Fl h, -help
-.Op Fl l, -log Ar log-file
-.Op Fl V, -version
-.Op Fl V, -version
-.Op Fl f, -fbdev
-.Op Fl x, -x11
-.\"
-.Sh DESCRIPTION
-.\" ===========
-pb-twin is a twin based interface to the Petitboot bootloader.
-.Pp
-Petitboot is a Linux kexec based bootloader that supports loading Linux
-kernel and initrd images from any device that can be mounted by Linux.
-It can also load images from the network using the
-HTTP, HTTPS, NFS, SFTP, and TFTP
-protocols.
-.\"
-.Sh OPTIONS
-.\" =======
-.Bl -tag -width indent
-.\"
-.It Fl h, -help
-Print a help message.
-.\"
-.It Fl l, -log Ar log-file
-Log messages to the file
-.Ar log-file .
-The default log is a file pb-twin.log in the directory where pb-twin
-is started.  New messages are appended to an existing log file.
-.\"
-.It Fl V, -version
-Display the program version number.
-.El
-.Sh SEE ALSO
-.\" ========
-.Xr petitboot 8 , Xr pb-twin 8 , Xr pb-discover 8 , Xr pb-event 8
-.\"
-.Sh REPORTING BUGS
-.\" ==============
-Send bug reports to Geoff Levand <geoff @ infradead.org>

diff --git a/man/pb-udhcpc.8 b/man/pb-udhcpc.8
index 8a0eb6b378d96003ed59fe533ad305560cf1c3d2..dbc7f52b5f54d1398acb76fdd8393bbab7b913b6 100644 (file)
--- a/man/pb-udhcpc.8
+++ b/man/pb-udhcpc.8
@@ -31,7 +31,7 @@ Documentation/filesystems/nfsroot.txt.
 .\"
 .Sh SEE ALSO
 .\" ========
 .\"
 .Sh SEE ALSO
 .\" ========

-.Xr petitboot 8 , Xr pb-nc 8 , Xr pb-twin 8 , Xr pb-discover 8 , Xr pb-event 8
+.Xr petitboot 8 , Xr petitboot-nc 8 , Xr petitboot-twin 8 , Xr pb-discover 8 , Xr pb-event 8

 .\"
 .Sh REPORTING BUGS
 .\" ==============
 .\"
 .Sh REPORTING BUGS
 .\" ==============

diff --git a/man/petitboot-nc.8 b/man/petitboot-nc.8
new file mode 100644 (file)
index 0000000..3135655
--- /dev/null
+++ b/man/petitboot-nc.8
@@ -0,0 +1,65 @@
+.\" Copyright (C) 2009 Sony Computer Entertainment Inc.
+.\" Copyright 2009 Sony Corp.
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; version 2 of the License.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+.\"
+.Dd ""
+.Dt petitboot-nc 8
+.Os
+.\"
+.Sh NAME
+.\" ====
+.Nm petitboot-nc
+.Nd Petitboot ncurses bootloader UI
+.\"
+.Sh SYNOPSIS
+.\" ========
+.Nm
+.Op Fl h, -help
+.Op Fl l, -log Ar log-file
+.Op Fl V, -version
+.\"
+.Sh DESCRIPTION
+.\" ===========
+petitboot-nc is an ncurses based interface to the Petitboot bootloader.
+.Pp
+Petitboot is a Linux kexec based bootloader that supports loading Linux
+kernel and initrd images from any device that can be mounted by Linux.
+It can also load images from the network using the
+HTTP, HTTPS, NFS, SFTP, and TFTP
+protocols.
+.\"
+.Sh OPTIONS
+.\" =======
+.Bl -tag -width indent
+.\"
+.It Fl h, -help
+Print a help message.
+.\"
+.It Fl l, -log Ar log-file
+Log messages to the file
+.Ar log-file .
+The default log is a file /var/log/petitboot-nc.log.  New messages are
+appended to an existing log file.
+.\"
+.It Fl V, -version
+Display the program version number.
+.El
+.Sh SEE ALSO
+.\" ========
+.Xr petitboot 8 , Xr petitboot-twin 8 , Xr pb-discover 8 , Xr pb-event 8
+.\"
+.Sh REPORTING BUGS
+.\" ==============
+Send bug reports to Geoff Levand <geoff @ infradead.org>

diff --git a/man/petitboot-twin.8 b/man/petitboot-twin.8
new file mode 100644 (file)
index 0000000..eef9ff3
--- /dev/null
+++ b/man/petitboot-twin.8
@@ -0,0 +1,68 @@
+.\" Copyright (C) 2009 Sony Computer Entertainment Inc.
+.\" Copyright 2009 Sony Corp.
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; version 2 of the License.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+.\"
+.Dd ""
+.Dt petitboot-twin 8
+.Os
+.\"
+.Sh NAME
+.\" ====
+.Nm petitboot-twin
+.Nd Petitboot twin bootloader UI
+.\"
+.Sh SYNOPSIS
+.\" ========
+.Nm
+.Op Fl h, -help
+.Op Fl l, -log Ar log-file
+.Op Fl V, -version
+.Op Fl V, -version
+.Op Fl f, -fbdev
+.Op Fl x, -x11
+.\"
+.Sh DESCRIPTION
+.\" ===========
+petitboot-twin is a twin based interface to the Petitboot bootloader.
+.Pp
+Petitboot is a Linux kexec based bootloader that supports loading Linux
+kernel and initrd images from any device that can be mounted by Linux.
+It can also load images from the network using the
+HTTP, HTTPS, NFS, SFTP, and TFTP
+protocols.
+.\"
+.Sh OPTIONS
+.\" =======
+.Bl -tag -width indent
+.\"
+.It Fl h, -help
+Print a help message.
+.\"
+.It Fl l, -log Ar log-file
+Log messages to the file
+.Ar log-file .
+The default log is a file /var/log/petitboot-twin.log.  New messages are
+appended to an existing log file.
+.\"
+.It Fl V, -version
+Display the program version number.
+.El
+.Sh SEE ALSO
+.\" ========
+.Xr petitboot 8 , Xr pb-twin 8 , Xr pb-discover 8 , Xr pb-event 8
+.\"
+.Sh REPORTING BUGS
+.\" ==============
+Send bug reports to Geoff Levand <geoff @ infradead.org>

diff --git a/man/petitboot.8 b/man/petitboot.8
index 8ace46854821d0b4b1b47da0dd21572a2a1597eb..459c2d4d9a377f84f9e9998adbf6533cb641e60c 100644 (file)
--- a/man/petitboot.8
+++ b/man/petitboot.8
@@ -44,7 +44,7 @@ from a DHCP server.
 .\"
 .Sh SEE ALSO
 .\" ========
 .\"
 .Sh SEE ALSO
 .\" ========

-.Xr pb-nc 8 , Xr pb-twin 8 , Xr pb-discover 8 , Xr pb-event 8
+.Xr petitboot-nc 8 , Xr petitboot-twin 8 , Xr pb-discover 8 , Xr pb-event 8

 .\"
 .Sh REPORTING BUGS
 .\" ==============
 .\"
 .Sh REPORTING BUGS
 .\" ==============

diff --git a/ui/ncurses/Makefile.am b/ui/ncurses/Makefile.am
index ec8217f6e3328468afca24226ae390022f9f5f01..90b5cbf6f33314733c1ea0a184f59a1b08b2601f 100644 (file)
--- a/ui/ncurses/Makefile.am
+++ b/ui/ncurses/Makefile.am
@@ -40,19 +40,19 @@ libpbnc_la_SOURCES = \
        nc-scr.c \
        nc-scr.h
 
        nc-scr.c \
        nc-scr.h
 

-sbin_PROGRAMS = pb-nc
+sbin_PROGRAMS = petitboot-nc

 
 if ENABLE_PS3
 
 if ENABLE_PS3

-sbin_PROGRAMS += pb-nc-ps3
+sbin_PROGRAMS += petitboot-ps3-nc

 endif
 
 
 endif
 
 

-pb_nc_SOURCES = generic-main.c
-pb_nc_LDADD = $(common_libs)
+petitboot_nc_SOURCES = generic-main.c
+petitboot_nc_LDADD = $(common_libs)

 
 

-pb_nc_ps3_SOURCES = ps3-main.c
-pb_nc_ps3_LDADD = $(common_libs) $(libdir)/libps3-utils.so
-#pb_nc_ps3_LDFLAGS = -L$(libdir) -lps3-utils
+petitboot_ps3_nc_SOURCES = ps3-main.c
+petitboot_ps3_nc_LDADD = $(common_libs) $(libdir)/libps3-utils.so
+#petitboot_ps3_nc_LDFLAGS = -L$(libdir) -lps3-utils

 
 
 MAINTAINERCLEANFILES = Makefile.in
 
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/ui/twin/Makefile.am b/ui/twin/Makefile.am
index af875009b9ae4826906ecc38b3d9ea367d426b07..dc6ec533ec4068be210011e80b0b067cd7e13c8e 100644 (file)
--- a/ui/twin/Makefile.am
+++ b/ui/twin/Makefile.am
@@ -44,19 +44,19 @@ libpbt_la_SOURCES = \
        pbt-scr.c \
        pbt-scr.h
 
        pbt-scr.c \
        pbt-scr.h
 

-sbin_PROGRAMS = pb-twin
+sbin_PROGRAMS = petitboot-twin

 
 if ENABLE_PS3
 
 if ENABLE_PS3

-sbin_PROGRAMS += pb-twin-ps3
+sbin_PROGRAMS += petitboot-ps3-twin

 endif
 
 
 endif
 
 

-pb_twin_SOURCES = main-generic.c
-pb_twin_LDADD = $(common_libs)
+petitboot_twin_SOURCES = main-generic.c
+petitboot_twin_LDADD = $(common_libs)

 
 

-pb_twin_ps3_SOURCES = main-ps3.c
-pb_twin_ps3_LDADD = $(common_libs)
-pb_twin_ps3_LDFLAGS = -lps3-utils
+petitboot_ps3_twin_SOURCES = main-ps3.c
+petitboot_ps3_twin_LDADD = $(common_libs)
+petitboot_ps3_twin_LDFLAGS = -lps3-utils

 
 
 MAINTAINERCLEANFILES = Makefile.in
 
 
 MAINTAINERCLEANFILES = Makefile.in