Pedro Avalos has proposed merging ~pedro-avalos/maas-cert-server:fix-setup-certlab-rename into maas-cert-server:main.
Commit message: Fix bugs introduced in partial renaming of maniacs-setup to setup-certlab. Requested reviews: Rod Smith (rodsmith) For more details, see: https://code.launchpad.net/~pedro-avalos/maas-cert-server/+git/maas-cert-server/+merge/470127 I made sure to change all instances of maniacs-setup with setup-certlab. This includes copy operations, documentation, messages, etc. I've created local symlinks in case the codebase is used without packaging & installing. Packaging and installing will also create symlinks of maniacs-setup in /usr/sbin and the appropriate manpage directory. -- Your team hardware-certification-users is subscribed to branch maas-cert-server:main.
diff --git a/debian/changelog b/debian/changelog index ccf9f62..d5e452a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +maas-cert-server (0.7.10-0ppa1) jammy; urgency=medium + + * Copy setup-certlab instead of maniacs-setup + * Rename maniacs-setup to setup-certlab in manpages and references + * Fix symlinks by using dh_links + + -- Pedro Avalos Jimenez <[email protected]> Thu, 25 Jul 2024 14:25:36 -0500 + maas-cert-server (0.7.9-0ppa1) jammy; urgency=medium * Rename maniacs-setup to setup-certlab, keeping symlink of old name diff --git a/debian/maas-cert-server.install b/debian/maas-cert-server.install index 0708d26..0bd92e8 100755 --- a/debian/maas-cert-server.install +++ b/debian/maas-cert-server.install @@ -20,11 +20,11 @@ mkdir -p "$BUILD_ROOT/var/www/html" cp -a index.html "$BUILD_ROOT/usr/share/maas-cert-server/" cp -a lib/systemd/system/certification-nat.service $BUILD_ROOT/lib/systemd/system/certification-nat.service cp -a usr/sbin/flushnat.sh usr/sbin/startnat.sh "$BUILD_ROOT/usr/sbin/" -cp -a usr/sbin/maniacs-setup "$BUILD_ROOT/usr/sbin" +cp -a usr/sbin/setup-certlab "$BUILD_ROOT/usr/sbin" cp -a usr/bin/block-node-shutdown "$BUILD_ROOT/usr/bin" cp -a network postmirror.sh README setup.sh update-library update-mirror.sh preseed \ "$BUILD_ROOT/usr/share/maas-cert-server/" cp -a etc/apt/mirror.list etc/apt/ports-mirror.list "$BUILD_ROOT/usr/share/maas-cert-server/etc/apt/" cp -a etc/maas-cert-server/config "$BUILD_ROOT/etc/maas-cert-server/" -cp -a usr/share/man/man8/maniacs-setup.8 "$BUILD_ROOT/usr/share/man/man8/" -gzip -9 "$BUILD_ROOT/usr/share/man/man8/maniacs-setup.8" +cp -a usr/share/man/man8/setup-certlab.8 "$BUILD_ROOT/usr/share/man/man8/" +gzip -9 "$BUILD_ROOT/usr/share/man/man8/setup-certlab.8" diff --git a/debian/maas-cert-server.links b/debian/maas-cert-server.links new file mode 100644 index 0000000..dc6d22d --- /dev/null +++ b/debian/maas-cert-server.links @@ -0,0 +1,2 @@ +/usr/sbin/setup-certlab /usr/sbin/maniacs-setup +/usr/share/man/man8/setup-certlab.8 /usr/share/man/man8/maniacs-setup.8 diff --git a/debian/postinst b/debian/postinst index 247f02e..8a2620e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -33,14 +33,14 @@ fi echo "***********************************************************************" echo -echo " Installation complete. Now run /usr/sbin/maniacs-setup if necessary" +echo " Installation complete. Now run /usr/sbin/setup-certlab if necessary" echo " to complete or update the configuration of your new Certification" echo " MAAS Server." echo " NOTE: If you have previously configured a local apt mirror, you will" -echo " need to run 'sudo maniacs-setup --update-preseeds' to ensure your" +echo " need to run 'sudo setup-certlab --update-preseeds' to ensure your" echo " nodes will be deployed with the correct archive data." echo -echo " Usage: /usr/sbin/maniacs-setup [ --download-virtualization-images ]" +echo " Usage: /usr/sbin/setup-certlab [ --download-virtualization-images ]" echo " [ -i, --import-boot-resources ] [ -m, --mirror-archives ]" echo " [ -p, --update-preseeds ] [ -r, --update-repositories ]" echo diff --git a/debian/rules b/debian/rules index 7716553..6902ac3 100755 --- a/debian/rules +++ b/debian/rules @@ -12,3 +12,6 @@ override_dh_install: $$(pwd)/debian/certification-tools.install $$(pwd)/debian/certification-tools $$(pwd)/debian/maas-cert-server.install $$(pwd)/debian/maas-cert-server $$(pwd)/debian/maas-lxc-host.install $$(pwd)/debian/maas-lxc-host + +override_dh_links: + $$(pwd)/debian/maas-cert-server.links $$(pwd)/debian/maas-cert-server diff --git a/usr/share/man/man8/maniacs-setup.8 b/usr/share/man/man8/maniacs-setup.8 new file mode 120000 index 0000000..a77aded --- /dev/null +++ b/usr/share/man/man8/maniacs-setup.8 @@ -0,0 +1 @@ +setup-certlab.8 \ No newline at end of file diff --git a/usr/share/man/man8/maniacs-setup.8 b/usr/share/man/man8/setup-certlab.8 similarity index 76% rename from usr/share/man/man8/maniacs-setup.8 rename to usr/share/man/man8/setup-certlab.8 index 831910d..36e015f 100644 --- a/usr/share/man/man8/maniacs-setup.8 +++ b/usr/share/man/man8/setup-certlab.8 @@ -1,14 +1,14 @@ .\" Copyright 2015 Canonical .\" May be distributed under the GNU General Public License -.TH "MANIACS-SETUP" "8" "0.2.0" "Roderick W. Smith" "maniacs-setup manual" +.TH "SETUP-CERTLAB" "8" "0.2.0" "Roderick W. Smith" "setup-certlab manual" .SH "NAME" -maniacs-setup \- Script to set up a MAAS server for Ubuntu certification +setup-certlab \- Script to set up a MAAS server for Ubuntu certification testing .SH "SYNOPSIS" -.BI "maniacs-setup " +.BI "setup-certlab " .SH "DESCRIPTION" -The \fBmaniacs\-setup\fR script performs automated and semi\-automated system and +The \setup\-certlab\fR script performs automated and semi\-automated system and MAAS server configuration to prepare the server for use in deploying computers to be certified in the Ubuntu Server Certification programme.
-- Mailing list: https://launchpad.net/~canonical-hw-cert Post to : [email protected] Unsubscribe : https://launchpad.net/~canonical-hw-cert More help : https://help.launchpad.net/ListHelp
