diff options
| author | michael | 2013-02-20 19:05:33 +0100 |
|---|---|---|
| committer | michael | 2013-02-20 19:05:33 +0100 |
| commit | 56768840998ed7b98e3b412fae004ba375a64f93 (patch) | |
| tree | 1e963106f0d402f58e1d4c3dbd117969644f33d3 /remote/tools/systemd | |
| parent | install libkmod from source (diff) | |
| parent | init auto hw config (diff) | |
| download | tm-scripts-56768840998ed7b98e3b412fae004ba375a64f93.tar.gz tm-scripts-56768840998ed7b98e3b412fae004ba375a64f93.tar.xz tm-scripts-56768840998ed7b98e3b412fae004ba375a64f93.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/tools/systemd')
5 files changed, 11 insertions, 4 deletions
diff --git a/remote/tools/systemd/data/etc/systemd/system/network-interface@.service b/remote/tools/systemd/data/etc/systemd/system/network-interface@.service index b3c67d09..137b3af6 100644 --- a/remote/tools/systemd/data/etc/systemd/system/network-interface@.service +++ b/remote/tools/systemd/data/etc/systemd/system/network-interface@.service @@ -1,6 +1,6 @@ [Unit] Description=Brings interface %i up -Wants=udhcpc@%i.service +Wants=udhcpc@%i.service sshd.service Before=udhcpc@%i.service [Service] 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.conf b/remote/tools/systemd/systemd.conf index fde09254..98cd8ba9 100644 --- a/remote/tools/systemd/systemd.conf +++ b/remote/tools/systemd/systemd.conf @@ -76,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" |