diff options
| author | Simon Rettberg | 2013-10-17 12:07:45 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-10-17 12:07:45 +0200 |
| commit | 193690351422f8050023de5644b64cc077bb605d (patch) | |
| tree | 5cb606d94887c6ec83462485f575ba5ed45c4d49 | |
| parent | [clone stage4] Filter xsessions (diff) | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-193690351422f8050023de5644b64cc077bb605d.tar.gz tm-scripts-193690351422f8050023de5644b64cc077bb605d.tar.xz tm-scripts-193690351422f8050023de5644b64cc077bb605d.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
7 files changed, 40 insertions, 2 deletions
diff --git a/remote/modules/printergui/printergui.build b/remote/modules/printergui/printergui.build index b414230c..f6139ba6 100644 --- a/remote/modules/printergui/printergui.build +++ b/remote/modules/printergui/printergui.build @@ -8,9 +8,9 @@ build() { local SRCDIR="${MODULE_DIR}/src/" mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" - cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Cpdspofj not cd!" + cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!" pinfo "Running qmake" - qmake-qt4 "$SRCDIR/src/printergui.pro" -r -spec linux-g++ || perror "'qmake' failed." + qmake "$SRCDIR/src/printergui.pro" -r -spec linux-g++ || perror "'qmake' failed." pinfo "Running make" make || perror "'make' failed." } diff --git a/remote/modules/printergui/printergui.conf.opensuse b/remote/modules/printergui/printergui.conf.opensuse new file mode 100644 index 00000000..2d4c7a95 --- /dev/null +++ b/remote/modules/printergui/printergui.conf.opensuse @@ -0,0 +1,7 @@ +REQUIRED_INSTALLED_PACKAGES=" +cups-devel +libqt4-devel +" +REQUIRED_CONTENT_PACKAGES=" +cups-devel +" diff --git a/remote/rootfs/rootfs-stage32/TODO b/remote/rootfs/rootfs-stage32/TODO index 823c72d3..046b40d2 100644 --- a/remote/rootfs/rootfs-stage32/TODO +++ b/remote/rootfs/rootfs-stage32/TODO @@ -1,2 +1,4 @@ libmdns needed? /etc/modprobe.d/blacklist.conf needed? + +Support for rpc.statd and rpcbind for OpenSuSE diff --git a/remote/rootfs/rootfs-stage32/data/etc/conf.d/nfs-common.conf b/remote/rootfs/rootfs-stage32/data/etc/conf.d/nfs-common.conf new file mode 100644 index 00000000..c12705b9 --- /dev/null +++ b/remote/rootfs/rootfs-stage32/data/etc/conf.d/nfs-common.conf @@ -0,0 +1,7 @@ +# Common configuration file for rpc-services. + +# Options for rpcbind +BIND_OPTS="-w" + +# Options for rpc.statd +STATD_OPTS="-L" diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/rpc-statd.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/rpc-statd.service new file mode 100644 index 00000000..903a3b1a --- /dev/null +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/rpc-statd.service @@ -0,0 +1,9 @@ +[Unit] +Description=NFSv2/3 Network Status Monitor Daemon +After=rpcbind.service +Requires=rpcbind.service + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/sbin/rpc.statd $STATD_OPTS diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/rpcbind.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/rpcbind.service new file mode 100644 index 00000000..7dc4dcc2 --- /dev/null +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/rpcbind.service @@ -0,0 +1,11 @@ +[Unit] +Description=RPC Bind +After=network.target +Wants=rpcbind.target +Before=rpcbind.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/sbin/rpcbind $BIND_OPTS +Restart=always diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index 1dd76e68..88953780 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -34,6 +34,8 @@ REQUIRED_BINARIES=" ntpdate rdns find + rpcbind + rpc.statd " REQUIRED_LIBRARIES=" libcap |