dracut/correct-paths-for-opensuse.patch

82 lines
3.2 KiB
Diff
Raw Normal View History

--- dracut-033.orig/dracut.sh
+++ dracut-033/dracut.sh
Accepting request 197948 from home:elvigia:branches:Base:System - After testing, we need to correct a major problem, /usr/bin/mount most be installed in /bin/mount on the initrd otherwise boot fails. - version 032 - add parameter --print-cmdline - dracut now creates the initramfs without udevadm that means the udev database does not have to populated and the initramfs can be built in a chroot with /sys /dev /proc mounted. - renamed dracut_install() to inst_multiple() for consistent naming - if $libdirs is unset, fall back to ld.so.cache paths - always assemble /usr device in initramfs - bash module added (disable it, if you really want dash) - continue to boot, if the main loop times out, in systemd mode - removed inst*() shell pure versions, dracut-install binary is in charge now - fixed ifcfg file generation for vlan - do not include adjtime and localtime anymore - fixed generation of zfcp.conf of CMS setups - install vt102 terminfo - dracut_install() is still there for backwards compat - do not strip files in FIPS mode - fixed iBFT interface configuration - fs-lib: install fsck and fsck.ext* - shutdown: fixed killall_proc_mountpoint() - network: also wait for ethernet interfaces to setup - fixed checking for FIPS mode - version 031_git201308011055 * systemd: add support for kmod static devnodes * crypt: Wait for udev to settle before unlocking disk OBS-URL: https://build.opensuse.org/request/show/197948 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=52
2013-09-09 08:08:09 +00:00
@@ -661,7 +661,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
+[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware /lib/firmware/$kernel"
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
[[ $tmpdir ]] || tmpdir=/var/tmp
[[ $compress_l ]] && compress=$compress_l
--- dracut-033.orig/modules.d/10i18n/module-setup.sh
+++ dracut-033/modules.d/10i18n/module-setup.sh
@@ -99,6 +99,8 @@ install() {
install_base() {
Accepting request 197948 from home:elvigia:branches:Base:System - After testing, we need to correct a major problem, /usr/bin/mount most be installed in /bin/mount on the initrd otherwise boot fails. - version 032 - add parameter --print-cmdline - dracut now creates the initramfs without udevadm that means the udev database does not have to populated and the initramfs can be built in a chroot with /sys /dev /proc mounted. - renamed dracut_install() to inst_multiple() for consistent naming - if $libdirs is unset, fall back to ld.so.cache paths - always assemble /usr device in initramfs - bash module added (disable it, if you really want dash) - continue to boot, if the main loop times out, in systemd mode - removed inst*() shell pure versions, dracut-install binary is in charge now - fixed ifcfg file generation for vlan - do not include adjtime and localtime anymore - fixed generation of zfcp.conf of CMS setups - install vt102 terminfo - dracut_install() is still there for backwards compat - do not strip files in FIPS mode - fixed iBFT interface configuration - fs-lib: install fsck and fsck.ext* - shutdown: fixed killall_proc_mountpoint() - network: also wait for ethernet interfaces to setup - fixed checking for FIPS mode - version 031_git201308011055 * systemd: add support for kmod static devnodes * crypt: Wait for udev to settle before unlocking disk OBS-URL: https://build.opensuse.org/request/show/197948 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=52
2013-09-09 08:08:09 +00:00
inst_multiple setfont loadkeys kbd_mode stty
+ inst /usr/bin/setfont /bin/setfont
+ inst /usr/bin/loadkeys /bin/loadkeys
if ! dracut_module_included "systemd"; then
inst ${moddir}/console_init.sh /lib/udev/console_init
--- dracut-033.orig/modules.d/50plymouth/module-setup.sh
+++ dracut-033/modules.d/50plymouth/module-setup.sh
@@ -12,12 +12,12 @@ depends() {
}
install() {
- if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
- || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
+ if grep -q nash /usr/lib/plymouth/plymouth-populate-initrd \
+ || [ ! -x /usr/lib/plymouth/plymouth-populate-initrd ]; then
. "$moddir"/plymouth-populate-initrd.sh
else
PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
- /usr/libexec/plymouth/plymouth-populate-initrd -t "$initdir"
+ /usr/lib/plymouth/plymouth-populate-initrd -t "$initdir"
fi
inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
--- dracut-033.orig/modules.d/90kernel-modules/module-setup.sh
+++ dracut-033/modules.d/90kernel-modules/module-setup.sh
Accepting request 197948 from home:elvigia:branches:Base:System - After testing, we need to correct a major problem, /usr/bin/mount most be installed in /bin/mount on the initrd otherwise boot fails. - version 032 - add parameter --print-cmdline - dracut now creates the initramfs without udevadm that means the udev database does not have to populated and the initramfs can be built in a chroot with /sys /dev /proc mounted. - renamed dracut_install() to inst_multiple() for consistent naming - if $libdirs is unset, fall back to ld.so.cache paths - always assemble /usr device in initramfs - bash module added (disable it, if you really want dash) - continue to boot, if the main loop times out, in systemd mode - removed inst*() shell pure versions, dracut-install binary is in charge now - fixed ifcfg file generation for vlan - do not include adjtime and localtime anymore - fixed generation of zfcp.conf of CMS setups - install vt102 terminfo - dracut_install() is still there for backwards compat - do not strip files in FIPS mode - fixed iBFT interface configuration - fs-lib: install fsck and fsck.ext* - shutdown: fixed killall_proc_mountpoint() - network: also wait for ethernet interfaces to setup - fixed checking for FIPS mode - version 031_git201308011055 * systemd: add support for kmod static devnodes * crypt: Wait for udev to settle before unlocking disk OBS-URL: https://build.opensuse.org/request/show/197948 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=52
2013-09-09 08:08:09 +00:00
@@ -74,7 +74,7 @@ installkernel() {
}
install() {
Accepting request 197948 from home:elvigia:branches:Base:System - After testing, we need to correct a major problem, /usr/bin/mount most be installed in /bin/mount on the initrd otherwise boot fails. - version 032 - add parameter --print-cmdline - dracut now creates the initramfs without udevadm that means the udev database does not have to populated and the initramfs can be built in a chroot with /sys /dev /proc mounted. - renamed dracut_install() to inst_multiple() for consistent naming - if $libdirs is unset, fall back to ld.so.cache paths - always assemble /usr device in initramfs - bash module added (disable it, if you really want dash) - continue to boot, if the main loop times out, in systemd mode - removed inst*() shell pure versions, dracut-install binary is in charge now - fixed ifcfg file generation for vlan - do not include adjtime and localtime anymore - fixed generation of zfcp.conf of CMS setups - install vt102 terminfo - dracut_install() is still there for backwards compat - do not strip files in FIPS mode - fixed iBFT interface configuration - fs-lib: install fsck and fsck.ext* - shutdown: fixed killall_proc_mountpoint() - network: also wait for ethernet interfaces to setup - fixed checking for FIPS mode - version 031_git201308011055 * systemd: add support for kmod static devnodes * crypt: Wait for udev to settle before unlocking disk OBS-URL: https://build.opensuse.org/request/show/197948 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=52
2013-09-09 08:08:09 +00:00
- inst_multiple -o /lib/modprobe.d/*.conf
+ inst_multiple -o /etc/modprobe.d/*.conf
[[ $hostonly ]] && inst_multiple -o /etc/modprobe.d/*.conf /etc/modprobe.conf
if ! dracut_module_included "systemd"; then
inst_hook cmdline 01 "$moddir/parse-kernel.sh"
--- dracut-033.orig/modules.d/95udev-rules/module-setup.sh
+++ dracut-033/modules.d/95udev-rules/module-setup.sh
@@ -11,6 +11,8 @@ install() {
Accepting request 197948 from home:elvigia:branches:Base:System - After testing, we need to correct a major problem, /usr/bin/mount most be installed in /bin/mount on the initrd otherwise boot fails. - version 032 - add parameter --print-cmdline - dracut now creates the initramfs without udevadm that means the udev database does not have to populated and the initramfs can be built in a chroot with /sys /dev /proc mounted. - renamed dracut_install() to inst_multiple() for consistent naming - if $libdirs is unset, fall back to ld.so.cache paths - always assemble /usr device in initramfs - bash module added (disable it, if you really want dash) - continue to boot, if the main loop times out, in systemd mode - removed inst*() shell pure versions, dracut-install binary is in charge now - fixed ifcfg file generation for vlan - do not include adjtime and localtime anymore - fixed generation of zfcp.conf of CMS setups - install vt102 terminfo - dracut_install() is still there for backwards compat - do not strip files in FIPS mode - fixed iBFT interface configuration - fs-lib: install fsck and fsck.ext* - shutdown: fixed killall_proc_mountpoint() - network: also wait for ethernet interfaces to setup - fixed checking for FIPS mode - version 031_git201308011055 * systemd: add support for kmod static devnodes * crypt: Wait for udev to settle before unlocking disk OBS-URL: https://build.opensuse.org/request/show/197948 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=52
2013-09-09 08:08:09 +00:00
inst_multiple udevadm cat uname blkid \
/etc/udev/udev.conf
+ inst /usr/sbin/blkid /sbin/blkid
+
[ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir
for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
[ -x "$_i" ] || continue
--- dracut-033.orig/modules.d/98systemd/rescue.service
+++ dracut-033/modules.d/98systemd/rescue.service
@@ -16,7 +16,7 @@ Environment=HOME=/
Environment=DRACUT_SYSTEMD=1
Environment=NEWROOT=/sysroot
WorkingDirectory=/
-ExecStartPre=-/bin/plymouth quit
+ExecStartPre=-/usr/bin/plymouth quit
ExecStart=-/bin/sh -i -l
ExecStopPost=-/bin/rm -f -- /.console_lock
ExecStopPost=-/usr/bin/systemctl --fail --no-block default
--- dracut-033.orig/modules.d/99fs-lib/module-setup.sh
+++ dracut-033/modules.d/99fs-lib/module-setup.sh
Accepting request 197948 from home:elvigia:branches:Base:System - After testing, we need to correct a major problem, /usr/bin/mount most be installed in /bin/mount on the initrd otherwise boot fails. - version 032 - add parameter --print-cmdline - dracut now creates the initramfs without udevadm that means the udev database does not have to populated and the initramfs can be built in a chroot with /sys /dev /proc mounted. - renamed dracut_install() to inst_multiple() for consistent naming - if $libdirs is unset, fall back to ld.so.cache paths - always assemble /usr device in initramfs - bash module added (disable it, if you really want dash) - continue to boot, if the main loop times out, in systemd mode - removed inst*() shell pure versions, dracut-install binary is in charge now - fixed ifcfg file generation for vlan - do not include adjtime and localtime anymore - fixed generation of zfcp.conf of CMS setups - install vt102 terminfo - dracut_install() is still there for backwards compat - do not strip files in FIPS mode - fixed iBFT interface configuration - fs-lib: install fsck and fsck.ext* - shutdown: fixed killall_proc_mountpoint() - network: also wait for ethernet interfaces to setup - fixed checking for FIPS mode - version 031_git201308011055 * systemd: add support for kmod static devnodes * crypt: Wait for udev to settle before unlocking disk OBS-URL: https://build.opensuse.org/request/show/197948 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=52
2013-09-09 08:08:09 +00:00
@@ -81,4 +81,5 @@ install() {
fi
inst_multiple -o $_helpers fsck
+ inst /usr/bin/mount /bin/mount
}