FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Desktop

 
 
LinkBack Thread Tools
 
Old 02-23-2009, 02:58 PM
Hans de Goede
 
Default PATCH: mkinitrd: Fix handling of kbd maps which are a symlink (#485615)

Some keyboard maps are symlinks to others, we were not handling this properly,
this patch fixes this.
---
mkinitrd | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/mkinitrd b/mkinitrd
index 4eb2e78..111d361 100755
--- a/mkinitrd
+++ b/mkinitrd
@@ -1410,6 +1410,14 @@ if [ -f /etc/sysconfig/keyboard ] || [ -f
/etc/sysconfig/console/default.kmap ];

findkeymap $KEYMAP

for FN in $KEYMAPS; do
+ if [ -L $FN ]; then
+ TARGET=$(readlink $FN)
+ TG=$(echo $TARGET | sed -e 's/.gz$//' -e 's/.bz2$//')
+ LN=$(echo $FN | sed -e 's/.gz$//' -e 's/.bz2$//')
+ mkdir -p "$MNTIMAGE/$(dirname $LN)"
+ ln -s "$TG" "$MNTIMAGE/$LN"
+ FN=$TARGET
+ fi
inst $FN "$MNTIMAGE"
case "$FN" in
*.gz)
--
1.6.1.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 02-23-2009, 05:33 PM
Joel Granados
 
Default PATCH: mkinitrd: Fix handling of kbd maps which are a symlink (#485615)

It looks ok.
regards
On Mon, Feb 23, 2009 at 04:58:46PM +0100, Hans de Goede wrote:
> Some keyboard maps are symlinks to others, we were not handling this properly,
> this patch fixes this.
> ---
> mkinitrd | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/mkinitrd b/mkinitrd
> index 4eb2e78..111d361 100755
> --- a/mkinitrd
> +++ b/mkinitrd
> @@ -1410,6 +1410,14 @@ if [ -f /etc/sysconfig/keyboard ] || [ -f
> /etc/sysconfig/console/default.kmap ];
> findkeymap $KEYMAP
>
> for FN in $KEYMAPS; do
> + if [ -L $FN ]; then
> + TARGET=$(readlink $FN)
> + TG=$(echo $TARGET | sed -e 's/.gz$//' -e 's/.bz2$//')
> + LN=$(echo $FN | sed -e 's/.gz$//' -e 's/.bz2$//')
> + mkdir -p "$MNTIMAGE/$(dirname $LN)"
> + ln -s "$TG" "$MNTIMAGE/$LN"
> + FN=$TARGET
> + fi
> inst $FN "$MNTIMAGE"
> case "$FN" in
> *.gz)
> --
> 1.6.1.3
>
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list@redhat.com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list

--
Joel Andres Granados
Brno, Czech Republic, Red Hat.

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 04:44 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org