Attachment 308557 Details for Bug 450333 – A grubby patch to follow symlink recursively

[patch] A grubby patch to follow symlink recursively

mkinitrd-6.0.52-symlink-1.patch (text/plain), 1.69 KB, created by H.J. Lu on 2008-06-06 18:27:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: H.J. Lu

Created: 2008-06-06 18:27:30 UTC

Size: 1.69 KB

patch

obsolete

>--- mkinitrd-6.0.52/grubby/grubby.c.symlink	2008-04-25 08:24:00.000000000 -0700
>+++ mkinitrd-6.0.52/grubby/grubby.c	2008-06-06 10:53:52.000000000 -0700
>@@ -930,7 +930,7 @@ static int writeConfig(struct grubConfig
> 	out = stdout;
> 	tmpOutName = NULL;
>     } else {
>-	if (!lstat(outName, &sb) && S_ISLNK(sb.st_mode)) {
>+	while (!lstat(outName, &sb) && S_ISLNK(sb.st_mode)) {
> 	    char * buf;
> 	    int len = 256;
> 	    int rc;
>--- mkinitrd-6.0.52/grubby/test.sh.symlink	2008-04-25 08:24:00.000000000 -0700
>+++ mkinitrd-6.0.52/grubby/test.sh	2008-06-06 10:53:25.000000000 -0700
>@@ -161,6 +161,35 @@ for n in test/*.[0-9]*; do
>     rm -f ${b}-test mytest
> done
> 
>+testing="Following recursive symlinks"
>+unset b
>+for n in test/*.[0-9]*; do
>+    n=${n#*/}	# remove test/
>+    [[ ${n%.*} == "$b" ]] && continue
>+    b=${n%.*}	# remove suffix
>+    [[ $b == $opt_bootloader ]] || continue
>+
>+    echo "$testing ... --$b"
>+
>+    cp test/${b}.1 ${b}-test
>+    ln -s ./${b}-test mytest-link
>+    ln -s mytest-link mytest
>+    ./grubby --${b} --add-kernel bar --title title -c mytest
>+    if [[ $? != 0 ]]; then
>+	echo "  failed (grubby returned non-zero)"
>+	(( fail++ ))
>+    elif [[ ! -L mytest ]] || [[ ! -L mytest-link ]]; then
>+	echo "  failed (not a symlink)"
>+	(( fail++ ))
>+    elif [[ $(readlink -f mytest) != $(readlink -f ./${b}-test) ]]; then
>+	echo "  failed (wrong target)"
>+	(( fail++ ))
>+    else
>+	(( pass++ ))
>+    fi
>+    rm -f ${b}-test mytest mytest-link
>+done
>+
> testing="GRUB default directive"
> grubTest grub.1 default/g1.1 --boot-filesystem=/boot --add-kernel /boot/new-kernel --title Some_Title 
> grubTest grub.1 default/g1.2 --boot-filesystem=/boot --add-kernel /boot/new-kernel --title Some_Title --make-default

Actions: View | Diff

Attachments on bug 450333: 308557