merge with latest dev version

5 files changed, 35 insertions, 0 deletions

diff --git a/core/modules/firefox/data/opt/openslx/scripts/firefox-session b/core/modules/firefox/data/opt/openslx/scripts/firefox-session
new file mode 100755
index 00000000..c6e49a28
--- /dev/null
+++ b/core/modules/firefox/data/opt/openslx/scripts/firefox-session
@@ -0,0 +1,6 @@
+#!/bin/ash
+
+. /opt/openslx/config
+
+openbox &
+exec /usr/bin/firefox --new-window "$SLX_BROWSER_START_URL"
diff --git a/core/modules/firefox/data/usr/share/xsessions/firefox.desktop b/core/modules/firefox/data/usr/share/xsessions/firefox.desktop
new file mode 100755
index 00000000..c639f9ae
--- /dev/null
+++ b/core/modules/firefox/data/usr/share/xsessions/firefox.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Firefox
+Exec=/opt/openslx/scripts/firefox-session
+Icon=
+Type=Application
diff --git a/core/modules/firefox/module.build b/core/modules/firefox/module.build
new file mode 100644
index 00000000..bd2e4624
--- /dev/null
+++ b/core/modules/firefox/module.build
@@ -0,0 +1,15 @@
+fetch_source() {
+	:
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+}
+
+post_copy() {
+	:
+}
diff --git a/core/modules/firefox/module.conf b/core/modules/firefox/module.conf
new file mode 100644
index 00000000..0718324f
--- /dev/null
+++ b/core/modules/firefox/module.conf
@@ -0,0 +1,6 @@
+REQUIRED_BINARIES="
+	firefox
+"
+REQUIRED_DIRECTORIES="
+	/
+"
diff --git a/core/modules/firefox/module.conf.ubuntu b/core/modules/firefox/module.conf.ubuntu
new file mode 100644
index 00000000..45f7e899
--- /dev/null
+++ b/core/modules/firefox/module.conf.ubuntu
@@ -0,0 +1,2 @@
+REQUIRED_INSTALLED_PACKAGES="firefox"
+REQUIRED_CONTENT_PACKAGES="firefox"