sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (ac33f6dbc1b5256fff2669263835ba35b12aa311)
- From: Justin Boffemmyer <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (ac33f6dbc1b5256fff2669263835ba35b12aa311)
- Date: Fri, 7 Jul 2023 13:30:03 +0000
GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:
net/ppp/HISTORY | 3 +++
net/ppp/INSTALL | 7 +++++--
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit ac33f6dbc1b5256fff2669263835ba35b12aa311
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
net/ppp: correct INSTALL loop logic
The loop to chown/chmod conf files failed to first check for the
existence of the config files before attempting to chmod/chown them.
This commit re-adds the "if install_config_file ..." logic to ensure
that we only attempt to modify the files if they first exist.
diff --git a/net/ppp/HISTORY b/net/ppp/HISTORY
index 0535d39..7558a09 100644
--- a/net/ppp/HISTORY
+++ b/net/ppp/HISTORY
@@ -1,3 +1,6 @@
+2023-07-07 Justin Boffemmyer <flux AT sourcemage.org>
+ * INSTALL: fix conf file chown/chmod loop
+
2019-05-28 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PRE_BUILD: updated spell to 2.4.7
* l2tp.patch: removed, not needed anymore
diff --git a/net/ppp/INSTALL b/net/ppp/INSTALL
index 16279ec..6060722 100755
--- a/net/ppp/INSTALL
+++ b/net/ppp/INSTALL
@@ -3,8 +3,11 @@ default_install &&
make install-etcppp &&
for conf in options pap-secrets chap-secrets; do
- chown root:ppp "$INSTALL_ROOT/etc/ppp/$conf" &&
- chmod 0600 "$INSTALL_ROOT/etc/ppp/$conf"
+ if install_config_file "$SCRIPT_DIRECTORY/$conf" \
+ "$INSTALL_ROOT/etc/ppp/$conf" ;then
+ chown root:ppp "$INSTALL_ROOT/etc/ppp/$conf" &&
+ chmod 0600 "$INSTALL_ROOT/etc/ppp/$conf"
+ fi
done &&
install -d -m 0755 -o root -g ppp $INSTALL_ROOT/etc/ppp/peers &&
- [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (ac33f6dbc1b5256fff2669263835ba35b12aa311), Justin Boffemmyer, 07/07/2023
Archive powered by MHonArc 2.6.24.