This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from c1e6207 rename preseed_nodm to x2gothinclient-preseed new f680aba move x2gothinclient-preseed into sbin/ subfolder new a65c512 fix nodm preseedning The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/x2gothinclient-minidesktop.install | 2 +- minidesktop/{seeds => sbin}/x2gothinclient-preseed | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) rename minidesktop/{seeds => sbin}/x2gothinclient-preseed (94%) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit f680aba8cac776ff9acb86ed4036f8e026a943a4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 26 16:15:31 2014 +0200 move x2gothinclient-preseed into sbin/ subfolder --- debian/x2gothinclient-minidesktop.install | 2 +- minidesktop/{seeds => sbin}/x2gothinclient-preseed | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/x2gothinclient-minidesktop.install b/debian/x2gothinclient-minidesktop.install index e29afad..bc8dcc1 100644 --- a/debian/x2gothinclient-minidesktop.install +++ b/debian/x2gothinclient-minidesktop.install @@ -1,5 +1,5 @@ management/share/etc/x2gothinclient-minidesktop_* etc/x2go/ minidesktop/autostart/x2gothinclient-minidesktop.desktop etc/xdg/autostart/ -minidesktop/seeds/x2gothinclient-preseed usr/sbin/ +minidesktop/sbin/x2gothinclient-preseed usr/sbin/ minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/ minidesktop/mate-panel-layout/* usr/share/mate-panel/layouts/ diff --git a/minidesktop/seeds/x2gothinclient-preseed b/minidesktop/sbin/x2gothinclient-preseed similarity index 100% rename from minidesktop/seeds/x2gothinclient-preseed rename to minidesktop/sbin/x2gothinclient-preseed -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit a65c512eff1ee28aa6a4dd58066317b08c173985 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 26 16:16:10 2014 +0200 fix nodm preseedning --- minidesktop/sbin/x2gothinclient-preseed | 3 +++ 1 file changed, 3 insertions(+) diff --git a/minidesktop/sbin/x2gothinclient-preseed b/minidesktop/sbin/x2gothinclient-preseed index 13194e6..f0596c7 100755 --- a/minidesktop/sbin/x2gothinclient-preseed +++ b/minidesktop/sbin/x2gothinclient-preseed @@ -29,6 +29,9 @@ do_preseed() { echo "Failed to load preseed '$template'" 1>&2 } +# we need to remove the nodm config as it gets parsed in via DebConf +rm -f /etc/default/nodm + # and finally preseed ocsinventory-agent do_preseed nodm nodm/enabled boolean true do_preseed nodm nodm/user string x2gothinclient -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org