pool/dracut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
dracut/correct-paths-for-opensuse.patch
Raymond Wooninck 1e47df8b86 Accepting request 160131 from home:elvigia:branches:Base:System 
- Update to 026_git201303180829
* bugfixes
* adds bash completion Support
- Most importantly, fix the (silly) compatibility patch 
  that changes the name from initramfs to initrd that went broken
  in last update (all initrds were suffixed by .img)

OBS-URL: https://build.opensuse.org/request/show/160131
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=21
2013-03-20 06:04:32 +00:00

170 lines
7.5 KiB
Diff
Raw Blame History

--- dracut-026_git201303180829.orig/dracut.sh
+++ dracut-026_git201303180829/dracut.sh
@@ -621,7 +621,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-026_git201303180829.orig/modules.d/10i18n/module-setup.sh
+++ dracut-026_git201303180829/modules.d/10i18n/module-setup.sh
@@ -85,6 +85,8 @@ install() {
install_base() {
dracut_install 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-026_git201303180829.orig/modules.d/50plymouth/module-setup.sh
+++ dracut-026_git201303180829/modules.d/50plymouth/module-setup.sh
@@ -4,7 +4,7 @@
check() {
[[ "$mount_needs" ]] && return 1
- [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
+ [[ -x /usr/sbin/plymouthd && -x /usr/bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
}
depends() {
@@ -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-026_git201303180829.orig/modules.d/50plymouth/plymouth-emergency.sh
+++ dracut-026_git201303180829/modules.d/50plymouth/plymouth-emergency.sh
@@ -1,4 +1,4 @@
#!/bin/sh
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+[ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash
--- dracut-026_git201303180829.orig/modules.d/50plymouth/plymouth-newroot.sh
+++ dracut-026_git201303180829/modules.d/50plymouth/plymouth-newroot.sh
@@ -2,6 +2,6 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-if [ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
- /bin/plymouth --newroot=$NEWROOT
+if [ -x /usr/bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
+ /usr/bin/plymouth --newroot=$NEWROOT
fi
--- dracut-026_git201303180829.orig/modules.d/50plymouth/plymouth-populate-initrd.sh
+++ dracut-026_git201303180829/modules.d/50plymouth/plymouth-populate-initrd.sh
@@ -4,8 +4,8 @@
PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
PLYMOUTH_THEME=$(plymouth-set-default-theme)
-inst /sbin/plymouthd /bin/plymouthd
-dracut_install /bin/plymouth \
+inst /usr/sbin/plymouthd /usr/sbin/plymouthd
+dracut_install /usr/bin/plymouth \
"${PLYMOUTH_LOGO_FILE}" \
/etc/system-release
--- dracut-026_git201303180829.orig/modules.d/50plymouth/plymouth-pretrigger.sh
+++ dracut-026_git201303180829/modules.d/50plymouth/plymouth-pretrigger.sh
@@ -2,7 +2,7 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
+if [ -x /usr/sbin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
# first trigger graphics subsystem
udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
@@ -16,8 +16,8 @@ if [ -x /bin/plymouthd -a -z "$DRACUT_SY
read consoledev rest < /sys/class/tty/console/active
consoledev=${consoledev:-tty0}
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
- [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
- /bin/plymouth --show-splash 2>&1 | vinfo
+ [ -x /usr/sbin/plymouthd ] && /usr/sbin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
+ /usr/bin/plymouth --show-splash 2>&1 | vinfo
# reset tty after plymouth messed with it
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
fi
--- dracut-026_git201303180829.orig/modules.d/90crypt/crypt-lib.sh
+++ dracut-026_git201303180829/modules.d/90crypt/crypt-lib.sh
@@ -47,8 +47,8 @@ ask_for_password() {
{ flock -s 9;
# Prompt for password with plymouth, if installed and running.
- if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
- /bin/plymouth ask-for-password \
+ if [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --ping; then
+ /usr/bin/plymouth ask-for-password \
--prompt "$ply_prompt" --number-of-tries=$ply_tries \
--command="$ply_cmd"
ret=$?
--- dracut-026_git201303180829.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh
+++ dracut-026_git201303180829/modules.d/90dmsquash-live/dmsquash-live-root.sh
@@ -31,7 +31,7 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf"
fi
getarg rd.live.check -d check || check=""
if [ -n "$check" ]; then
- [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash
if [ -n "$DRACUT_SYSTEMD" ]; then
p=$(str_replace "$livedev" "-" '\x2d')
systemctl start checkisomd5@${p}.service
@@ -42,7 +42,7 @@ if [ -n "$check" ]; then
die "CD check failed!"
exit 1
fi
- [ -x /bin/plymouth ] && /bin/plymouth --show-splash
+ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --show-splash
fi
ln -s $livedev /run/initramfs/livedev
--- dracut-026_git201303180829.orig/modules.d/90kernel-modules/module-setup.sh
+++ dracut-026_git201303180829/modules.d/90kernel-modules/module-setup.sh
@@ -74,7 +74,7 @@ installkernel() {
}
install() {
- dracut_install -o /lib/modprobe.d/*.conf
+ dracut_install -o /etc/modprobe.d/*.conf
[[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf
if ! dracut_module_included "systemd"; then
inst_hook cmdline 01 "$moddir/parse-kernel.sh"
--- dracut-026_git201303180829.orig/modules.d/95udev-rules/module-setup.sh
+++ dracut-026_git201303180829/modules.d/95udev-rules/module-setup.sh
@@ -11,6 +11,8 @@ install() {
dracut_install udevadm cat uname blkid \
/etc/udev/udev.conf
+ inst /usr/sbin/blkid /sbin/blkid
+
[ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd
for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /lib/systemd/systemd-udevd /sbin/udevd; do
[ -x "$_i" ] || continue
--- dracut-026_git201303180829.orig/modules.d/98systemd/rescue.service
+++ dracut-026_git201303180829/modules.d/98systemd/rescue.service
@@ -14,7 +14,7 @@ DefaultDependencies=no
[Service]
Environment=HOME=/
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
Reference in New Issue View Git Blame Copy Permalink