2002-01-02 Jeremy Katz <katzj@redhat.com>

	* util/grub-install.in: Support using mktemp as well as tempfile
	for secure temporary file creation.

diff --git a/ChangeLog b/ChangeLog
index e143f20f00a926c3ec5433186e2141527a512fbd..fe7ef6864d3016b4f38533ffcc47f3e415fa2781 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-02  Jeremy Katz  <katzj@redhat.com>
+       
+       * util/grub-install.in: Support using mktemp as well as tempfile
+       for secure temporary file creation.
+
 2002-01-02  Jeremy Katz  <katzj@redhat.com>
        
        * stage2/md5.c (md5_password): Ensure the password exists before

diff --git a/docs/grub-install.8 b/docs/grub-install.8
index 5dbf2cfaf7c04d4425e122e006a8a4343a5fe1a8..eaf0ee46f3b1e4ec9389920252b3e49709fc01a1 100644 (file)
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "December 2001" "grub-install (GNU GRUB 0.90)" FSF
+.TH GRUB-INSTALL "8" "January 2002" "grub-install (GNU GRUB 0.90)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS

diff --git a/util/grub-install.in b/util/grub-install.in
index fcf0658adef37f3aefea21a355667677106aa3ef..c95c16efb05eafd8a7861a3c6aad05dd6253d206 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -39,6 +39,15 @@ force_lba=
 recheck=no
 debug=no
 
+# look for secure tempfile creation wrappers on this platform
+if test -x /bin/tempfile; then
+    mkstemp="/bin/tempfile --prefix=grub"
+elif test -x /bin/mktemp; then
+    mkstemp="/bin/mktemp /tmp/grub-install.log.XXXXXX"
+else
+    mkstemp=""
+fi
+
 # Usage: usage
 # Print the usage.
 usage () {
@@ -268,7 +277,7 @@ if test -f "$device_map"; then
     :
 else
     # Create a safe temporary file.
-    test -x /bin/tempfile && log_file=`tempfile --prefix=grub`
+    test -n "$mkstemp" && log_file=`$mkstemp`
 
     $grub_shell --batch --device-map=$device_map <<EOF >$log_file
 quit
@@ -342,7 +351,7 @@ for file in \
 done
 
 # Create a safe temporary file.
-test -x /bin/tempfile && log_file=`tempfile --prefix=grub`
+test -n "$mkstemp" && log_file=`$mkstemp`
 
 # Now perform the installation.
 $grub_shell --batch --device-map=$device_map <<EOF >$log_file