From: Michael Prokop <mika@grml.org>
Date: Fri, 21 Oct 2016 11:53:51 +0000 (+0200)
Subject: Drop deprecated GRMLBASE/48-tmpfs file, use default /tmp handling
X-Git-Tag: v0.28.0~14
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=58742ddcb55768e21dadec102231c97cf7a380c1

Drop deprecated GRMLBASE/48-tmpfs file, use default /tmp handling

The configuration needs to take place in /etc/default/tmpfs
anyway (not /etc/default/rcS) and defaulted to "no". systemd
has a separate tmp.mount unit and quoting systemd changelog:

| systemd (220-6) unstable; urgency=medium
|
|    * Stop installing tmp.mount by default; there are still situations where it
|      becomes active through dependencies from other units, which is surprising,
|      hides existing data in /tmp during runtime, and it isn't safe to have a
|      tmpfs /tmp on every install scenario. (Closes: #783509)
|      - d/rules: Ship tmp.mount in /usr/share/systemd/ instead of
|        /lib/systemd/systemd.
|      - systemd.postinst: When tmp.mount already was enabled, install tmp.mount
|        into /etc and keep it enabled.
|      - systemd.postinst: When enabling tmp.mount because of RAMTMP=yes, copy it
|        from /usr/share.
|      - Drop Don-t-mount-tmp-as-tmpfs-by-default.patch and
|        PrivateTmp-shouldn-t-require-tmpfs.patch, not necessary any more.
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/48-tmpfs b/etc/grml/fai/config/scripts/GRMLBASE/48-tmpfs
deleted file mode 100755
index bfa79ff..0000000
--- a/etc/grml/fai/config/scripts/GRMLBASE/48-tmpfs
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/48-tmpfs
-# Purpose:       modifies /etc/default/rcS to prevent mounting /tmp as tmpfs
-# Authors:       grml-team (grml.org), (c)
-# Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2 or any later version.
-################################################################################
-
-set -u
-set -e
-
-sed -i 's/^RAMTMP=.*/RAMTMP=no/' $target/etc/default/rcS
-## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2