89f9350d9e
- Fix dmraid issue bnc#905746 A dracut_dmraid_use_udev.patch - Taken over from SLE12 A fips_add_aesni-intel.patch - Do not touch /run vs /var/run bnc#922676 D 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Update dracut to version 042 Remove these already included or unneeded patches: D dracut_v041_to_HEAD.patch D 0011-Correct-paths-for-openSUSE.patch D 0068-95fcoe-uefi-Test-for-EFI-firmware.patch D 0170-enable-logitech-hidpp.patch Adjust/refresh: M 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch M 0016-Add-new-s390x-specific-rule-files.patch M 0017-45ifcfg-use-distro-specific-scripts.patch M 0019-40network-Fix-race-condition-when-wait-for-networks.patch M 0020-00warpclock-Set-correct-timezone.patch M 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch M 0048-40network-Only-enable-network-interfaces-if-explicit.patch M 0053-01fips-fixup-loading-issues.patch M 0056-81cio_ignore-handle-cio_ignore-commandline.patch M 0057-01fips-Include-some-more-hmacs.patch M 0058-dracut-add-warning-when-including-unsupported-module.patch M 0059-99suse-Add-SUSE-specific-initrd-parsing.patch M 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch M 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch M 0066-40network-always-start-netroot-in-ifup.sh.patch M 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch M 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch OBS-URL: https://build.opensuse.org/request/show/314510 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=219
126 lines
4.8 KiB
Diff
126 lines
4.8 KiB
Diff
From dccbc0fc7f1b814ad8a03f380a31bed2c9d86a9b Mon Sep 17 00:00:00 2001
|
|
From: Thomas Renninger <trenn@suse.de>
|
|
Date: Tue, 1 Jul 2014 13:53:43 +0200
|
|
Subject: dracut: caps: Remove whole caps module
|
|
|
|
To get installed it must not have systemd included in initramfs which is
|
|
an unsupported scenario for SUSE.
|
|
This gets also rid of the error in its check function.
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
---
|
|
modules.d/02caps/README | 33 ---------------------------------
|
|
modules.d/02caps/caps.sh | 36 ------------------------------------
|
|
modules.d/02caps/module-setup.sh | 26 --------------------------
|
|
3 files changed, 95 deletions(-)
|
|
delete mode 100644 modules.d/02caps/README
|
|
delete mode 100755 modules.d/02caps/caps.sh
|
|
delete mode 100755 modules.d/02caps/module-setup.sh
|
|
|
|
Index: dracut-042/modules.d/02caps/README
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/02caps/README 2015-06-11 17:39:47.000000000 +0200
|
|
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
@@ -1,33 +0,0 @@
|
|
-This adds the following parameters:
|
|
-rd.caps=1
|
|
- turn the caps module on/off
|
|
-rd.caps.initdrop=cap_sys_module,cap_sys_rawio
|
|
- drop the specified comma separated capabilities
|
|
-rd.caps.disablemodules=1
|
|
- turn off module loading
|
|
-rd.caps.disablekexec=1
|
|
- turn off the kexec functionality
|
|
-
|
|
-If module loading is turned off, all modules have to be loaded in the
|
|
-initramfs, which are used later on. This can be done with
|
|
-"rd.driver.pre="
|
|
-rd.driver.pre=autofs4,sunrpc,ipt_REJECT,nf_conntrack_ipv4,....
|
|
-
|
|
-Because the kernel command line would get huge with all those drivers, I
|
|
-recommend to make use of $initramfs/etc/cmdline.
|
|
-
|
|
-So, all rd.caps.* and rd.driver.pre arguments are in caps.conf can be
|
|
-copied to $initramfs/etc/cmdline with "-i caps.conf /etc/cmdline".
|
|
-
|
|
-Also all modules have to be loaded in the initramfs via "--add-drivers".
|
|
-
|
|
-The resulting initramfs creation would look like this:
|
|
-
|
|
- --add-drivers "autofs4 sunrpc ipt_REJECT nf_conntrack_ipv4 \
|
|
- nf_defrag_ipv4 iptable_filter ip_tables
|
|
- ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack
|
|
- ip6table_filter ip6_tables dm_mirror dm_region_hash dm_log uinput ppdev
|
|
- parport_pc parport ipv6 sg 8139too 8139cp mii i2c_piix4 i2c_core ext3
|
|
- jbd mbcache sd_mod crc_t10dif sr_mod cdrom ata_generic pata_acpi ata_piix
|
|
- dm_mod" \
|
|
- /boot/initramfs-caps.img
|
|
Index: dracut-042/modules.d/02caps/module-setup.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/02caps/module-setup.sh 2015-06-11 17:39:47.000000000 +0200
|
|
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
@@ -1,24 +0,0 @@
|
|
-#!/bin/bash
|
|
-
|
|
-# called by dracut
|
|
-check() {
|
|
- require_binaries capsh
|
|
-}
|
|
-
|
|
-# called by dracut
|
|
-depends() {
|
|
- return 0
|
|
-}
|
|
-
|
|
-# called by dracut
|
|
-install() {
|
|
- if ! dracut_module_included "systemd"; then
|
|
- inst_hook pre-pivot 00 "$moddir/caps.sh"
|
|
- inst $(type -P capsh 2>/dev/null) /usr/sbin/capsh
|
|
- # capsh wants bash and we need bash also
|
|
- inst /bin/bash
|
|
- else
|
|
- dwarning "caps: does not work with systemd in the initramfs"
|
|
- fi
|
|
-}
|
|
-
|
|
Index: dracut-042/modules.d/02caps/caps.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/02caps/caps.sh 2015-06-11 17:39:47.000000000 +0200
|
|
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
@@ -1,34 +0,0 @@
|
|
-#!/bin/bash
|
|
-
|
|
-capsmode=$(getarg rd.caps)
|
|
-
|
|
-if [ "$capsmode" = "1" ]; then
|
|
- CAPS_INIT_DROP=$(getarg rd.caps.initdrop=)
|
|
- CAPS_USERMODEHELPER_BSET=$(capsh --drop="$CAPS_INIT_DROP" -- -c 'while read a b || [ -n "$a" ]; do [ "$a" = "CapBnd:" ] && echo $((0x${b:$((${#b}-8)):8})) $((0x${b:$((${#b}-16)):8})) && break; done < /proc/self/status')
|
|
- CAPS_MODULES_DISABLED=$(getarg rd.caps.disablemodules=)
|
|
- CAPS_KEXEC_DISABLED=$(getarg rd.caps.disablekexec=)
|
|
-
|
|
- info "Loading CAPS_MODULES $CAPS_MODULES"
|
|
- for i in $CAPS_MODULES;do modprobe $i 2>&1 >/dev/null | vinfo; done
|
|
-
|
|
- if [ "$CAPS_MODULES_DISABLED" = "1" -a -e /proc/sys/kernel/modules_disabled ]; then
|
|
- info "Disabling module loading."
|
|
- echo $CAPS_MODULES_DISABLED > /proc/sys/kernel/modules_disabled
|
|
- fi
|
|
-
|
|
- if [ "$CAPS_KEXEC_DISABLED" = "1" -a -e /proc/sys/kernel/kexec_disabled ]; then
|
|
- info "Disabling kexec."
|
|
- echo $CAPS_KEXEC_DISABLED > /proc/sys/kernel/kexec_disabled
|
|
- fi
|
|
-
|
|
- info "CAPS_USERMODEHELPER_BSET=$CAPS_USERMODEHELPER_BSET"
|
|
- if [ -e /proc/sys/kernel/usermodehelper/bset ]; then
|
|
- info "Setting usermode helper bounding set."
|
|
- echo $CAPS_USERMODEHELPER_BSET > /proc/sys/kernel/usermodehelper/bset
|
|
- echo $CAPS_USERMODEHELPER_BSET > /proc/sys/kernel/usermodehelper/inheritable
|
|
- fi
|
|
-
|
|
- echo "CAPS_INIT_DROP=\"$CAPS_INIT_DROP\"" > /etc/capsdrop
|
|
- info "Will drop capabilities $CAPS_INIT_DROP from init."
|
|
-fi
|
|
-
|