From c82712e05cd17d642604a44838c7e9aaf6a1925d Mon Sep 17 00:00:00 2001
From: Mike Hibler <mike@flux.utah.edu>
Date: Sat, 17 Aug 2002 06:05:38 +0000
Subject: [PATCH] more fixes: take debug option out of imageunzip from cd
(dooh!) call shutdown instead of reboot on CD system, prevents
long hangs due to unflushable buffers add stop option to register.sh so it
doesn't whine during shutdown
---
cdrom/waboot/register.pl | 7 ++++---
cdrom/waboot/register.sh | 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cdrom/waboot/register.pl b/cdrom/waboot/register.pl
index 745d481c0b..78c9a68281 100755
--- a/cdrom/waboot/register.pl
+++ b/cdrom/waboot/register.pl
@@ -318,9 +318,9 @@ for ($i = 1; $i <= 4; $i++) {
if ($showprogress) {
print "(Output indicates uncompressed bytes written to disk.)\n";
- system("imageunzip -o -s $i -d /$image $rawbootdisk");
+ system("imageunzip -o -s $i /$image $rawbootdisk");
} else {
- mysystem("imageunzip -s $i -d /$image $rawbootdisk");
+ mysystem("imageunzip -s $i /$image $rawbootdisk");
}
fatal("Failed to lay down image /$image!")
if ($?);
@@ -465,7 +465,7 @@ FinishedInstructions();
# One last chance to hold things up.
#
if (Prompt("Reboot from ${rawbootdisk}?", "Yes", 10) =~ /yes/i) {
- mysystem("reboot");
+ mysystem("shutdown -r now");
fatal("Failed to reboot!")
if ($?);
sleep(100000);
@@ -706,6 +706,7 @@ sub MakeFS($$)
}
print "Creating filesystem on $mntpoint (${rawdevice}s${slice}e).\n";
+ print " (ignore kernel generated \"no disk label\" messages.)\n";
mysystem("newfs -U ${rawdevice}s${slice}e");
if ($?) {
print STDERR "*** Oops, could not newfs ${rawdevice}s${slice}e!\n";
diff --git a/cdrom/waboot/register.sh b/cdrom/waboot/register.sh
index aeb354dc13..85c96e109f 100755
--- a/cdrom/waboot/register.sh
+++ b/cdrom/waboot/register.sh
@@ -21,8 +21,10 @@ start)
exit $?
fi
;;
+stop)
+ ;;
*)
- echo "Usage: `basename $0` {start}" >&2
+ echo "Usage: `basename $0` {start|stop}" >&2
exit 1
;;
esac
--
GitLab