diff options
| author | Simon Rettberg | 2013-08-20 20:03:34 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-08-20 20:03:34 +0200 |
| commit | 5ecba3429f3c5d75550137eb2c815ebb62dfdffb (patch) | |
| tree | 2e461f6c4386b73063e9328fe72aaa086296bb47 /remote/modules | |
| parent | [dnbd3] add systemd service + script to load the module and launch the user s... (diff) | |
| download | tm-scripts-5ecba3429f3c5d75550137eb2c815ebb62dfdffb.tar.gz tm-scripts-5ecba3429f3c5d75550137eb2c815ebb62dfdffb.tar.xz tm-scripts-5ecba3429f3c5d75550137eb2c815ebb62dfdffb.zip | |
Switch to using /etc/tmpfiles.d for creating files/dirs in /run
Also added a sanity check after processing each module, which will abort if anything is placed in /run directly
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/kdm/data/etc/tmpfiles.d/kdm.conf | 2 | ||||
| -rw-r--r-- | remote/modules/kdm/kdm.build | 1 | ||||
| -rw-r--r-- | remote/modules/pam/data/etc/tmpfiles.d/pipefs.conf | 2 | ||||
| -rw-r--r-- | remote/modules/pam/pam.build | 15 | ||||
| -rw-r--r-- | remote/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf | 2 | ||||
| -rw-r--r-- | remote/modules/plymouth/plymouth.conf | 3 | ||||
| -rw-r--r-- | remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf | 2 |
7 files changed, 11 insertions, 16 deletions
diff --git a/remote/modules/kdm/data/etc/tmpfiles.d/kdm.conf b/remote/modules/kdm/data/etc/tmpfiles.d/kdm.conf new file mode 100644 index 00000000..64f02ed3 --- /dev/null +++ b/remote/modules/kdm/data/etc/tmpfiles.d/kdm.conf @@ -0,0 +1,2 @@ +D /var/run/kdm 0755 root root + diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/kdm.build index b5d1be08..feac30cb 100644 --- a/remote/modules/kdm/kdm.build +++ b/remote/modules/kdm/kdm.build @@ -16,7 +16,6 @@ build () { post_copy() { #create static kdm folders in stage3.2 mkdir -p "${TARGET_BUILD_DIR}/var/lib/kdm" - mkdir -p "${TARGET_BUILD_DIR}/var/run/kdm" # link kdm config as opensuse wants in in another place ln -s "/etc/kde4" "$TARGET_BUILD_DIR/usr/share/kde4/config" diff --git a/remote/modules/pam/data/etc/tmpfiles.d/pipefs.conf b/remote/modules/pam/data/etc/tmpfiles.d/pipefs.conf new file mode 100644 index 00000000..7c422623 --- /dev/null +++ b/remote/modules/pam/data/etc/tmpfiles.d/pipefs.conf @@ -0,0 +1,2 @@ +D /var/run/rpc_pipefs 0755 root root + diff --git a/remote/modules/pam/pam.build b/remote/modules/pam/pam.build index 063c0065..34319ce8 100644 --- a/remote/modules/pam/pam.build +++ b/remote/modules/pam/pam.build @@ -23,18 +23,5 @@ build() { } post_copy() { - if [ ! -d "${TARGET_BUILD_DIR}/run/rpc_pipefs" ]; then - mkdir -p "${TARGET_BUILD_DIR}/run/rpc_pipefs" || pwarning "Could not mkdir ${TARGET_BUILD_DIR}/run/rpc_pipefs" - fi - - # find libnfsidmap run-time library directory - #local COPYLIST="$MODULE_BUILD_DIR/list_packet_files" - #local SEARCH=$(grep "/libsnfsidmap/" "$COPYLIST" | head -1) - #[ -z "$SEARCH" ] && perror "Hä" - #SEARCH=$(dirname "$SEARCH") - #if [ -d "${SEARCH}" ]; then - # tarcopy "${SEARCH}" "${TARGET_BUILD_DIR}" || pinfo "Something went wrong copying $SEARCH" - #fi - - + : } diff --git a/remote/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf b/remote/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf new file mode 100644 index 00000000..211c61f6 --- /dev/null +++ b/remote/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf @@ -0,0 +1,2 @@ +D /var/run/plymouth 0755 root root + diff --git a/remote/modules/plymouth/plymouth.conf b/remote/modules/plymouth/plymouth.conf index 26e123e4..ec6f8571 100644 --- a/remote/modules/plymouth/plymouth.conf +++ b/remote/modules/plymouth/plymouth.conf @@ -9,5 +9,6 @@ REQUIRED_DIRECTORIES=" /etc /lib /sbin - /var + /var/lib + /var/spool " diff --git a/remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf b/remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf new file mode 100644 index 00000000..d4aa9a67 --- /dev/null +++ b/remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf @@ -0,0 +1,2 @@ +D /var/run/sshd 0755 root root + |