AlexanderS

#!/usr/bin/env bash

if [[ "x$1" == x ]] ; then
	\tmux list-sessions || \tmux new-session -d
	exec \tmux attach-session -d
fi

if [ -z "$2" -a "$1" != "att" -a "$1" != "ls" ]; then
	if \tmux has-session -t "$1"; then
	    exec \tmux attach-session -t "$1"

AlexanderS

2017-08-01 14:48:27,094 DEBUG org.hibernate.SQL @ select group0_.uuid as uuid1_12_, group0_.eperson_group_id as eperson_1_14_, group0_.name as name2_14_, group0_.permanent as permanen3_14_ from public.epersongro
up group0_ inner join public.dspaceobject group0_1_ on group0_.uuid=group0_1_.uuid where group0_.name=? limit ?
2017-08-01 14:48:27,094 TRACE org.hibernate.type.descriptor.sql.BasicBinder @ binding parameter [1] as [VARCHAR] - Administrator
2017-08-01 14:48:27,094 INFO  org.dspace.eperson.GroupServiceImpl @ anonymous::create_group:group_id=d24f912c-e5bf-4c58-a258-89c5ffd9a082
2017-08-01 14:48:27,095 DEBUG org.hibernate.SQL @ insert into public.dspaceobject (uuid) values (?)
2017-08-01 14:48:27,095 TRACE org.hibernate.type.descriptor.sql.BasicBinder @ binding parameter [1] as [OTHER] - d24f912c-e5bf-4c58-a258-89c5ffd9a082
2017-08-01 14:48:27,095 DEBUG org.hibernate.SQL @ insert into public.epersongroup (name, permanent, uuid) values (?, ?, ?)
2017-08-01 14:48:27,095 TRACE org.hibernate.type.descriptor.

AlexanderS

diff -r -u linux-3.18.21-vs2.3.7.4/fs/overlayfs/super.c linux-3.18.21-securemount-overlayfs/fs/overlayfs/super.c
--- linux-3.18.21-vs2.3.7.4/fs/overlayfs/super.c        2015-09-01 00:19:23.000000000 +0200
+++ linux-3.18.21-securemount-overlayfs/fs/overlayfs/super.c    2016-10-07 16:09:39.031970876 +0200
@@ -18,14 +18,13 @@
 #include <linux/sched.h>
 #include <linux/statfs.h>
 #include <linux/seq_file.h>
+#include <linux/magic.h>
 #include "overlayfs.h"
 

AlexanderS

diff --git a/src/lib/Bcfg2/Options/Parser.py b/src/lib/Bcfg2/Options/Parser.py
index b72a495..dd5087f 100644
--- a/src/lib/Bcfg2/Options/Parser.py
+++ b/src/lib/Bcfg2/Options/Parser.py
@@ -302,7 +302,7 @@ class Parser(argparse.ArgumentParser):
 
         # check whether the specified bcfg2.conf exists
         if not self.unit_test and not os.path.exists(bootstrap.config):
-            self.error("Could not read %s" % bootstrap.config)
+            sys.stderr.write("Could not read %s\n" % bootstrap.config)

AlexanderS

diff -ur linux-3.18.21-vs2.3.7.4/fs/namei.c linux-3.18.21-iattr_write/fs/namei.c
--- linux-3.18.21-vs2.3.7.4/fs/namei.c	2016-07-20 18:41:54.384005807 +0200
+++ linux-3.18.21-iattr_write/fs/namei.c	2016-07-20 18:42:57.388006326 +0200
@@ -327,7 +327,8 @@
 
 			if (vx_check(0, VS_ADMIN | VS_WATCH_P) ||
 			    vx_flags(VXF_STATE_SETUP, 0) ||
-			    (de && (de->vx_flags & IATTR_WRITE)))
+			    (vx_flags(VXF_PROC_WRITE, 0) &&
+			     de && (de->vx_flags & IATTR_WRITE)))

AlexanderS

diff -ur linux-3.18.21-vs2.3.7.4/fs/namei.c linux-3.18.21-iattr_write/fs/namei.c
--- linux-3.18.21-vs2.3.7.4/fs/namei.c  2016-07-19 23:40:13.028001274 +0200
+++ linux-3.18.21-iattr_write/fs/namei.c        2016-07-19 23:44:24.660007559 +0200
@@ -326,7 +326,8 @@
                        struct task_struct *tsk;
 
                        if (vx_check(0, VS_ADMIN | VS_WATCH_P) ||
-                           vx_flags(VXF_STATE_SETUP, 0))
+                           vx_flags(VXF_STATE_SETUP, 0) ||
+                           (de && (de->vx_flags & IATTR_WRITE)))

AlexanderS

<Bundle xmlns:py='http://genshi.edgewall.org/'>

  <Package name='ssl-cert' />

  <py:for each="cert in metadata.TemplateHelper['ssl'].get_certs(metadata)">
    <BoundPath type="file"
               name="/etc/ssl/${cert.name}/${cert.name}.crt"
               owner="root"
               group="0"
               mode="444"

AlexanderS

diff --git a/testsuite/common.py b/testsuite/common.py
index 45cfcbf..a6d5910 100644
--- a/testsuite/common.py
+++ b/testsuite/common.py
@@ -15,7 +15,7 @@ import codecs
 import lxml.etree
 import Bcfg2.Options
 import Bcfg2.Utils
-from mock import patch, MagicMock, _patch, DEFAULT
+from mock.mock import patch, MagicMock, _patch, DEFAULT

AlexanderS

#!/bin/luavar

statefile = '/var/media/ftp/UStor01/log.state'
debug = false

-- Hack (lua does not have a sleep build-in
function sleep(n)
  os.execute("sleep " .. tonumber(n))
end

AlexanderS

#!/bin/luavar

-- Last message to remember
last = { count=0 }
--last = { count=1 }

-- Filter settings
saveset = {}
table.insert(saveset,{["name"]="logger:settings/filter",["value"]="0"})