From 3acab8ba211f0a918e5cbe80b2017b9e3c977fe7 Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Mon, 21 Jan 2019 10:57:29 +0100
Subject: [PATCH] Pull before post install

---
 do_postinstall.sh | 39 +++++++++++++++++++++++++++++++++++++++
 postinstall.sh    | 39 ++-------------------------------------
 2 files changed, 41 insertions(+), 37 deletions(-)
 create mode 100755 do_postinstall.sh
 mode change 100755 => 100644 postinstall.sh

diff --git a/do_postinstall.sh b/do_postinstall.sh
new file mode 100755
index 0000000..263f123
--- /dev/null
+++ b/do_postinstall.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Copyright (C) 2018  Tetras Libre <Contact@Tetras-Libre.fr>
+# Author: Beniamine, David <David.Beniamine@Tetras-Libre.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if [ `whoami` != "root" ]
+then
+    echo "This script should be run as root"
+    exit 1
+fi
+
+if [ ! -z "`which lxc-ls`" ]
+then
+    DIR=`dirname $0`
+    for ctn in partage reseau
+    do
+        echo "Running post install for $ctn"
+        scp postinstall_$ctn.sh $ctn:.
+        ssh $ctn ./postinstall_$ctn.sh
+        ssh $ctn rm postinstall_$ctn.sh
+    done
+else
+    echo "Please run postinstall on the master"
+    exit 1
+fi
+
diff --git a/postinstall.sh b/postinstall.sh
old mode 100755
new mode 100644
index 263f123..c4ca7f8
--- a/postinstall.sh
+++ b/postinstall.sh
@@ -1,39 +1,4 @@
 #!/bin/bash
-
-# Copyright (C) 2018  Tetras Libre <Contact@Tetras-Libre.fr>
-# Author: Beniamine, David <David.Beniamine@Tetras-Libre.fr>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-if [ `whoami` != "root" ]
-then
-    echo "This script should be run as root"
-    exit 1
-fi
-
-if [ ! -z "`which lxc-ls`" ]
-then
-    DIR=`dirname $0`
-    for ctn in partage reseau
-    do
-        echo "Running post install for $ctn"
-        scp postinstall_$ctn.sh $ctn:.
-        ssh $ctn ./postinstall_$ctn.sh
-        ssh $ctn rm postinstall_$ctn.sh
-    done
-else
-    echo "Please run postinstall on the master"
-    exit 1
-fi
+git pull
+`dirname $0`/do_postinstall.sh
 
-- 
GitLab