[1748] 2008-07-29 Christian Franke <address@hidden>

[Christian Franke]

Revision: 1748
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1748
Author:   chrfranke
Date:     2008-07-29 15:38:05 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
2008-07-29  Christian Franke  <address@hidden>

        * util/update-grub.in: Add a check for admin
        group on Cygwin.
        Remove old `grub.cfg.new' before creation.
        Add `-f' to `mv' to handle the different filesystem
        semantics of Windows.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/update-grub.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-07-29 15:07:47 UTC (rev 1747)
+++ trunk/grub2/ChangeLog       2008-07-29 15:38:05 UTC (rev 1748)
@@ -1,3 +1,11 @@
+2008-07-29  Christian Franke  <address@hidden>
+
+       * util/update-grub.in: Add a check for admin
+       group on Cygwin.
+       Remove old `grub.cfg.new' before creation.
+       Add `-f' to `mv' to handle the different filesystem
+       semantics of Windows.
+
 2008-07-29  Bean  <address@hidden>
 
        * normal/main.c (get_line): Fix buffer overflow bug.

Modified: trunk/grub2/util/update-grub.in
===================================================================
--- trunk/grub2/util/update-grub.in     2008-07-29 15:07:47 UTC (rev 1747)
+++ trunk/grub2/util/update-grub.in     2008-07-29 15:38:05 UTC (rev 1748)
@@ -73,8 +73,20 @@
 fi
 
 if [ "$EUID" != 0 ] ; then
-  echo "$0: You must run this as root" >&2
-  exit 1
+  root=f
+  case "`uname 2>/dev/null`" in
+    CYGWIN*)
+      # Cygwin: Assume root if member of admin group
+      for g in `id -G 2>/dev/null` ; do
+       case $g in
+         0|544) root=t ;;
+       esac
+      done ;;
+  esac
+  if [ $root != t ] ; then
+    echo "$0: You must run this as root" >&2
+    exit 1
+  fi
 fi
 
 set $grub_mkdevicemap dummy
@@ -154,6 +166,7 @@
 # These are optional, user-defined variables.
 export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX 
GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL GRUB_SERIAL_COMMAND 
GRUB_DISABLE_LINUX_UUID
 
+rm -f ${grub_cfg}.new
 exec > ${grub_cfg}.new
 
 # Allow this to fail, since /boot/grub/ might need to be fatfs to support some
@@ -187,6 +200,6 @@
 done
 
 # none of the children aborted with error, install the new grub.cfg
-mv ${grub_cfg}.new ${grub_cfg}
+mv -f ${grub_cfg}.new ${grub_cfg}
 
 echo "done" >&2