[gentoo-commits] gentoo-x86 commit in sys-kernel/mkinitcpio/files: mkinitcpio-pcmcia-install.patch usb-load-ehci-first.conf mkinitcpio-lvm2-install.patch mkinitcpio-dmraid-install.patch mkinitcpio-encrypt-install.patch gentoo.preset mkinitcpio-base-install.patch mkinitcpio-keymap-install.patch mkinitcpio-udev-install.patch mkinitcpio-consolefont-install.patch mkinitcpio-mdadm_udev-install.patch

[Michael Weber (xmw)]

xmw         12/07/02 10:43:03

  Added:                mkinitcpio-pcmcia-install.patch
                        usb-load-ehci-first.conf
                        mkinitcpio-lvm2-install.patch
                        mkinitcpio-dmraid-install.patch
                        mkinitcpio-encrypt-install.patch gentoo.preset
                        mkinitcpio-base-install.patch
                        mkinitcpio-keymap-install.patch
                        mkinitcpio-udev-install.patch
                        mkinitcpio-consolefont-install.patch
                        mkinitcpio-mdadm_udev-install.patch
  Log:
  Initial import from bug 424449, thanks brainbug75@×××.net, udeved and all forum contributors
  
  (Portage version: 2.1.11.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch?rev=1.1&content-type=text/plain

Index: mkinitcpio-pcmcia-install.patch
===================================================================
--- pcmciautils-018-4/usr/lib/initcpio/install/pcmcia
+++ pcmciautils-018-4/usr/lib/initcpio/install/pcmcia
@@ -6,9 +6,9 @@
 
     [[ $MODULES ]] && MODULES+=" sd_mod?"
 
-    add_binary "/usr/lib/udev/pcmcia-socket-startup"
-    add_binary "/usr/lib/udev/pcmcia-check-broken-cis"
-    add_file "/usr/lib/udev/rules.d/60-pcmcia.rules"
+    add_binary "/lib/udev/pcmcia-socket-startup"
+    add_binary "/lib/udev/pcmcia-check-broken-cis"
+    add_file "/lib/udev/rules.d/60-pcmcia.rules"
 }
 
 help() {



1.1                  sys-kernel/mkinitcpio/files/usb-load-ehci-first.conf

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/usb-load-ehci-first.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/usb-load-ehci-first.conf?rev=1.1&content-type=text/plain

Index: usb-load-ehci-first.conf
===================================================================
softdep ohci_hcd pre: ehci_hcd
softdep uhci_hcd pre: ehci_hcd



1.1                  sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch?rev=1.1&content-type=text/plain

Index: mkinitcpio-lvm2-install.patch
===================================================================
--- lvm2-2.02.96-2/usr/lib/initcpio/install/lvm2
+++ lvm2-2.02.96-2/usr/lib/initcpio/install/lvm2
@@ -8,10 +8,10 @@
 
     add_binary "/sbin/lvm"
     add_binary "/sbin/dmsetup"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+    add_file "/lib/udev/rules.d/10-dm.rules"
+    add_file "/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/lib/udev/rules.d/11-dm-lvm.rules"
     add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
 
     add_runscript



1.1                  sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch?rev=1.1&content-type=text/plain

Index: mkinitcpio-dmraid-install.patch
===================================================================
--- dmraid-1.0.0.rc16.3-7/usr/lib/initcpio/install/dmraid
+++ dmraid-1.0.0.rc16.3-7/usr/lib/initcpio/install/dmraid
@@ -6,9 +6,9 @@
 
     add_binary 'dmraid'
     add_binary 'dmsetup'
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/lib/udev/rules.d/10-dm.rules"
+    add_file "/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/lib/udev/rules.d/95-dm-notify.rules"
 
     add_runscript
 }



1.1                  sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch?rev=1.1&content-type=text/plain

Index: mkinitcpio-encrypt-install.patch
===================================================================
--- cryptsetup-1.4.3-1/usr/lib/initcpio/install/encrypt
+++ cryptsetup-1.4.3-1/usr/lib/initcpio/install/encrypt
@@ -14,9 +14,9 @@
 
     add_binary "cryptsetup"
     add_binary "dmsetup"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/lib/udev/rules.d/10-dm.rules"
+    add_file "/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/lib/udev/rules.d/95-dm-notify.rules"
     add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
 
     add_runscript



1.1                  sys-kernel/mkinitcpio/files/gentoo.preset

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/gentoo.preset?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/gentoo.preset?rev=1.1&content-type=text/plain

Index: gentoo.preset
===================================================================
#PRESETS=('default' 'fallback')
PRESETS=('default')

presetname_kver="KV"
presetname_config="gentoo"
presetname_image="kernel-KV"

default_kver="KV"
default_config="/etc/mkinitcpio.conf"
default_image="/boot/initramfs-KV.img"
default_options=""

#fallback_kver="KV"
#fallback_config="/etc/mkinitcpio.conf"
#fallback_image="/boot/initramfs-KV-fallback.img"
#fallback_options="-S autodetect"


1.1                  sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch?rev=1.1&content-type=text/plain

Index: mkinitcpio-base-install.patch
===================================================================
--- mkinitcpio-0.9.2-r1/install/base
+++ mkinitcpio-0.9.2-r1/install/base
@@ -12,9 +12,9 @@
     add_symlink /bin usr/bin
     add_symlink /usr/sbin bin
 
-    add_binary /usr/lib/initcpio/busybox /bin/busybox
+    add_binary /bin/busybox
 
-    for applet in $(/usr/lib/initcpio/busybox --list); do
+    for applet in $(/bin/busybox --list); do
         add_symlink "/usr/bin/$applet" busybox
     done
 



1.1                  sys-kernel/mkinitcpio/files/mkinitcpio-keymap-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-keymap-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-keymap-install.patch?rev=1.1&content-type=text/plain

Index: mkinitcpio-keymap-install.patch
===================================================================
--- mkinitcpio-0.9.2-r1/install/keymap
+++ mkinitcpio-0.9.2-r1/install/keymap
@@ -7,21 +7,21 @@
         l=$LANG
         unset LANG
 
-        for cfg in /etc/{rc,vconsole,locale}.conf; do
+        for cfg in /etc/conf.d/keymaps; do
             [[ -s $cfg ]] && . "$cfg"
         done
 
         [[ $LANG ]] && LOCALE=$LANG
         LANG=$l
 
-        if [[ $KEYMAP ]]; then
+        if [[ $keymap ]]; then
             if [[ $LOCALE = *[Uu][Tt][Ff]?(-)8 ]]; then
                 touch "$BUILDROOT/keymap.utf8"
                 uc=-u
             fi
-            loadkeys -q $uc $KEYMAP -b > "$BUILDROOT/keymap.bin"
+            loadkeys -q $uc $keymap -b > "$BUILDROOT/keymap.bin"
         else
-            warning "keymap: hook specified, but no KEYMAP found in configuration"
+            warning "keymap: hook specified, but no keymap found in configuration"
             return 1
         fi
     ) && add_runscript
@@ -29,7 +29,7 @@
 
 help() {
     cat <<HELPEOF
-This hook loads keymap(s) specified in vconsole.conf or rc.conf during early
+This hook loads keymap(s) specified in keymaps during early
 userspace.
 HELPEOF
 }



1.1                  sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch?rev=1.1&content-type=text/plain

Index: mkinitcpio-udev-install.patch
===================================================================
--- systemd-tools-185/usr/lib/initcpio/install/udev
+++ systemd-tools-185/usr/lib/initcpio/install/udev
@@ -4,14 +4,14 @@
     local rules tool
 
     add_file "/etc/udev/udev.conf"
-    add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
+    add_binary /lib/udev/udevd /usr/bin/udevd
     add_binary /usr/bin/udevadm
 
     for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
-        add_file "/usr/lib/udev/rules.d/$rules"
+        add_file "/lib/udev/rules.d/$rules"
     done
     for tool in ata_id scsi_id; do
-        add_file "/usr/lib/udev/$tool"
+        add_file "/lib/udev/$tool"
     done
 
     add_runscript



1.1                  sys-kernel/mkinitcpio/files/mkinitcpio-consolefont-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-consolefont-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-consolefont-install.patch?rev=1.1&content-type=text/plain

Index: mkinitcpio-consolefont-install.patch
===================================================================
--- mkinitcpio-0.9.2-r1/install/consolefont
+++ mkinitcpio-0.9.2-r1/install/consolefont
@@ -3,14 +3,14 @@
 build() {
     # subshell to avoid namespace pollution
     (
-        for cfg in /etc/{rc,vconsole}.conf; do
+        for cfg in /etc/conf.d/consolefont; do
             [[ -s $cfg ]] && . "$cfg"
         done
 
-        [[ $FONT ]] && CONSOLEFONT=$FONT
+        [[ $FONT ]] && consolefont=$FONT
 
-        if [[ $CONSOLEFONT ]]; then
-            for file in "/usr/share/kbd/consolefonts/$CONSOLEFONT".psf?(u)?(.gz); do
+        if [[ $consolefont ]]; then
+            for file in "/usr/share/consolefonts/$consolefont".psf?(u)?(.gz); do
                 if [[ -e $file ]]; then
                     [[ $file =~ \.(psfu?)(\.gz)?$ ]] && ext=${BASH_REMATCH[1]}
                     if [[ $file = *.gz ]]; then
@@ -21,7 +21,7 @@
                     exit 0
                 fi
             done
-            error "consolefont: requested font not found: \`%s'" "$CONSOLEFONT"
+            error "consolefont: requested font not found: \`%s'" "$consolefont"
             exit 1
         else
             warning "consolefont: no font found in configuration"
@@ -37,4 +37,4 @@
 HELPEOF
 }
 
-# vim: set ft=sh ts=4 sw=4 et:
+# vim: set ft=sh ts=4 sw=4 et:
\ Kein Zeilenumbruch am Dateiende.



1.1                  sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch?rev=1.1&content-type=text/plain

Index: mkinitcpio-mdadm_udev-install.patch
===================================================================
--- mdadm-3.2.5-2/usr/lib/initcpio/install/mdadm_udev
+++ mdadm-3.2.5-2/usr/lib/initcpio/install/mdadm_udev
@@ -10,7 +10,7 @@
     fi
 
     add_binary "mdadm"
-    add_file "/usr/lib/udev/rules.d/64-md-raid.rules"
+    add_file "/lib/udev/rules.d/64-md-raid.rules"
 }
 
 help() {