diff options
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/kdm/data/etc/kde4/kdm/kdmrc | 4 | ||||
| -rw-r--r-- | remote/modules/kdm/kdm.conf | 2 | ||||
| -rw-r--r-- | remote/modules/pam/pam.conf | 14 | ||||
| -rw-r--r-- | remote/modules/systemd/systemd.build | 2 | ||||
| -rw-r--r-- | remote/modules/systemd/systemd.conf | 1 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.build | 4 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf | 6 |
7 files changed, 26 insertions, 7 deletions
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc index 3126f70d..26da07d2 100644 --- a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc +++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc @@ -32,8 +32,8 @@ PreselectUser=None UseAdminSession=false [Shutdown] -HaltCmd=/usr/bin/systemctl poweroff -RebootCmd=/usr/bin/systemctl reboot +HaltCmd=/usr/bin/systemctl -ff poweroff +RebootCmd=/usr/bin/systemctl -ff reboot [xdmcp] Enable=false diff --git a/remote/modules/kdm/kdm.conf b/remote/modules/kdm/kdm.conf index dd054cc2..b716418c 100644 --- a/remote/modules/kdm/kdm.conf +++ b/remote/modules/kdm/kdm.conf @@ -30,4 +30,4 @@ REQUIRED_SYSTEM_FILES=" /usr/share/icons/oxygen/16x16/actions/system-reboot.png /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf /usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf /usr/share/icons/default/index.theme" -REQUIRED_LDD_BLACKLIST="\|libQtWebKit" +REQUIRED_LDD_BLACKLIST="\|libQtWebKit\|libGL" diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf index d76224a4..ae05c554 100644 --- a/remote/modules/pam/pam.conf +++ b/remote/modules/pam/pam.conf @@ -2,6 +2,10 @@ REQUIRED_INSTALLED_PACKAGES=" libpam-ldap libnss-ldap libpam-script + krb5-user + krb5-config + libpam-krb5 + libpam-mount libssl-dev " REQUIRED_CONTENT_PACKAGES=" @@ -13,9 +17,19 @@ REQUIRED_CONTENT_PACKAGES=" libldap-2.4-2 libpam-ldap libnss-ldap + krb5-user + krb5-config + libpam-krb5 + libpam-mount " REQUIRED_BINARIES=" sslconnect + mount.crypt + umount.crypt + mount.crypt_LUKS + umount.crypt_LUKS + mount.crypto_LUKS + umount.crypto_LUKS " REQUIRED_DIRECTORIES=" /lib diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index 027024cf..8f4081e3 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -21,7 +21,7 @@ build () { pinfo "Building systemd" cd "${MODULE_DIR}/src/$REQUIRED_VERSION" pinfo "calling configure" - ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl || perror "configure failed." + ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam|| perror "configure failed." pinfo "calling make" make || perror "make failed." pinfo "calling make install" diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf index 2a81a5b9..fbe5cb8b 100644 --- a/remote/modules/systemd/systemd.conf +++ b/remote/modules/systemd/systemd.conf @@ -35,6 +35,7 @@ REQUIRED_INSTALLED_PACKAGES=" xsltproc libblkid-dev libacl1-dev + libpam-dev " REQUIRED_BINARIES=" hostnamectl journalctl diff --git a/remote/modules/xorg/xorg.build b/remote/modules/xorg/xorg.build index 5b1b0847..16e0bb5b 100644 --- a/remote/modules/xorg/xorg.build +++ b/remote/modules/xorg/xorg.build @@ -10,7 +10,9 @@ build() { list_packet_files >> "$COPYLIST" tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" - pdebug .... + + # copy udev rules to correct location + [ -d "${MODULE_BUILD_DIR}/lib/udev" ] && mv "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/usr/lib/" } post_copy() { diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf index 81b5530b..74d162e7 100644 --- a/remote/modules/xorg/xorg.conf +++ b/remote/modules/xorg/xorg.conf @@ -1,6 +1,7 @@ REQUIRED_CONTENT_PACKAGES=" xserver-xorg xserver-xorg-core libgl1-mesa-dri + libgl1-mesa-glx xkb-data x11-xkb-utils xserver-xorg-input-evdev @@ -40,7 +41,8 @@ REQUIRED_BINARIES=" Xorg xkbbell xkbevd vmmouse_detect" -REQUIRED_DIRECTORIES=" /lib/udev +REQUIRED_DIRECTORIES=" /usr/lib - /usr/share/X11" + /usr/share/X11 +" REQUIRED_FILES="" |