--auto cmd-line option and ALLOW_AUTO flag added

We don't want efi-boot-update run automatically whenever it is
installed. It can break things if run e.g. during a chroot install.

diff --git a/efi-boot-update b/efi-boot-update
index e718db8afe803658eb995142edbcafb82082fb21..0684182c8b82f9a464b52a651c2590809dc30c0a 100755 (executable)
--- a/efi-boot-update
+++ b/efi-boot-update
@@ -15,6 +15,7 @@ usage () {
     echo "  --mount, -m    Try to mount /boot/efi first"
     echo "  --verbose, -v  Verbose output"
     echo "  --force        Force file updates"
+    echo "  --auto         Automatic run from packages %post"
 }
 
 msg () {
@@ -149,14 +150,16 @@ safe_string () {
     echo -n "$*" | tr -c '[a-zA-Z0-9_]' '_'
 }
 
+ALLOW_AUTO="no"
 FORCE_UPDATES="no"
 MOUNT_EFI_PARTITION="no"
 LABEL_PREFIX=""
-DEFAULT=""
 VERBOSE="no"
 
 [ -e /etc/efi-boot/update.conf ] && . /etc/efi-boot/update.conf
 
+AUTO_RUN=no
+
 while [ -n "$*" ] ; do
     local arg
     arg="$1"
@@ -179,6 +182,10 @@ while [ -n "$*" ] ; do
         --force)
             FORCE_UPDATES="yes"
             ;;
+        --auto)
+            is_yes "$ALLOW_AUTO" || exit 0
+            AUTO_RUN=yes
+            ;;
         *)
             usage >&2
             exit 2
@@ -284,4 +291,9 @@ if [ -n "$ORDER" -a "$EFIBOOTMGR" != "/bin/true" ] ; then
     fi
 fi
 
+if ! is_yes "$ALLOW_AUTO" && ! is_yes "$AUTO_RUN"; then
+    msg "ALLOW_AUTO is not enabled in /etc/efi-boot/update.conf,"
+    msg "files will not be automatically updated on upgrades."
+fi
+
 # vi: ft=sh sw=4 sts=4 et

diff --git a/update.conf b/update.conf
index 4289c6ba8258e0982dd7b26a27f813ac2aca3672..b3a608c4c4f0b73f0639577f2b9e4847a84bff58 100644 (file)
--- a/update.conf
+++ b/update.conf
@@ -1,3 +1,14 @@
+
+# Set to 'yes' to allow efi-boot-update being run automatically
+ALLOW_AUTO=no
+
+# Prefix for all module labels
 LABEL_PREFIX="PLD "
+
+# Preferred boot order
 ORDER="grub shellx64"
+
+# subdirectory on the EFI system partition to put files in
 PLATFORM_DIR="pld-linux/@ARCH@"
+
+# vi: ft=sh