diff --git a/correct-paths-for-opensuse.patch b/correct-paths-for-opensuse.patch new file mode 100644 index 0000000..ea10416 --- /dev/null +++ b/correct-paths-for-opensuse.patch @@ -0,0 +1,178 @@ +--- dracut-024/modules.d/10i18n/module-setup.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/10i18n/module-setup.sh 2012-11-01 19:52:37.196044993 +0100 +@@ -86,6 +86,8 @@ + install_base() { + dracut_install setfont loadkeys kbd_mode stty + ++ inst /usr/bin/setfont /bin/setfont ++ inst /usr/bin/loadkeys /bin/loadkeys + inst ${moddir}/console_init.sh /lib/udev/console_init + inst_rules ${moddir}/10-console.rules + inst_hook cmdline 20 "${moddir}/parse-i18n.sh" +--- dracut-024/modules.d/50plymouth/module-setup.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/50plymouth/module-setup.sh 2012-11-01 19:52:37.196044993 +0100 +@@ -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() { +@@ -64,12 +64,12 @@ + } + + 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 pre-pivot 90 "$moddir"/plymouth-newroot.sh +--- dracut-024/modules.d/50plymouth/plymouth-emergency.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/50plymouth/plymouth-emergency.sh 2012-11-01 19:52:37.196044993 +0100 +@@ -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-024/modules.d/50plymouth/plymouth-newroot.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/50plymouth/plymouth-newroot.sh 2012-11-01 19:52:37.196044993 +0100 +@@ -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-024/modules.d/50plymouth/plymouth-populate-initrd.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/50plymouth/plymouth-populate-initrd.sh 2012-11-01 19:52:37.196044993 +0100 +@@ -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-024/modules.d/50plymouth/plymouth-pretrigger.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/50plymouth/plymouth-pretrigger.sh 2012-11-01 19:52:37.196044993 +0100 +@@ -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 @@ + 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-024/modules.d/95udev-rules/module-setup.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/95udev-rules/module-setup.sh 2012-11-01 19:53:58.859048946 +0100 +@@ -11,6 +11,8 @@ + 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 +--- a/dracut.sh ++++ b/dracut.sh +@@ -561,7 +561,7 @@ + [[ $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 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -69,7 +69,7 @@ + } + + 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 + inst_hook cmdline 01 "$moddir/parse-kernel.sh" + inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh +--- dracut-024/modules.d/90crypt/crypt-lib.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/90crypt/crypt-lib.sh 2012-11-02 23:39:56.702130681 +0100 +@@ -47,8 +47,8 @@ + + { 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-024/modules.d/90dmsquash-live/dmsquash-live-root.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/90dmsquash-live/dmsquash-live-root.sh 2012-11-02 23:40:31.807132380 +0100 +@@ -31,13 +31,13 @@ + 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 + checkisomd5 --verbose $livedev + if [ $? -ne 0 ]; 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-024/modules.d/98systemd/dracut-emergency.service 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/98systemd/dracut-emergency.service 2012-11-02 23:41:13.214134384 +0100 +@@ -14,7 +14,7 @@ + [Service] + Environment=HOME=/ + WorkingDirectory=/ +-ExecStartPre=-/bin/plymouth quit ++ExecStartPre=-/usr/bin/plymouth quit + ExecStartPre=-/bin/echo -e '\n\nEntering emergency mode. Exit the shell to continue.\nType "journalctl" to view system logs.\n' + ExecStart=-/bin/sh -i -l + ExecStopPost=-/bin/rm -f /.console_lock +--- dracut-024/modules.d/98systemd/rescue.service 2012-10-16 16:31:06.000000000 +0200 ++++ new/modules.d/98systemd/rescue.service 2012-11-02 23:42:36.401138410 +0100 +@@ -14,7 +14,7 @@ + [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 diff --git a/dracut-023.tar.xz b/dracut-023.tar.xz deleted file mode 100644 index 6119d2a..0000000 --- a/dracut-023.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:727cd8d0a54d7844174ab9e928ce770547577f971bbbb49a252f7c9b007cd5be -size 209588 diff --git a/dracut-024.tar.xz b/dracut-024.tar.xz new file mode 100644 index 0000000..d6a5ca4 --- /dev/null +++ b/dracut-024.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d88dc31f326cd6064f7bdcf48a5985bbcfb829fd773b2c0ee93c4c6de86b9f32 +size 212252 diff --git a/dracut.changes b/dracut.changes index f7fe531..745a08d 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Nov 5 08:44:30 UTC 2012 - tittiatcoke@gmail.com + +- Added additional patches to make dracut work in an openSUSE + environment. + +- Added patch (use_all_paths_udev.patch) to use both /usr/lib/udev + and /lib/udev as long as not all packages migrated. +- Added patch (use_initrd_insteadof_initramfs.patch) to change + the naming of the generated initrd file to be more openSUSE +- Added patch (use_sysconfig_values_correctly.patch) to read the + correct keymap value from /etc/sysconfig. (.gz extension) + +------------------------------------------------------------------- +Thu Nov 1 17:47:45 UTC 2012 - tittiatcoke@gmail.com + +- Update to release 024: + + new dracut option "--device" + + new dracut kernel command line options "rd.auto" + + new dracut kernel command line options "rd.noverifyssl" + + new dracut option "--kernel-cmdline" and "kernel_cmdline" + option for default parameters + + fixes for systemd and crypto + + fix for kexec in shutdown, if not included in initramfs + + create the initramfs non-world readable + + prelink/preunlink in the initramfs + + strip binaries in the initramfs by default now + + various FIPS fixes + + various dracut-install fixes + +- Added patch (correct-paths-for-opensuse.patch) to ensure correct + paths for openSUSE (Plymouth) + ------------------------------------------------------------------- Fri Sep 28 12:10:20 UTC 2012 - fcrozat@suse.com diff --git a/dracut.spec b/dracut.spec index 8a8509a..c68d024 100644 --- a/dracut.spec +++ b/dracut.spec @@ -21,7 +21,7 @@ %define replace_mkinitrd 0 Name: dracut -Version: 023 +Version: 024 Release: 0 Summary: Initramfs generator using udev @@ -35,8 +35,14 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{versi # (not to be upstreamed) Source1: module-setup-initrd.sh Source2: parse-suse-initrd.sh -# PATCH-FIX-UPSTREAM initramfs-non-world-readable.patch fcrozat@suse.com -- fix CVE-2012-4453 bnc#782734 -Patch0: initramfs-non-world-readable.patch +# PATCH-FIX-OPENSUSE correct the paths for openSUSE - tittiatcoke@gmail.com +Patch0: correct-paths-for-opensuse.patch +# PATCH-FIX-OPENSUSE change the default naming from initramfs to initrd - tittiatcoke@gmail.com +Patch1: use_initrd_insteadof_initramfs.patch +# PATCH-FIX-OPENSUSE Strip the gz extension from the keymap mentioned in /etc/sysconfig/keyboard - tittiatcoke@gmail.com +Patch2: use_sysconfig_values_correctly.patch +# PATCH-FIX-OPENSUSE At the moment we have 2 paths that contain udev files (/lib/udev and /usr/lib/udev) - tittiatcoke@gmail.com +Patch3: use_all_paths_udev.patch BuildRequires: bash BuildRequires: dash @@ -107,6 +113,9 @@ This package contains tools to assemble the local initrd and host configuration. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build make all -e CFLAGS="%{optflags}" diff --git a/initramfs-non-world-readable.patch b/initramfs-non-world-readable.patch deleted file mode 100644 index 56c9b2a..0000000 --- a/initramfs-non-world-readable.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e1b48995c26c4f06d1a718539cb1bd5b0179af91 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 27 Sep 2012 10:18:29 +0200 -Subject: [PATCH] dracut.sh: create the initramfs non-world readable - ---- - dracut.sh | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index 7148d0f..96faa06 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1033,8 +1033,9 @@ if [[ $do_hardlink = yes ]] ; then - } - fi - -+rm -f "$outfile" - dinfo "*** Creating image file ***" --if ! ( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet| \ -+if ! ( umask 077; cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet| \ - $compress > "$outfile"; ); then - dfatal "dracut: creation of $outfile failed" - exit 1 --- -1.7.7.6 - diff --git a/use_all_paths_udev.patch b/use_all_paths_udev.patch new file mode 100644 index 0000000..d60ad5a --- /dev/null +++ b/use_all_paths_udev.patch @@ -0,0 +1,12 @@ +diff -urB dracut-024/dracut-functions.sh new/dracut-functions.sh +--- dracut-024/dracut-functions.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/dracut-functions.sh 2012-11-04 00:20:30.736648962 +0100 +@@ -901,7 +901,7 @@ + inst_dir "$_target" + for _rule in "$@"; do + if [ "${rule#/}" = "$rule" ]; then +- for r in ${udevdir}/rules.d /etc/udev/rules.d; do ++ for r in ${udevdir}/rules.d lib/udev/rules.d /etc/udev/rules.d; do + if [[ -f $r/$_rule ]]; then + _found="$r/$_rule" + inst_rule_programs "$_found" diff --git a/use_initrd_insteadof_initramfs.patch b/use_initrd_insteadof_initramfs.patch new file mode 100644 index 0000000..523927a --- /dev/null +++ b/use_initrd_insteadof_initramfs.patch @@ -0,0 +1,171 @@ +diff -urB dracut-024/dracut.8.asc new/dracut.8.asc +--- dracut-024/dracut.8.asc 2012-10-16 16:31:06.000000000 +0200 ++++ new/dracut.8.asc 2012-11-02 14:34:30.037441264 +0100 +@@ -18,7 +18,7 @@ + Create an initramfs for the kernel with the version . + If is omitted, then the version of the actual running + kernel is used. If is omitted or empty, then the default location +-/boot/initramfs-.img is used. ++/boot/initrd- is used. + + dracut creates an initial image used by the kernel for preloading the block + device modules (such as IDE, SCSI or RAID) which are needed to access the root +@@ -40,7 +40,7 @@ + + This will generate a general purpose initramfs image, with all possible + functionality resulting of the combination of the installed dracut modules and +-system tools. The image is /boot/initramfs-_++++_.img and ++system tools. The image is /boot/initrd-_++++_ and + contains the kernel modules of the currently active kernel with version + _++++_. + +diff -urB dracut-024/dracut.asc new/dracut.asc +--- dracut-024/dracut.asc 2012-10-16 16:31:06.000000000 +0200 ++++ new/dracut.asc 2012-11-02 14:35:49.947445131 +0100 +@@ -130,7 +130,7 @@ + + This will generate a general purpose initramfs image, with all possible + functionality resulting of the combination of the installed dracut modules and +-system tools. The image is /boot/initramfs-_++++_.img and ++system tools. The image is /boot/initrd-_++++_ and + contains the kernel modules of the currently active kernel with version + _++++_. + +@@ -170,12 +170,12 @@ + === Inspecting the Contents + To see the contents of the image created by dracut, you can use the lsinitrd tool. + ---- +-# lsinitrd /boot/initramfs-$(uname -r).img | less ++# lsinitrd /boot/initrd-$(uname -r) | less + ---- + + To display the contents of a file in the initramfs also use the lsinitrd tool: + ---- +-# lsinitrd /boot/initramfs-$(uname -r).img /etc/ld.so.conf ++# lsinitrd /boot/initrd-$(uname -r) /etc/ld.so.conf + include ld.so.conf.d/*.conf + ---- + +@@ -186,7 +186,7 @@ + You can also add dracut modules on the command line + by using the -a or --add option: + ---- +-# dracut --add bootchart initramfs-bootchart.img ++# dracut --add bootchart initrd-bootchart + ---- + + To see a list of available dracut modules, use the --list-modules option: +@@ -215,7 +215,7 @@ + on the command line or the drivers vaiable in the _/etc/dracut.conf_ + or _/etc/dracut.conf.d/myconf.conf_ configuration file (see <>): + ---- +-# dracut --add-drivers mymod initramfs-with-mymod.img ++# dracut --add-drivers mymod initrd-with-mymod + ---- + + == Boot parameters +@@ -328,7 +328,7 @@ + + The --include option let you specify a source path and a target path. For example + ---- +-# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initramfs-cmdline-pre.img ++# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initrd-cmdline-pre.img + ---- + will create an initramfs image, where the file cmdline-preset will be copied + inside the initramfs to _/etc/cmdline.d/mycmdline.conf_. --include can only be specified once. +@@ -350,7 +350,7 @@ + └── conf.d + └── testvar.conf + +-# dracut --include rd.live.overlay / initramfs-rd.live.overlay.img ++# dracut --include rd.live.overlay / initrd-rd.live.overlay.img + ---- + + This will put the contents of the rd.live.overlay directory into the root of the +@@ -362,7 +362,7 @@ + + + ---- +-# dracut --install 'strace fsck.ext3 ssh' initramfs-dbg.img ++# dracut --install 'strace fsck.ext3 ssh' initrd-dbg + ---- + + This will create an initramfs with the strace, fsck.ext3 and ssh executables, +@@ -414,7 +414,7 @@ + + + ---- +-# dracut -m "nfs network base" initramfs-nfs-only.img ++# dracut -m "nfs network base" initrd-nfs-only + ---- + + Then you would boot from this image with your target machine and reduce the size +@@ -422,7 +422,7 @@ + + + ---- +-# dracut -m "nfs network base" --host-only initramfs-nfs-host-only.img ++# dracut -m "nfs network base" --host-only initrd-nfs-host-only + ---- + + This will reduce the size of the initramfs image significantly. +diff -urB dracut-024/dracut-initramfs-restore.sh new/dracut-initramfs-restore.sh +--- dracut-024/dracut-initramfs-restore.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/dracut-initramfs-restore.sh 2012-11-02 14:34:30.036441264 +0100 +@@ -4,7 +4,7 @@ + + set -e + cd /run/initramfs +-IMG="/boot/initramfs-$(uname -r).img" ++IMG="/boot/initrd-$(uname -r)" + [ -f .need_shutdown -a -f "$IMG" ] || exit 1 + if zcat "$IMG" | cpio -id >/dev/null 2>&1; then + rm .need_shutdown +diff -urB dracut-024/dracut.sh new/dracut.sh +--- dracut-024/dracut.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/dracut.sh 2012-11-02 14:34:30.038441264 +0100 +@@ -417,7 +417,7 @@ + fi + + if ! [[ $outfile ]]; then +- outfile="/boot/initramfs-$kernel.img" ++ outfile="/boot/initrd-$kernel" + fi + + for i in /usr/sbin /sbin /usr/bin /bin; do +diff -urB dracut-024/lsinitrd.1.asc new/lsinitrd.1.asc +--- dracut-024/lsinitrd.1.asc 2012-10-16 16:31:06.000000000 +0200 ++++ new/lsinitrd.1.asc 2012-11-02 14:34:30.039441264 +0100 +@@ -15,7 +15,7 @@ + DESCRIPTION + ----------- + lsinitrd shows the contents of an initramfs image. if is omitted, then +-lsinitrd uses the default image /boot/initramfs-.img. ++lsinitrd uses the default image /boot/initrd-. + + OPTIONS + ------- +diff -urB dracut-024/lsinitrd.sh new/lsinitrd.sh +--- dracut-024/lsinitrd.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/lsinitrd.sh 2012-11-02 14:34:30.039441264 +0100 +@@ -36,7 +36,7 @@ + done + shift $((OPTIND-1)) + +-image="${1:-/boot/initramfs-$(uname -r).img}" ++image="${1:-/boot/initrd-$(uname -r)}" + [[ -f "$image" ]] || { echo "$image does not exist" ; exit 1 ; } + + CAT=zcat +diff -urB dracut-024/mkinitrd-dracut.sh new/mkinitrd-dracut.sh +--- dracut-024/mkinitrd-dracut.sh 2012-10-16 16:31:06.000000000 +0200 ++++ new/mkinitrd-dracut.sh 2012-11-02 14:34:30.039441264 +0100 +@@ -11,7 +11,7 @@ + $cmd " [--nocompress]" + $cmd " " + $cmd "" +- $cmd " (ex: ${0##*/} /boot/initramfs-$kver.img $kver)" ++ $cmd " (ex: ${0##*/} /boot/initrd-$kver $kver)" + + [[ $1 = '-n' ]] && exit 0 + exit 1 diff --git a/use_sysconfig_values_correctly.patch b/use_sysconfig_values_correctly.patch new file mode 100644 index 0000000..5f6a0f6 --- /dev/null +++ b/use_sysconfig_values_correctly.patch @@ -0,0 +1,13 @@ +diff -urB new/modules.d/10i18n/module-setup.sh new1/modules.d/10i18n/module-setup.sh +--- new/modules.d/10i18n/module-setup.sh 2012-11-02 19:50:30.082452541 +0100 ++++ new1/modules.d/10i18n/module-setup.sh 2012-11-02 19:50:49.884453499 +0100 +@@ -144,6 +144,9 @@ + # Gentoo user may have KEYMAP set to something like "-u pl2", + KEYMAP=${KEYMAP#-* } + ++ # openSUSE user may have KEYMAP set to something like ".gz" ++ KEYMAP=${KEYMAP/.gz/} ++ + # KEYTABLE is a bit special - it defines base keymap name and UNICODE + # determines whether non-UNICODE or UNICODE version is used +