From f3015e4c01407dee3fd54273c71a43b56b756d59 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 8 Mar 2012 18:08:08 -0800 Subject: [PATCH] Rename pb-nc, pb-twin to petitboot-nc, petitboot-twin Signed-off-by: Geoff Levand --- man/Makefile.am | 2 +- man/pb-discover.8 | 8 +------- man/pb-event.8 | 8 +------- man/pb-udhcpc.8 | 2 +- man/{pb-nc.8 => petitboot-nc.8} | 18 ++++++------------ man/{pb-twin.8 => petitboot-twin.8} | 10 +++++----- man/petitboot.8 | 2 +- ui/ncurses/Makefile.am | 14 +++++++------- ui/twin/Makefile.am | 14 +++++++------- 9 files changed, 30 insertions(+), 48 deletions(-) rename man/{pb-nc.8 => petitboot-nc.8} (75%) rename man/{pb-twin.8 => petitboot-twin.8} (88%) diff --git a/man/Makefile.am b/man/Makefile.am index ed81c99..4d4301b 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -12,6 +12,6 @@ # 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 diff --git a/man/pb-discover.8 b/man/pb-discover.8 index 6b7be18..4f6bc39 100644 --- 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 .\" -.\" 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 @@ -41,7 +35,7 @@ pb-discover daemon and receive boot option information. .\" .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 .\" ============== diff --git a/man/pb-event.8 b/man/pb-event.8 index d762ace..e2f99b9 100644 --- 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 .\" -.\" 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 @@ -40,7 +34,7 @@ petitboot device discovery daemon. .\" .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 .\" ============== diff --git a/man/pb-udhcpc.8 b/man/pb-udhcpc.8 index 8a0eb6b..dbc7f52 100644 --- a/man/pb-udhcpc.8 +++ b/man/pb-udhcpc.8 @@ -31,7 +31,7 @@ Documentation/filesystems/nfsroot.txt. .\" .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 .\" ============== diff --git a/man/pb-nc.8 b/man/petitboot-nc.8 similarity index 75% rename from man/pb-nc.8 rename to man/petitboot-nc.8 index 16ee654..3135655 100644 --- a/man/pb-nc.8 +++ b/man/petitboot-nc.8 @@ -14,19 +14,13 @@ .\" 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 +.Dt petitboot-nc 8 .Os .\" .Sh NAME .\" ==== -.Nm pb-nc +.Nm petitboot-nc .Nd Petitboot ncurses bootloader UI .\" .Sh SYNOPSIS @@ -38,7 +32,7 @@ .\" .Sh DESCRIPTION .\" =========== -pb-nc is an ncurses based interface to the Petitboot bootloader. +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. @@ -56,15 +50,15 @@ 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. +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 pb-twin 8 , Xr pb-discover 8 , Xr pb-event 8 +.Xr petitboot 8 , Xr petitboot-twin 8 , Xr pb-discover 8 , Xr pb-event 8 .\" .Sh REPORTING BUGS .\" ============== diff --git a/man/pb-twin.8 b/man/petitboot-twin.8 similarity index 88% rename from man/pb-twin.8 rename to man/petitboot-twin.8 index fe4265c..eef9ff3 100644 --- a/man/pb-twin.8 +++ b/man/petitboot-twin.8 @@ -15,12 +15,12 @@ .\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .\" .Dd "" -.Dt pb-twin 8 +.Dt petitboot-twin 8 .Os .\" .Sh NAME .\" ==== -.Nm pb-twin +.Nm petitboot-twin .Nd Petitboot twin bootloader UI .\" .Sh SYNOPSIS @@ -35,7 +35,7 @@ .\" .Sh DESCRIPTION .\" =========== -pb-twin is a twin based interface to the Petitboot bootloader. +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. @@ -53,8 +53,8 @@ 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. +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. diff --git a/man/petitboot.8 b/man/petitboot.8 index 8ace468..459c2d4 100644 --- a/man/petitboot.8 +++ b/man/petitboot.8 @@ -44,7 +44,7 @@ from a DHCP server. .\" .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 .\" ============== diff --git a/ui/ncurses/Makefile.am b/ui/ncurses/Makefile.am index ec8217f..90b5cbf 100644 --- a/ui/ncurses/Makefile.am +++ b/ui/ncurses/Makefile.am @@ -40,19 +40,19 @@ libpbnc_la_SOURCES = \ nc-scr.c \ nc-scr.h -sbin_PROGRAMS = pb-nc +sbin_PROGRAMS = petitboot-nc if ENABLE_PS3 -sbin_PROGRAMS += pb-nc-ps3 +sbin_PROGRAMS += petitboot-ps3-nc 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 diff --git a/ui/twin/Makefile.am b/ui/twin/Makefile.am index af87500..dc6ec53 100644 --- a/ui/twin/Makefile.am +++ b/ui/twin/Makefile.am @@ -44,19 +44,19 @@ libpbt_la_SOURCES = \ pbt-scr.c \ pbt-scr.h -sbin_PROGRAMS = pb-twin +sbin_PROGRAMS = petitboot-twin if ENABLE_PS3 -sbin_PROGRAMS += pb-twin-ps3 +sbin_PROGRAMS += petitboot-ps3-twin 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 -- 2.39.2