From 3a335eb7a71ee677b21ce42dcabc1077c135211c Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Fri, 10 Nov 2000 09:34:06 +0000 Subject: [PATCH] Set BATCH and PACKAGE_BUILDING to environment before exec()ing pkg_add in order to suppress onwonted package interaction. Submitted by: steve --- release/sysinstall/package.c | 5 +++++ usr.sbin/sysinstall/package.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index 732f643e22c..36be0aed31e 100644 --- a/release/sysinstall/package.c +++ b/release/sysinstall/package.c @@ -174,6 +174,11 @@ package_extract(Device *dev, char *name, Boolean depended) close(2); } close(pfd[1]); + + /* Prevent pkg_add from wanting to interact in bad ways */ + setenv("PACKAGE_BUILDING", "t", 1); + setenv("BATCH", "t", 1); + if (isDebug()) i = execl("/usr/sbin/pkg_add", "/usr/sbin/pkg_add", "-v", "-", 0); else diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c index 732f643e22c..36be0aed31e 100644 --- a/usr.sbin/sysinstall/package.c +++ b/usr.sbin/sysinstall/package.c @@ -174,6 +174,11 @@ package_extract(Device *dev, char *name, Boolean depended) close(2); } close(pfd[1]); + + /* Prevent pkg_add from wanting to interact in bad ways */ + setenv("PACKAGE_BUILDING", "t", 1); + setenv("BATCH", "t", 1); + if (isDebug()) i = execl("/usr/sbin/pkg_add", "/usr/sbin/pkg_add", "-v", "-", 0); else