diff options
| author | Simon Rettberg | 2013-10-04 14:06:45 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-10-04 14:06:45 +0200 |
| commit | f045378db4f6cad9dfa5fe96bfff6a0c30f4e834 (patch) | |
| tree | 69c0a5df3b4aa4a93fd0d31bfb6144f912bd7e1e | |
| parent | [rootfs-stage32] Add iptables rule to redirect printing jobs to port 515 (diff) | |
| parent | [blacklist] Add /etc/mtab* (diff) | |
| download | tm-scripts-f045378db4f6cad9dfa5fe96bfff6a0c30f4e834.tar.gz tm-scripts-f045378db4f6cad9dfa5fe96bfff6a0c30f4e834.tar.xz tm-scripts-f045378db4f6cad9dfa5fe96bfff6a0c30f4e834.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
| -rw-r--r-- | server/blacklists/essential/linux-base | 4 | ||||
| l--------- | server/configs/freiburg/stage4-at-boot | 1 | ||||
| l--------- | server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/nfs-mount.service | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/server/blacklists/essential/linux-base b/server/blacklists/essential/linux-base index 522ae191..4f58b6c9 100644 --- a/server/blacklists/essential/linux-base +++ b/server/blacklists/essential/linux-base @@ -1,3 +1,5 @@ +# Always include ldconfig/cache of full system: ++ /etc/ld.so.** - /boot/ - /cdrom/ - /dev/ @@ -23,6 +25,8 @@ - /var/spool/** - /etc/resolv.conf - /etc/resolvconf/ +- /etc/mtab +- /etc/mtab.* - **/tm-scripts/ - /initrd.img - /initrd.img.old diff --git a/server/configs/freiburg/stage4-at-boot b/server/configs/freiburg/stage4-at-boot new file mode 120000 index 00000000..b1ec86ba --- /dev/null +++ b/server/configs/freiburg/stage4-at-boot @@ -0,0 +1 @@ +../../modules/stage4-at-boot
\ No newline at end of file diff --git a/server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/nfs-mount.service b/server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/nfs-mount.service new file mode 120000 index 00000000..1936daef --- /dev/null +++ b/server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/nfs-mount.service @@ -0,0 +1 @@ +../nfs-mount.service
\ No newline at end of file |