diff options
| author | Simon Rettberg | 2013-02-20 19:23:17 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-02-20 19:23:17 +0100 |
| commit | 251736ef43c9f7f0093b65b93c7cb6ccc429b0ef (patch) | |
| tree | 0f95c3fad2f06cc169e20eb1618bc252dd894da4 /remote/tools/systemd | |
| parent | [base module] clean passwd/group/shadow of host system: remove local users/gr... (diff) | |
| parent | :Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-251736ef43c9f7f0093b65b93c7cb6ccc429b0ef.tar.gz tm-scripts-251736ef43c9f7f0093b65b93c7cb6ccc429b0ef.tar.xz tm-scripts-251736ef43c9f7f0093b65b93c7cb6ccc429b0ef.zip | |
Merge branch 'master' of ssh://openslx/openslx-ng/tm-scripts
Diffstat (limited to 'remote/tools/systemd')
5 files changed, 30 insertions, 11 deletions
diff --git a/remote/tools/systemd/data/etc/systemd/system/nfs-mount.service b/remote/tools/systemd/data/etc/systemd/system/nfs-mount.service new file mode 100644 index 00000000..727ff2ed --- /dev/null +++ b/remote/tools/systemd/data/etc/systemd/system/nfs-mount.service @@ -0,0 +1,7 @@ +[Unit] +Description=Mount NFS Share [TEST] + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/bin/mount -t nfs -o ro,async,nolock 132.230.4.6:/srv/openslx/export/nfs/ubuntu-12.04-test /openslx/mnt diff --git a/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service b/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service index 6c5c289b..e7d4d170 100644 --- a/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service +++ b/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service @@ -3,7 +3,7 @@ Description=DHCP Client [Service] Type=simple -ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -t 8 -s /etc/udhcpc.default.script -i %I +ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -t 8 -s /etc/udhcpc.openslx.script -i %I [Install] WantedBy=multi-user.target diff --git a/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service.wants/openslx-mnt.mount b/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service.wants/openslx-mnt.mount deleted file mode 120000 index 70ba668d..00000000 --- a/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service.wants/openslx-mnt.mount +++ /dev/null @@ -1 +0,0 @@ -../openslx-mnt.mount
\ No newline at end of file diff --git a/remote/tools/systemd/systemd.build b/remote/tools/systemd/systemd.build index 57c0f6b4..a967e6a9 100644 --- a/remote/tools/systemd/systemd.build +++ b/remote/tools/systemd/systemd.build @@ -12,13 +12,26 @@ fetch_source () { install_dependencies() { # quick fix for missing libkmod repo... - libkmod=$(apt-cache search libkmod-dev) - if [[ -z $libkmod ]]; - then - echo "libkmod cannot be found. Adding ppa:pitti/systemd" - add-apt-repository --yes ppa:pitti/systemd - apt-get update --force-yes + #libkmod=$(apt-cache search libkmod-dev) + #if [[ -z $libkmod ]]; + #then + # echo "libkmod cannot be found. Adding ppa:pitti/systemd" + # add-apt-repository --yes ppa:pitti/systemd + # apt-get update --force-yes + #fi + # install libkmod from source + libkmod-version=kmod-12 + if [ ! -d $libkmod-version ]; then + wget http://www.kernel.org/pub/linux/utils/kernel/kmod/${libkmod-version}.tar.gz + tar xJf $libkmod-version.tar.gz + rm $libkmod-version.tar.gz + cd $libkmod-version + ./configure + make -j5 + make install + cd - fi + apt-get install -y $DEPS &>/dev/null } diff --git a/remote/tools/systemd/systemd.conf b/remote/tools/systemd/systemd.conf index 3171938d..98cd8ba9 100644 --- a/remote/tools/systemd/systemd.conf +++ b/remote/tools/systemd/systemd.conf @@ -6,8 +6,7 @@ DEPS=" intltool pkg-config libcap-dev libudev-dev - libdbus-1-dev - libkmod-dev" + libdbus-1-dev" REQUIRED_BINARIES=" hostnamectl journalctl localectl @@ -77,6 +76,7 @@ REQUIRED_DIRECTORIES=" /etc /usr/share/dbus-1 /usr/share/polkit-1 /usr/lib/udev/rules.d" -REQUIRED_FILES=" /usr/share/systemd/kbd-model-map +REQUIRED_FILES=" /usr/bin/systemd-analyze + /usr/share/systemd/kbd-model-map /usr/lib/udev/findkeyboards /usr/lib/udev/keyboard-force-release.sh" |