Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (562ba114c139e34292b6317fd8b70c45b6aadfbe)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (562ba114c139e34292b6317fd8b70c45b6aadfbe)
  • Date: Thu, 9 Feb 2017 17:34:15 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

smgl/init.d/DETAILS | 2 +-
smgl/init.d/HISTORY | 4 ++++
smgl/init.d/init.d/mountall.sh | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 562ba114c139e34292b6317fd8b70c45b6aadfbe
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

init.d: mountall.sh: Do not write to mtab if it is a symlink

diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index 81db249..5c3e7ad 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -2,7 +2,7 @@
VERSION=2.2.15
LICENSE[0]=GPL
GATHER_DOCS=off
- PATCHLEVEL=2
+ PATCHLEVEL=3
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="smgl"
ENTERED=20030505
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 733a8bb..468cba4 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,7 @@
+2017-02-09 Ismael Luceno <ismael AT sourcemage.org>
+ * init.d/mountall.sh: Fixed write to mtab
+ * DETAILS: PATCHLEVEL++
+
2017-02-07 Ismael Luceno <ismael AT sourcemage.org>
* init.d/mountall.sh: Fixed exit status when cryptsetup isn't found
* DETAILS: PATCHLEVEL++
diff --git a/smgl/init.d/init.d/mountall.sh b/smgl/init.d/init.d/mountall.sh
index 7b55c2f..a1e26cf 100755
--- a/smgl/init.d/init.d/mountall.sh
+++ b/smgl/init.d/init.d/mountall.sh
@@ -150,7 +150,7 @@ start()
evaluate_retval

# bug 7311 - if proc was mounted, list it in mtab; awk is /usr friendly
- if awk 'BEGIN{proc=1} /\/proc/{proc=0} END{exit proc}' /proc/mounts; then
+ if ! [[ -h /etc/mtab]] && awk 'BEGIN{proc=1} /\/proc/{proc=0} END{exit
proc}' /proc/mounts; then
builtin echo 'none /proc proc rw 0 0' >> /etc/mtab
fi




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (562ba114c139e34292b6317fd8b70c45b6aadfbe), Ismael Luceno, 02/09/2017

Archive powered by MHonArc 2.6.24.

Top of Page