summarylogtreecommitdiffstats
path: root/0001-scripts-template_dir-don-t-let-y-override-no-rc.patch
diff options
context:
space:
mode:
authorAlexei Colin2020-07-18 13:53:59 -0400
committerAlexei Colin2020-07-18 13:53:59 -0400
commitd91dd42ca0614a8e7e5c3e4d5607a27b2c5c5f17 (patch)
tree0e46ba83c42136897086173a9558e8dda887f72d /0001-scripts-template_dir-don-t-let-y-override-no-rc.patch
parentcb5392e8291e0adf4b2c0f26f5b952f880f883a9 (diff)
downloadaur-d91dd42ca0614a8e7e5c3e4d5607a27b2c5c5f17.tar.gz
upstreamed patch for unattended installation fixes
Diffstat (limited to '0001-scripts-template_dir-don-t-let-y-override-no-rc.patch')
-rw-r--r--0001-scripts-template_dir-don-t-let-y-override-no-rc.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/0001-scripts-template_dir-don-t-let-y-override-no-rc.patch b/0001-scripts-template_dir-don-t-let-y-override-no-rc.patch
new file mode 100644
index 00000000000..aed4ac00624
--- /dev/null
+++ b/0001-scripts-template_dir-don-t-let-y-override-no-rc.patch
@@ -0,0 +1,28 @@
+From b8d47d156f3e89237a80b349eb2ec48160046b05 Mon Sep 17 00:00:00 2001
+From: Alexei Colin <ac@alexeicolin.com>
+Date: Sat, 18 Jul 2020 12:06:52 -0400
+Subject: [PATCH 1/4] scripts/template_dir: don't let -y override -[no]rc
+
+Overlooked in 6dd3e26c271bbf139f6d30523bc55fc7673b52f5
+---
+ scripts/template_dir | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/template_dir b/scripts/template_dir
+index 1ae2794..ab3394c 100644
+--- a/scripts/template_dir
++++ b/scripts/template_dir
+@@ -66,7 +66,9 @@ while [ "$1" != "" ]; do
+ ;;
+ -y )
+ confirm="y";
+- rc_confirm="y";
++ if [ -z "$rc_confirm" ]; then
++ rc_confirm="y"
++ fi
+ ;;
+ -rc )
+ rc_confirm="y";
+--
+2.27.0
+